| blob | af2270613dae00e86a6b6dd0a3c1a4afb1ae66fa |
1 --- toolkit/doc/layout/TODO.old 2009-04-06 16:42:11.000000000 +0000
2 +++ toolkit/doc/layout/TODO 2009-04-06 16:42:13.000000000 +0000
3 @@ -4,6 +4,11 @@
4 ** Move everything & development into new layout-dialogs CWS
6 ** cleanups
7 +*** Add XRadioButton2 and layout::VCLXRadioButton with
8 + {get,set}RadioGroup. Remove import.cxx RadioGroups::RadioGroup,
9 + VCLXRadioButton::getFirstActionListener () and [actionListener
10 + juggling in] layout::RadioButton_impl::SetClickHdl() and
11 + EnableRadioCheck() layout::RadioButton_impl::Check.
12 *** layout/import.hxx: what's this generator stuff?
13 #if 0
14 // generator
15 @@ -87,7 +92,6 @@ but keep using yes/no on Windows, eg?
16 *** remove -DTEST_LAYOUT=1 from util/makefile.mk?
18 ** fixes
19 -*** mpRadioGroup HACK --> use radiogroup property
20 *** missing properties
21 'title' -> 'Set Zoom'
22 Missing prop Title
23 @@ -102,14 +106,18 @@ fHorAlign = fVerAlign = 0.5; --> float c
25 ** include full translations
26 *** zoom
27 -grep zoom.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\zoom.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/FL_\(ZOOM\)_label/FL_\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/'
28 -**** done, except for View Layout update: no strings in localize.sdf yet,
29 - must redo.
30 +grep zoom.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\zoom.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/'
31 *** wordcount
32 grep wordcountdialog.src sw/source/ui/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\workben.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/FL_\([A-Z]*\)_label/FL_\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/'s
33 *** sortdlg
34 grep sortdlg.src ../../../sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "janneke\\vc\\layout-cws\\toolkit\\workben\\layout\\sort-options.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' | grep -E ' (nl|de|en-US) ' > localize-str.sdf
35 -
36 +grep sortdlg.src sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sc/uiconfig/layout/localize-sort-options.sdf
37 +*** insert-sheet
38 +grep instbdlg.src sc/source/ui/miscdlgs/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\insert-sheet.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > sc/uiconfig/layout/localize-insert-sheet.sdf
39 +*** move-copy-sheet
40 +grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' sc/source/ui/src/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\move-copy-sheet.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/' > sc/uiconfig/layout/localize-move-copy-sheet.sdf
41 +*** find-and-replace
42 +grep srchdlg.src svx/source/dialog/localize.sdf | awk -F'\t' '{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $3, "layout", $6 "_label", "", "", $8, "0", $10, $11, $12, "", $14, $15}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > svx/uiconfig/layout/localize-find-and-replace.sdf
44 * i18n
45 + forget java property files nonsense
46 --- toolkit/inc/layout/layout-post.hxx.old 2009-04-06 16:42:11.000000000 +0000
47 +++ toolkit/inc/layout/layout-post.hxx 2009-04-06 16:42:13.000000000 +0000
48 @@ -34,6 +34,10 @@
50 #if ENABLE_LAYOUT
52 +/* Allow re-inclusion for cxx file. */
53 +#undef _LAYOUT_PRE_HXX
54 +
55 +
56 #undef AdvancedButton
57 #undef ApplyButton
58 #undef Box
59 @@ -45,6 +49,7 @@
60 #undef Control
61 #undef Dialog
62 #undef Edit
63 +#undef ErrorBox
64 #undef FixedImage
65 #undef FixedInfo
66 #undef FixedLine
67 @@ -52,11 +57,15 @@
68 #undef HBox
69 #undef HelpButton
70 #undef IgnoreButton
71 +#undef InfoBox
72 #undef ListBox
73 +#undef MessBox
74 +#undef MessageBox
75 #undef MetricField
76 #undef MetricFormatter
77 #undef MoreButton
78 #undef MultiLineEdit
79 +#undef MultiListBox
80 #undef NoButton
81 #undef NumericField
82 #undef NumericFormatter
83 @@ -64,36 +73,32 @@
84 #undef Plugin
85 #undef ProgressBar
86 #undef PushButton
87 +#undef QueryBox
88 #undef RadioButton
89 #undef ResetButton
90 #undef RetryButton
91 +#undef SfxTabPage
92 +#undef SfxTabDialog
93 #undef SpinField
94 -#undef Table
95 +#undef TabDialog
96 +#undef TabControl
97 #undef TabPage
98 +#undef Table
99 #undef VBox
100 +#undef WarningBox
101 #undef YesButton
103 #undef ModalDialog
104 #undef ModelessDialog
105 +#undef ScExpandedFixedText
106 +#undef SfxDialog
107 #undef SfxModalDialog
108 -#undef SfxTabPage
109 +#undef SfxModelessDialog
111 #undef SvxLanguageBox
113 #undef Window
115 -
116 -#undef SVX_RES
117 -#define SVX_RES(i) ResId(i,DIALOG_MGR())
118 -
119 -#undef SvtResId
120 -
121 -#undef SW_RES
122 -#define SW_RES(i) ResId(i,SWDIALOG_MGR())
123 -
124 -/* Allow re-inclusion for cxx file. */
125 -#undef _LAYOUT_PRE_HXX
126 -
127 #endif /* ENABLE_LAYOUT */
129 #endif /* _LAYOUT_POST_HXX */
130 --- toolkit/inc/layout/layout-pre.hxx.old 2009-04-06 16:42:11.000000000 +0000
131 +++ toolkit/inc/layout/layout-pre.hxx 2009-04-06 16:42:13.000000000 +0000
132 @@ -34,15 +34,8 @@
134 #if ENABLE_LAYOUT
136 -//#if !LAYOUT
137 -//#define LAYOUT 1
138 -//#endif
139 -//#define LAYOUT_NS layout
140 -
141 -// TWBN, but find that SfxModalDialog and FixedLine are already defined, eg compiling
142 -// dlgfact.cxx
143 -//typedef layout::Dialog SfxModalDialog;
144 -//typedef layout::FixedLine FixedLine;
145 +///* Allow re-inclusion for next hxx file. */
146 +#undef _LAYOUT_POST_HXX
148 #define AdvancedButton layout::AdvancedButton
149 #define ApplyButton layout::ApplyButton
150 @@ -55,6 +48,7 @@
151 #define Control layout::Control
152 #define Dialog layout::Dialog
153 #define Edit layout::Edit
154 +#define ErrorBox layout::ErrorBox
155 #define FixedImage layout::FixedImage
156 #define FixedInfo layout::FixedInfo
157 #define FixedLine layout::FixedLine
158 @@ -62,11 +56,16 @@
159 #define HBox layout::HBox
160 #define HelpButton layout::HelpButton
161 #define IgnoreButton layout::IgnoreButton
162 +#define InfoBox layout::InfoBox
163 +#define LocalizedString layout::LocalizedString
164 #define ListBox layout::ListBox
165 +#define MessBox layout::MessBox
166 +#define MessageBox layout::MessageBox
167 #define MetricField layout::MetricField
168 #define MetricFormatter layout::MetricFormatter
169 #define MoreButton layout::MoreButton
170 #define MultiLineEdit layout::MultiLineEdit
171 +#define MultiListBox layout::MultiListBox
172 #define NoButton layout::NoButton
173 #define NumericField layout::NumericField
174 #define NumericFormatter layout::NumericFormatter
175 @@ -74,64 +73,36 @@
176 #define Plugin layout::Plugin
177 #define ProgressBar layout::ProgressBar
178 #define PushButton layout::PushButton
179 +#define QueryBox layout::QueryBox
180 #define RadioButton layout::RadioButton
181 #define ResetButton layout::ResetButton
182 #define RetryButton layout::RetryButton
183 +#define SfxTabDialog layout::SfxTabDialog
184 +#define SfxTabPage layout::SfxTabPage
185 #define SpinField layout::SpinField
186 -#define Table layout::Table
187 +#define TabControl layout::TabControl
188 #define TabPage layout::TabPage
189 +#define Table layout::Table
190 #define VBox layout::VBox
191 +#define WarningBox layout::WarningBox
192 #define YesButton layout::YesButton
194 #define ModalDialog Dialog
195 #define ModelessDialog Dialog
196 +#define ScExpandedFixedText FixedText
197 +#define SfxDialog Dialog
198 #define SfxModalDialog Dialog
199 -#define SfxTabPage TabPage
200 +#define SfxModelessDialog Dialog
201 +#define TabDialog Dialog
203 #define SvxLanguageBox ListBox
205 #define Window ::Window
207 -#define LAYOUT_DIALOG_PARENT\
208 - VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow()
209 -
210 -#undef SVX_RES
211 -#define SVX_RES(x) #x
212 -#undef SvtResId
213 -#define SvtResId(x) #x
214 -#undef SW_RES
215 -#define SW_RES(x) #x
216 -
217 -/* Hmm. These hacks make zoom.cxx, wordcountdialog.cxx, ... diffs
218 - * smaller but 'tis not really scalable. */
219 -#ifdef _LAYOUT_POST_HXX
220 -
221 -#ifdef _SVX_RECOVER_CXX
222 -#undef SfxModalDialog
223 -// 3rd parameter must match ID in <modaldialog> "RID_SVXDLG_RECOVER", localize.sdf
224 -#define SfxModalDialog( pParent, SVX_RES_RID ) Dialog( pParent, "recover.xml", "RID_SVXDLG_RECOVER" )
225 -#endif /* _SVX_RECOVER_CXX */
226 -
227 -#ifdef SW_WORDCOUNTDIALOG_HXX
228 -#undef SfxModalDialog
229 -// 3rd parameter must match ID in <modaldialog> "DLG_WORDCOUNT", localize.sdf
230 -#define SfxModalDialog( pParent, SW_RES_RID ) Dialog( pParent, "wordcount.xml", "DLG_WORDCOUNT" )
231 -#define SW_WORDCOUNTDIALOG_HRC
232 -#endif /* SW_WORDCOUNTDIALOG_HXX */
233 -
234 -#ifdef _SVX_ZOOM_CXX
235 -#undef SfxModalDialog
236 -// 3rd parameter must match ID in <modaldialog> "RID_SVXDLG_ZOOM", localize.sdf
237 -#define SfxModalDialog( pParent, SVX_RES_RID ) Dialog( pParent, "zoom.xml", "RID_SVXDLG_ZOOM" )
238 -#define _SVX_ZOOM_HRC
239 -#endif /* _SVX_ZOOM_CXX */
240 -
241 -#endif /* _LAYOUT_POST_HXX */
242 -
243 -#else /* !ENABLE_LAYOUT */
244 +#else
246 -#define LAYOUT_PRE_POST 1
247 +#define LocalizedString String
249 -#endif /* !ENABLE_LAYOUT */
250 +#endif /* ENABLE_LAYOUT */
252 #endif /* _LAYOUT_PRE_HXX */
253 --- toolkit/inc/layout/layout.hxx.old 2009-04-06 16:42:11.000000000 +0000
254 +++ toolkit/inc/layout/layout.hxx 2009-04-06 16:42:13.000000000 +0000
255 @@ -32,28 +32,46 @@
256 #ifndef _LAYOUT_HXX
257 #define _LAYOUT_HXX
259 -#include <com/sun/star/uno/XInterface.hpp>
260 #include <com/sun/star/awt/XLayoutContainer.hpp>
261 +#include <com/sun/star/uno/XInterface.hpp>
262 #include <com/sun/star/util/Color.hpp>
263 #include <i18npool/lang.h>
264 +#include <toolkit/dllapi.h>
265 #include <tools/gen.hxx>
266 #include <tools/link.hxx>
267 #include <tools/string.hxx>
268 -
269 -// FIXME: eventually wrap FieldUnit
270 +#include <vcl/combobox.h>
271 #include <vcl/fldunit.hxx>
272 -// FIXME: eventually wrap this too ...
273 +#include <vcl/lstbox.h>
274 +#include <vcl/smartid.hxx>
275 #include <vcl/wintypes.hxx>
277 -#include <toolkit/dllapi.h>
278 -
279 +class Button;
280 +class ComboBox;
281 class Control;
282 +class Dialog;
283 class Image;
284 -class SfxPoolItem;
285 -class SfxItemSet;
286 +class ListBox;
287 +class MapMode;
288 +class MultiListBox;
289 +class NotifyEvent;
290 +class Pointer;
291 +class PushButton;
292 +class RadioButton;
293 +class ResId;
294 +struct SfxChildWinInfo;
295 +class TabControl;
296 +class TabPage;
297 +class VCLXRadioButton;
298 class VCLXWindow;
299 class Window;
300 -class TabPage;
301 +
302 +namespace layoutimpl
303 +{
304 +class VCLXTabControl;
305 +}
306 +
307 +class VCLXTabControl;
309 namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
311 @@ -70,7 +88,7 @@ class TOOLKIT_DLLPUBLIC Context
312 public:
313 Context( char const* pPath );
314 virtual ~Context();
315 - PeerHandle GetPeerHandle( char const* pId, sal_uInt32 nId = 0 ) const;
316 + PeerHandle GetPeerHandle( char const* id, sal_uInt32 nId = 0 ) const;
317 void setToplevel( PeerHandle xToplevel );
318 PeerHandle getToplevel();
319 PeerHandle getRoot();
320 @@ -83,46 +101,88 @@ public:
321 par( pImpl ) {} \
322 char const* GetUnoName() const; \
323 public: \
324 - t( Context *pCtx, char const* pId, sal_uInt32 nId = 0 ); \
325 - t( Window *pParent, WinBits nStyle = defaultWinBit )
326 + t( Context *context, char const* id, sal_uInt32 nId = 0 ); \
327 + t( Window *parent, WinBits nStyle = defaultWinBit ); \
328 + t (Window *parent, ResId const &res)
329 #define DECL_GET_IMPL(t) \
330 inline t##Impl &getImpl() const
332 +#define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const
333 +#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return reinterpret_cast< ::cls*>( GetWindow() ); }
334 +
335 +#define DECL_GET_VCLXWINDOW( cls ) ::VCLX##cls* GetVCLX##cls() const
336 +#define IMPL_GET_VCLXWINDOW( cls ) ::VCLX##cls* cls::Get##VCLX##cls() const { return reinterpret_cast< ::VCLX##cls*>( GetVCLXWindow() ); }
337 +
338 +#define DECL_GET_LAYOUT_VCLXWINDOW( cls ) ::layoutimpl::VCLX##cls* GetVCLX##cls() const
339 +#define IMPL_GET_LAYOUT_VCLXWINDOW( cls ) ::layoutimpl::VCLX##cls* cls::Get##VCLX##cls() const { return reinterpret_cast< ::layoutimpl::VCLX##cls*>( GetVCLXWindow() ); }
340 +
341 // follows the VCL inheritance hierarchy ...
343 class WindowImpl;
344 class TOOLKIT_DLLPUBLIC Window
345 {
346 protected:
347 + friend class WindowImpl;
348 WindowImpl *mpImpl;
349 - static PeerHandle CreatePeer( Window *pParent, WinBits nStyle,
350 + static PeerHandle CreatePeer( Window *parent, WinBits nStyle,
351 char const* pName);
352 +
353 + virtual void setRes (ResId const& res);
354 +
355 public:
356 DECL_GET_IMPL( Window );
357 explicit Window( WindowImpl *pImpl );
358 virtual ~Window();
360 - PeerHandle GetPeer();
361 + PeerHandle GetPeer() const;
362 Context *getContext();
364 void Enable( bool bEnable = true );
365 inline void Disable() { Enable( false ); }
366 - void Show( BOOL bVisible = TRUE );
367 - inline void Hide() { Show( FALSE ); }
368 + void Show( bool bVisible = true );
369 + inline void Hide() { Show( false ); }
370 void GrabFocus();
371 void FreeResource() {}
373 - void SetParent( Window *pParent );
374 - void SetParent( ::Window *pParent );
375 -
376 - css::uno::Reference<css::awt::XWindow> GetRef();
377 - VCLXWindow* GetVCLXWindow();
378 - ::Window* GetWindow();
379 - ::Window* GetParent();
380 + void SetParent( ::Window *parent );
381 + virtual void ParentSet (Window *window);
382 + void SetParent( Window *parent );
383 +
384 + css::uno::Reference<css::awt::XWindow> GetRef() const;
385 + VCLXWindow* GetVCLXWindow() const;
386 + ::Window* GetWindow() const;
387 + ::Window* GetParent() const;
389 + void SetPointer( Pointer const& pointer );
390 + Pointer const& GetPointer() const;
391 WinBits GetStyle();
392 - void SetStyle( WinBits nStyle );
393 - void SetUpdateMode( bool /*bUpdate*/ ) { }
394 + void SetText( rtl::OUString const& str );
395 + String GetText() const;
396 + void SetStyle( WinBits style );
397 + void SetUpdateMode( bool mode );
398 + void SetHelpId( sal_uIntPtr id );
399 + sal_uIntPtr GetHelpId() const;
400 + void SetSmartHelpId( SmartId const&, SmartIdUpdateMode mode=SMART_SET_SMART );
401 + SmartId GetSmartHelpId() const;
402 + void EnterWait ();
403 + void LeaveWait ();
404 + bool IsWait () const;
405 + //void Enable (bool enable=true, bool child=true);
406 + //void Disable (bool child=true);
407 + bool IsEnabled () const;
408 + void EnableInput (bool enable=true, bool child=true);
409 + bool IsInputEnabled () const;
410 +
411 + bool IsVisible () const;
412 + bool HasChildPathFocus (bool systemWindow=false) const;
413 + void SetPosPixel (Point const&);
414 + Point GetPosPixel () const;
415 + void SetSizePixel (Size const&);
416 + Size GetSizePixel () const;
417 + sal_Int32 GetCtrlTextWidth (rtl::OUString const& str) const;
418 + sal_Int32 GetTextHeight () const;
419 +
420 + Size LogicToPixel( Size const& size, MapMode const& mapMode=(MapMode const&)*(MapMode*)0 ) const;
421 };
423 class ControlImpl;
424 @@ -130,8 +190,13 @@ class TOOLKIT_DLLPUBLIC Control : public
425 {
426 DECL_GET_IMPL( Control );
427 DECL_CONSTRUCTORS( Control, Window, 0 );
428 +
429 public:
430 -// void SetText( String const& rStr ); - can't do this here ...
431 + ~Control ();
432 + void SetGetFocusHdl (Link const& link);
433 + Link& GetGetFocusHdl ();
434 + void SetLoseFocusHdl (Link const& link);
435 + Link& GetLoseFocusHdl ();
436 };
438 class FixedLineImpl;
439 @@ -139,6 +204,7 @@ class TOOLKIT_DLLPUBLIC FixedLine : publ
440 {
441 DECL_GET_IMPL( FixedLine );
442 DECL_CONSTRUCTORS( FixedLine, Control, WB_HORZ );
443 +
444 public:
445 bool IsEnabled();
446 };
447 @@ -148,8 +214,10 @@ class TOOLKIT_DLLPUBLIC FixedText : publ
448 {
449 DECL_GET_IMPL( FixedText );
450 DECL_CONSTRUCTORS( FixedText, Control, 0 );
451 +
452 public:
453 - void SetText( String const& rStr );
454 + ~FixedText ();
455 + void SetText( rtl::OUString const& rStr );
456 };
458 class FixedImageImpl;
459 @@ -183,13 +251,18 @@ class TOOLKIT_DLLPUBLIC Button : public
460 {
461 DECL_GET_IMPL( Button );
462 DECL_CONSTRUCTORS( Button, Control, 0 );
463 + DECL_GET_WINDOW (Button);
464 +
465 public:
466 - void SetText( String const& rStr );
467 - BOOL SetModeImage( const Image& rImage );
468 + ~Button ();
469 + static String GetStandardText (sal_uInt16 button_type);
470 + void SetText( rtl::OUString const& rStr );
471 + bool SetModeImage( const Image& rImage );
472 void SetImageAlign( ImageAlign eAlign );
474 void SetClickHdl( Link const& rLink );
475 virtual void Click() /* pure virtual? */;
476 + Link& GetClickHdl ();
477 };
479 class PushButtonImpl;
480 @@ -197,9 +270,12 @@ class TOOLKIT_DLLPUBLIC PushButton : pub
481 {
482 DECL_GET_IMPL( PushButton );
483 DECL_CONSTRUCTORS( PushButton, Button, 0 );
484 + DECL_GET_WINDOW (PushButton);
485 +
486 public:
487 - void Check( BOOL bCheck = TRUE );
488 - BOOL IsChecked() const;
489 + ~PushButton ();
490 + void Check( bool bCheck=true );
491 + bool IsChecked() const;
493 void Toggle();
494 void SetToggleHdl( Link const& rLink );
495 @@ -252,6 +328,12 @@ class TOOLKIT_DLLPUBLIC AdvancedButton :
496 void AddSimple( Window* w );
497 void RemoveAdvanced( Window* w );
498 void RemoveSimple( Window* w );
499 +
500 + void SetAdvancedText (rtl::OUString const& text);
501 + void SetSimpleText (rtl::OUString const& text);
502 + rtl::OUString GetAdvancedText () const;
503 + rtl::OUString GetSimpleText () const;
504 + void SetDelta (int);
505 };
507 class MoreButtonImpl;
508 @@ -261,6 +343,11 @@ class TOOLKIT_DLLPUBLIC MoreButton : pub
509 DECL_GET_IMPL( MoreButton );
510 void AddWindow( Window* w );
511 void RemoveWindow( Window* w );
512 +
513 + void SetMoreText (rtl::OUString const& text);
514 + void SetLessText (rtl::OUString const& text);
515 + rtl::OUString GetMoreText () const;
516 + rtl::OUString GetLessText () const;
517 };
519 class RadioButtonImpl;
520 @@ -268,9 +355,12 @@ class TOOLKIT_DLLPUBLIC RadioButton : pu
521 {
522 DECL_GET_IMPL( RadioButton );
523 DECL_CONSTRUCTORS( RadioButton, Button, 0 );
524 + DECL_GET_WINDOW( RadioButton );
525 + DECL_GET_VCLXWINDOW( RadioButton );
526 public:
527 - void Check( BOOL bCheck = TRUE );
528 - BOOL IsChecked() const;
529 + ~RadioButton ();
530 + void Check( bool bCheck=true );
531 + bool IsChecked() const;
533 void Toggle();
534 void SetToggleHdl( Link const& rLink );
535 @@ -281,9 +371,11 @@ class TOOLKIT_DLLPUBLIC CheckBox : publi
536 {
537 DECL_GET_IMPL( CheckBox );
538 DECL_CONSTRUCTORS( CheckBox, Button, 0 );
539 +
540 public:
541 - void Check( BOOL bCheck = TRUE );
542 - BOOL IsChecked() const;
543 + ~CheckBox ();
544 + void Check( bool bCheck=true );
545 + bool IsChecked() const;
547 void Toggle();
548 void SetToggleHdl( Link const& rLink );
549 @@ -294,9 +386,11 @@ class TOOLKIT_DLLPUBLIC Edit : public Co
550 {
551 DECL_GET_IMPL( Edit );
552 DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
553 +
554 public:
555 - void SetText( XubString const& rStr ) const;
556 - XubString GetText() const;
557 + ~Edit ();
558 + void SetText( rtl::OUString const& rStr ) const;
559 + String GetText() const;
560 void SetModifyHdl( Link const& rLink );
561 void SetSelection( Selection const& rSelection );
562 };
563 @@ -320,8 +414,7 @@ class TOOLKIT_DLLPUBLIC FormatterBase
564 {
565 protected:
566 FormatterBaseImpl *mpFormatImpl;
567 - FormatterBase( FormatterBaseImpl *pFormatImpl )
568 - : mpFormatImpl( pFormatImpl ) {}
569 + FormatterBase( FormatterBaseImpl *pFormatImpl );
570 };
572 class NumericFormatterImpl;
573 @@ -346,8 +439,8 @@ class TOOLKIT_DLLPUBLIC NumericField : p
574 {
575 DECL_GET_IMPL( NumericField );
576 public:
577 - NumericField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
578 - NumericField( Window *pParent, WinBits nStyle );
579 + NumericField( Context *context, char const* id, sal_uInt32 nId=0 );
580 + NumericField( Window *parent, WinBits nStyle );
581 };
583 class MetricFormatterImpl;
584 @@ -358,12 +451,12 @@ class TOOLKIT_DLLPUBLIC MetricFormatter
585 explicit MetricFormatter( FormatterBaseImpl *pImpl );
586 MetricFormatterImpl &getFormatImpl() const;
587 public:
588 - void SetMin( sal_Int64 nNewMin, FieldUnit nUnit = FUNIT_NONE );
589 - void SetMax( sal_Int64 nNewMax, FieldUnit nUnit = FUNIT_NONE );
590 - void SetFirst( sal_Int64 nNewFirst, FieldUnit nUnit = FUNIT_NONE );
591 - void SetLast( sal_Int64 nNewLast, FieldUnit nUnit = FUNIT_NONE );
592 - void SetValue( sal_Int64 nNewValue, FieldUnit nUnit = FUNIT_NONE );
593 - sal_Int64 GetValue( FieldUnit nUnit = FUNIT_NONE ) const;
594 + void SetMin( sal_Int64 nNewMin, FieldUnit nUnit=FUNIT_NONE );
595 + void SetMax( sal_Int64 nNewMax, FieldUnit nUnit=FUNIT_NONE );
596 + void SetFirst( sal_Int64 nNewFirst, FieldUnit nUnit=FUNIT_NONE );
597 + void SetLast( sal_Int64 nNewLast, FieldUnit nUnit=FUNIT_NONE );
598 + void SetValue( sal_Int64 nNewValue, FieldUnit nUnit=FUNIT_NONE );
599 + sal_Int64 GetValue( FieldUnit nUnit=FUNIT_NONE ) const;
601 void SetSpinSize( sal_Int64 nNewSize );
602 };
603 @@ -373,124 +466,209 @@ class TOOLKIT_DLLPUBLIC MetricField : pu
604 {
605 DECL_GET_IMPL( MetricField );
606 public:
607 - MetricField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
608 - MetricField( Window *pParent, WinBits nStyle );
609 + MetricField( Context *context, char const* id, sal_uInt32 nId=0 );
610 + MetricField( Window *parent, WinBits nStyle );
611 };
613 -#define COMBOBOX_APPEND ((USHORT)0xFFFF)
614 -#define COMBOBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF)
615 class ComboBoxImpl;
616 class TOOLKIT_DLLPUBLIC ComboBox : public Edit
617 {
618 DECL_GET_IMPL( ComboBox );
619 + DECL_GET_WINDOW (ComboBox );
620 DECL_CONSTRUCTORS( ComboBox, Edit, 0 );
622 public:
623 - USHORT InsertEntry( XubString const& rStr, USHORT nPos = COMBOBOX_APPEND );
624 - void RemoveEntry( XubString const& rStr );
625 - void RemoveEntry( USHORT nPos );
626 + ~ComboBox ();
627 + sal_uInt16 InsertEntry( rtl::OUString const& rStr, sal_uInt16 nPos=COMBOBOX_APPEND );
628 + void RemoveEntry( rtl::OUString const& rStr );
629 + void RemoveEntry( sal_uInt16 nPos );
630 void Clear();
632 - USHORT GetEntryPos( XubString const& rStr ) const;
633 - XubString GetEntry( USHORT nPos ) const;
634 - USHORT GetEntryCount() const;
635 + sal_uInt16 GetEntryPos( rtl::OUString const& rStr ) const;
636 + String GetEntry( sal_uInt16 nPos ) const;
637 + sal_uInt16 GetEntryCount() const;
639 void SetClickHdl( Link const& rLink );
640 void SetSelectHdl( Link const& rLink );
641 + void EnableAutocomplete (bool enable, bool matchCase=false );
642 };
644 -#define LISTBOX_APPEND ((USHORT)0xFFFF)
645 -#define LISTBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF)
646 class ListBoxImpl;
647 class TOOLKIT_DLLPUBLIC ListBox : public Control
648 {
649 DECL_GET_IMPL( ListBox );
650 DECL_CONSTRUCTORS( ListBox, Control, WB_BORDER );
651 + DECL_GET_WINDOW (ListBox);
652 +
653 public:
654 - USHORT InsertEntry( XubString const& rStr, USHORT nPos = LISTBOX_APPEND );
655 + ~ListBox ();
656 + sal_uInt16 InsertEntry( rtl::OUString const& rStr, sal_uInt16 nPos=LISTBOX_APPEND );
658 - void RemoveEntry( XubString const& rStr );
659 - void RemoveEntry( USHORT nPos );
660 + void RemoveEntry( rtl::OUString const& rStr );
661 + void RemoveEntry( sal_uInt16 nPos );
662 void Clear();
664 - USHORT GetEntryPos( XubString const& rStr ) const;
665 - XubString GetEntry( USHORT nPos ) const;
666 - USHORT GetEntryCount() const;
667 -
668 - void SelectEntry( XubString const& rStr, BOOL bSelect = TRUE );
669 - void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
670 -
671 - USHORT GetSelectEntryCount() const;
672 - XubString GetSelectEntry( USHORT nSelIndex = 0 ) const;
673 - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
674 + sal_uInt16 GetEntryPos( rtl::OUString const& rStr ) const;
675 + String GetEntry( sal_uInt16 nPos ) const;
676 + sal_uInt16 GetEntryCount() const;
677 +
678 + void SelectEntry( rtl::OUString const& rStr, bool bSelect=true );
679 + void SelectEntryPos( sal_uInt16 nPos, bool bSelect=true );
680 +
681 + sal_uInt16 GetSelectEntryCount() const;
682 + String GetSelectEntry( sal_uInt16 nSelIndex=0 ) const;
683 + sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex=0 ) const;
685 void SetSelectHdl( Link const& rLink );
686 void SetClickHdl( Link const& rLink );
688 - void SetEntryData( USHORT/*nPos*/, void*/*pNewData*/) { }
689 - void* GetEntryData( USHORT/*nPos*/) const { return 0; }
690 + void SetEntryData (sal_uInt16 pos, void* data);
691 + void* GetEntryData (sal_uInt16 pos) const;
693 // SvxLanguageBox
694 - void SetLanguageList( INT16/*nLangList*/, bool/*bHasLangNone*/, bool /*bLangNoneIsLangAll*/= false, bool /*bCheckSpellAvail*/= false ) { }
695 + void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
697 - USHORT InsertLanguage( const LanguageType/*eLangType*/, USHORT/*nPos*/= LISTBOX_APPEND ) { return 0; }
698 - USHORT InsertLanguage( const LanguageType/*eLangType*/, bool/*bCheckEntry*/, USHORT /*nPos*/= LISTBOX_APPEND ) { return 0; }
699 - void RemoveLanguage( const LanguageType/*eLangType*/) { }
700 - void SelectLanguage( const LanguageType/*eLangType*/, bool/*bSelect*/= true) { }
701 - LanguageType GetSelectLanguage() const { return 0; }
702 - bool IsLanguageSelected( const LanguageType/*eLangType*/) const { return true; }
703 + sal_uInt16 InsertLanguage (LanguageType const type, sal_uInt16 pos=LISTBOX_APPEND);
704 + sal_uInt16 InsertLanguage (LanguageType const type, bool checkEntry, sal_uInt16 pos=LISTBOX_APPEND);
705 + void RemoveLanguage (LanguageType const type);
706 + void SelectLanguage (LanguageType const type, bool select=true);
707 + LanguageType GetSelectLanguage () const;
708 + bool IsLanguageSelected( LanguageType const type) const;
709 +};
710 +
711 +class MultiListBoxImpl;
712 +class TOOLKIT_DLLPUBLIC MultiListBox : public ListBox
713 +{
714 + DECL_GET_IMPL( MultiListBox );
715 + DECL_CONSTRUCTORS( MultiListBox, ListBox, 0 );
716 + DECL_GET_WINDOW( MultiListBox );
717 };
719 class DialogImpl;
720 class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
721 {
722 - DECL_GET_IMPL( Dialog );
723 + DECL_GET_WINDOW (Dialog);
724 +
725 public:
726 - Dialog( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
727 - Dialog( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
728 - short Execute();
729 - void EndDialog( long nResult = 0 );
730 - void SetText( String const& rStr );
731 + DECL_GET_IMPL (Dialog);
732 + Dialog( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
733 + Dialog( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
734 + ~Dialog ();
735 + virtual short Execute();
736 + void EndDialog( long nResult=0 );
737 + void SetText( rtl::OUString const& rStr );
738 + void SetTitle (rtl::OUString const& rStr );
739 + bool Close ();
740 + long Notify (NotifyEvent & event);
741 +
742 + // Sxf*Dialog
743 + bool bConstruct;
744 + void Initialize (SfxChildWinInfo*);
745 +};
746 +
747 +#define DECL_MESSAGE_BOX_CTORS(Name)\
748 + public:\
749 + Name##Box (::Window *parent, char const* message,\
750 + char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
751 + char const* xml_file="message-box.xml", char const* id="message-box");\
752 + Name##Box (::Window *parent, rtl::OUString const& message,\
753 + rtl::OUString yes=String (),\
754 + rtl::OUString no=String (),\
755 + sal_uIntPtr help_id=0,\
756 + char const* xml_file="message-box.xml", char const* id="message-box");\
757 + Name##Box (::Window *parent, WinBits, char const* message,\
758 + char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
759 + char const* xml_file="message-box.xml", char const* id="message-box");\
760 + Name##Box (::Window *parent, WinBits, rtl::OUString const& message,\
761 + rtl::OUString yes=String (),\
762 + rtl::OUString no=String (),\
763 + sal_uIntPtr help_id=0,\
764 + char const* xml_file="message-box.xml", char const* id="message-box")\
765 +
766 +class TOOLKIT_DLLPUBLIC MessageBox : public Dialog
767 +{
768 + DECL_MESSAGE_BOX_CTORS(Message);
769 +
770 +protected:
771 + FixedImage imageError;
772 + FixedImage imageInfo;
773 + FixedImage imageQuery;
774 + FixedImage imageWarning;
775 + FixedText messageText;
776 + CancelButton cancelButton;
777 + HelpButton helpButton;
778 + IgnoreButton ignoreButton;
779 + NoButton noButton;
780 + RetryButton retryButton;
781 + YesButton yesButton;
782 +
783 + void bits_init (WinBits bits, rtl::OUString const& message,
784 + rtl::OUString yes, rtl::OUString, sal_uIntPtr help_id);
785 + void init (rtl::OUString const& message,
786 + rtl::OUString const& yes, rtl::OUString const& no, sal_uIntPtr help_id);
787 + void init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id);
788 +};
789 +
790 +#define CLASS_MESSAGE_BOX(Name)\
791 + class TOOLKIT_DLLPUBLIC Name##Box : public MessageBox\
792 + {\
793 + DECL_MESSAGE_BOX_CTORS (Name);\
794 + }
795 +
796 +//CLASS_MESSAGE_BOX (Mess);
797 +typedef MessageBox MessBox;
798 +CLASS_MESSAGE_BOX (Error);
799 +CLASS_MESSAGE_BOX (Info);
800 +CLASS_MESSAGE_BOX (Query);
801 +CLASS_MESSAGE_BOX (Warning);
802 +
803 +#undef CLASS_MESSAGE_BOX
804 +
805 +#ifndef TAB_APPEND
806 +#define TAB_APPEND -1
807 +#endif /* !TAB_APPEND */
808 +
809 +class TabControlImpl;
810 +class TOOLKIT_DLLPUBLIC TabControl : public Control
811 +{
812 + DECL_GET_IMPL (TabControl);
813 + DECL_CONSTRUCTORS (TabControl, Control, 0);
814 + DECL_GET_WINDOW (TabControl);
815 + DECL_GET_LAYOUT_VCLXWINDOW (TabControl);
816 +
817 +public:
818 + ~TabControl ();
819 + void InsertPage (sal_uInt16 id, rtl::OUString const& title, sal_uInt16 pos=TAB_APPEND);
820 + void RemovePage (sal_uInt16 id);
821 + sal_uInt16 GetPageCount () const;
822 + sal_uInt16 GetPageId (sal_uInt16 pos) const;
823 + sal_uInt16 GetPagePos (sal_uInt16 id) const;
824 + void SetCurPageId (sal_uInt16 id);
825 + sal_uInt16 GetCurPageId () const;
826 + void SetTabPage (sal_uInt16 id, ::TabPage* page);
827 + ::TabPage* GetTabPage (sal_uInt16 id) const;
828 + void SetActivatePageHdl (Link const& link);
829 + Link& GetActivatePageHdl () const;
830 + void SetDeactivatePageHdl (Link const& link);
831 + Link& GetDeactivatePageHdl () const;
832 + void SetTabPageSizePixel (Size const& size);
833 + Size GetTabPageSizePixel () const;
834 };
836 -#define DECL_GET_WINDOW( cls ) ::cls* Get##cls()
837 -#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() { return reinterpret_cast< ::cls*>( GetWindow() ); }
838 class TabPageImpl;
839 class TOOLKIT_DLLPUBLIC TabPage : public Context, public Window
840 {
841 DECL_GET_IMPL( TabPage );
842 public:
843 static ::Window* global_parent;
844 + static TabControl* global_tabcontrol;
846 - TabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
847 - TabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
848 + TabPage( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
849 + TabPage( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
850 ~TabPage();
851 - //DECL_GET_WINDOW( TabPage );
852 - ::TabPage* GetTabPage();
853 + DECL_GET_WINDOW( TabPage );
854 virtual void ActivatePage();
855 virtual void DeactivatePage();
856 -#if 0
857 -};
858 -
859 -//FIXME: move to sfx2 or svtools layout.hxx
860 -class TOOLKIT_DLLPUBLIC SfxTabPage : public TabPage
861 -{
862 -public:
863 - SfxTabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
864 - SfxTabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
865 -#endif
866 - // SfxTabPage...
867 - enum PageAction { KEEP_PAGE, LEAVE_PAGE, REFRESH_SET };
868 -
869 - bool bHasExchangeSupport;
870 - bool HasExchangeSupport() { return bHasExchangeSupport; }
871 - SfxItemSet const* pSet;
872 - SfxItemSet const& GetItemSet() const { return *pSet; }
873 - virtual void Reset( SfxItemSet const& r );
874 - void SetExchangeSupport( bool exchangeSupport = true ) { bHasExchangeSupport = exchangeSupport; }
875 - //static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
876 - virtual void ActivatePage( SfxItemSet const& ) { }
877 - virtual int DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; }
878 };
880 class ProgressBarImpl;
881 @@ -516,7 +694,7 @@ protected:
882 css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
883 Container( rtl::OUString const& rName, sal_Int32 nBorder );
884 public:
885 - Container( Context const* pCtx, char const* pId );
886 + Container( Context const* context, char const* id );
888 void Add( Window *pWindow );
889 void Add( Container *pContainer );
890 @@ -540,11 +718,11 @@ class TOOLKIT_DLLPUBLIC Table : public C
891 protected:
892 Table( sal_Int32 nBorder, sal_Int32 nColumns );
893 public:
894 - Table( Context const* pCtx, char const* pId );
895 + Table( Context const* context, char const* id );
896 void Add( Window *pWindow, bool bXExpand, bool bYExpand,
897 - sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
898 + sal_Int32 nXSpan=1, sal_Int32 nYSpan=1 );
899 void Add( Container *pContainer, bool bXExpand, bool bYExpand,
900 - sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
901 + sal_Int32 nXSpan=1, sal_Int32 nYSpan=1 );
903 private:
904 void setProps( css::uno::Reference< css::awt::XLayoutConstrains > xChild,
905 @@ -556,7 +734,7 @@ class TOOLKIT_DLLPUBLIC Box : public Con
906 protected:
907 Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous );
908 public:
909 - Box( Context const* pCtx, char const* pId );
910 + Box( Context const* context, char const* id );
911 void Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding);
912 void Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding);
914 @@ -568,13 +746,13 @@ private:
915 class TOOLKIT_DLLPUBLIC HBox : public Box
916 {
917 public:
918 - HBox( Context const* pCtx, char const* pId );
919 + HBox( Context const* context, char const* id );
920 HBox( sal_Int32 nBorder, bool bHomogeneous );
921 };
922 class TOOLKIT_DLLPUBLIC VBox : public Box
923 {
924 public:
925 - VBox( Context const* pCtx, char const* pId );
926 + VBox( Context const* context, char const* id );
927 VBox( sal_Int32 nBorder, bool bHomogeneous );
928 };
930 @@ -585,21 +763,50 @@ class TOOLKIT_DLLPUBLIC Plugin : public
931 //DECL_CONSTRUCTORS( Plugin, Control, 0 );
932 public:
933 ::Control *mpPlugin;
934 - Plugin( Context *pCtx, char const* pId, ::Control *plugin );
935 + Plugin( Context *context, char const* id, ::Control *plugin );
936 };
938 class LocalizedStringImpl;
939 class TOOLKIT_DLLPUBLIC LocalizedString : public Window
940 {
941 DECL_GET_IMPL( LocalizedString );
942 +
943 public:
944 - LocalizedString( Context *pCtx, char const* pId );
945 + LocalizedString( Context *context, char const* id );
947 - String operator =( String const& );
948 - operator String();
949 -// operator String const&() const;
950 + rtl::OUString operator= (rtl::OUString const&);
951 + rtl::OUString operator+= (sal_Unicode );
952 + rtl::OUString operator+= (rtl::OUString const&);
953 +
954 + operator rtl::OUString();
955 + String getString ();
956 + rtl::OUString getOUString ();
957 + rtl::OUString GetToken (sal_uInt32 i, sal_Char c);
958 +};
959 +
960 +class InPlugImpl;
961 +class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window
962 +{
963 + DECL_GET_IMPL (InPlug);
964 +
965 +public:
966 + InPlug ( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0);
967 + InPlug ( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0);
968 +
969 + void ParentSet (Window *window);
970 };
972 } // end namespace layout
974 +#if ENABLE_LAYOUT
975 +#define LAYOUT_NS layout::
976 +#define LAYOUT_DIALOG_PARENT\
977 + VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow()
978 +#define LAYOUT_THIS_WINDOW( this ) this->GetWindow ()
979 +#else /* !ENABLE_LAYOUT */
980 +#define LAYOUT_NS
981 +#define LAYOUT_DIALOG_PARENT this
982 +#define LAYOUT_THIS_WINDOW( this ) this
983 +#endif /* !ENABLE_LAYOUT */
984 +
985 #endif /* _LAYOUT_HXX */
986 --- toolkit/inc/layout/layoutcore.hxx.old 2009-04-02 10:49:37.000000000 +0000
987 +++ toolkit/inc/layout/layoutcore.hxx 1970-01-01 00:00:00.000000000 +0000
988 @@ -1,80 +0,0 @@
989 -/*************************************************************************
990 - *
991 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
992 - *
993 - * Copyright 2008 by Sun Microsystems, Inc.
994 - *
995 - * OpenOffice.org - a multi-platform office productivity suite
996 - *
997 - * $RCSfile: layoutcore.hxx,v $
998 - *
999 - * $Revision: 1.3 $
1000 - *
1001 - * This file is part of OpenOffice.org.
1002 - *
1003 - * OpenOffice.org is free software: you can redistribute it and/or modify
1004 - * it under the terms of the GNU Lesser General Public License version 3
1005 - * only, as published by the Free Software Foundation.
1006 - *
1007 - * OpenOffice.org is distributed in the hope that it will be useful,
1008 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
1009 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010 - * GNU Lesser General Public License version 3 for more details
1011 - * (a copy is included in the LICENSE file that accompanied this code).
1012 - *
1013 - * You should have received a copy of the GNU Lesser General Public License
1014 - * version 3 along with OpenOffice.org. If not, see
1015 - * <http://www.openoffice.org/license.html>
1016 - * for a copy of the LGPLv3 License.
1017 - *
1018 - ************************************************************************/
1019 -
1020 -#ifndef _LAYOUT_CORE_HXX_
1021 -#define _LAYOUT_CORE_HXX_
1022 -
1023 -#include <com/sun/star/awt/XToolkit.hpp>
1024 -#include <com/sun/star/graphic/XGraphic.hpp>
1025 -#include <com/sun/star/awt/XLayoutContainer.hpp>
1026 -#include <com/sun/star/awt/XLayoutConstrains.hpp>
1027 -
1028 -#include <layout/layout.hxx>
1029 -
1030 -namespace layoutimpl
1031 -{
1032 -
1033 -namespace css = layout::css;
1034 -
1035 -css::uno::Reference< css::awt::XLayoutContainer >
1036 -createContainer( const rtl::OUString &rName );
1037 -
1038 -css::uno::Reference< css::awt::XLayoutConstrains >
1039 -createWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
1040 - css::uno::Reference< css::uno::XInterface > xParent,
1041 - const rtl::OUString &rName, long nProps );
1042 -
1043 -css::uno::Reference< css::awt::XLayoutConstrains >
1044 -createInternalWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
1045 - css::uno::Reference< css::uno::XInterface > xParent,
1046 - const rtl::OUString &rName, long nProps );
1047 -
1048 -css::uno::Reference< css::graphic::XGraphic > loadGraphic( const char *pName );
1049 -
1050 -// Helpers - unfortunately VCLXWindows don't implement XPropertySet
1051 -// but containers do - these helpers help us to hide this
1052 -namespace prophlp
1053 -{
1054 -// can we set properties on this handle ?
1055 -bool TOOLKIT_DLLPUBLIC canHandleProps( const css::uno::Reference< css::uno::XInterface > &xRef );
1056 -// if so which properties ?
1057 -css::uno::Reference< css::beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC queryPropertyInfo(
1058 - const css::uno::Reference< css::uno::XInterface > &xRef );
1059 -// set / get ...
1060 -void TOOLKIT_DLLPUBLIC setProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
1061 - const rtl::OUString &rName,
1062 - css::uno::Any aValue );
1063 -css::uno::Any TOOLKIT_DLLPUBLIC getProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
1064 - const rtl::OUString &rName );
1065 -} // namespace prophlp
1066 -} // namespace layoutimpl
1067 -
1068 -#endif // _LAYOUT_CORE_HXX_
1069 --- toolkit/inc/toolkit/awt/vclxwindows.hxx.old 2009-04-02 10:49:37.000000000 +0000
1070 +++ toolkit/inc/toolkit/awt/vclxwindows.hxx 2009-04-06 16:42:13.000000000 +0000
1071 @@ -181,6 +181,7 @@ protected:
1073 public:
1074 VCLXButton();
1075 + ~VCLXButton();
1077 // ::com::sun::star::lang::XComponent
1078 void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
1079 @@ -346,6 +347,8 @@ public:
1081 static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
1082 virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
1083 +
1084 + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getFirstActionListener ();
1085 };
1087 // ----------------------------------------------------
1088 @@ -764,6 +767,7 @@ protected:
1090 public:
1091 VCLXComboBox();
1092 + ~VCLXComboBox();
1094 // ::com::sun::star::uno::XInterface
1095 ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
1096 --- toolkit/prj/build.lst.old 2009-04-02 10:49:37.000000000 +0000
1097 +++ toolkit/prj/build.lst 2009-04-06 16:42:13.000000000 +0000
1098 @@ -2,10 +2,11 @@ ti toolkit : vcl NULL
1099 ti toolkit usr1 - all ti_mkout NULL
1100 ti toolkit\prj get - all ti_prj NULL
1101 ti toolkit\inc nmake - all ti_inc NULL
1102 +ti toolkit\uiconfig\layout nmake - all ti_uiconfig_layout NULL
1103 ti toolkit\source\helper nmake - all ti_helper ti_inc NULL
1104 ti toolkit\source\awt nmake - all ti_awt ti_inc NULL
1105 ti toolkit\source\controls nmake - all ti_controls ti_inc NULL
1106 ti toolkit\source\controls\tree nmake - all ti_tree NULL
1107 -ti toolkit\source\layout nmake - all ti_layout NULL
1108 -ti toolkit\source\vclcompat nmake - all ti_vclcompat NULL
1109 -ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout ti_helper ti_tree ti_vclcompat NULL
1110 +ti toolkit\source\layout\core nmake - all ti_layout_core NULL
1111 +ti toolkit\source\layout\vcl nmake - all ti_layout_vcl NULL
1112 +ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_layout_vcl NULL
1113 --- toolkit/prj/d.lst.old 2009-04-02 10:49:37.000000000 +0000
1114 +++ toolkit/prj/d.lst 2009-04-06 16:42:13.000000000 +0000
1115 @@ -22,7 +22,9 @@ mkdir: %_DEST%\inc%_EXT%\toolkit\control
1116 ..\inc\toolkit\awt\vclxdevice.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdevice.hxx
1117 ..\inc\toolkit\awt\vclxfont.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxfont.hxx
1118 ..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx
1119 +..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx
1120 ..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx
1121 +..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx
1122 ..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx
1123 ..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx
1125 @@ -53,3 +55,9 @@ mkdir: %_DEST%\inc%_EXT%\layout
1126 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
1128 ..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
1129 +mkdir: %_DEST%\inc%_EXT%\layout\core
1130 +..\source\layout\core\*.hxx %_DEST%\inc%_EXT%\layout\core\*.hxx
1131 +mkdir: %_DEST%\inc%_EXT%\layout\vcl
1132 +..\source\layout\vcl\*.hxx %_DEST%\inc%_EXT%\layout\vcl\*.hxx
1133 +
1134 +..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
1135 --- toolkit/source/awt/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
1136 +++ toolkit/source/awt/makefile.mk 2009-04-06 16:42:13.000000000 +0000
1137 @@ -43,9 +43,6 @@ ENABLE_EXCEPTIONS=TRUE
1139 # --- Files --------------------------------------------------------
1141 -# FIXME: This is bad, hmkay
1142 -CFLAGS+= -I$(PRJ)/source
1143 -
1144 .IF "$(GUIBASE)"=="aqua"
1145 OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
1146 CFLAGSCXX+=$(OBJCXXFLAGS)
1147 --- toolkit/source/awt/vclxbutton.cxx.old 2009-04-06 16:42:11.000000000 +0000
1148 +++ toolkit/source/awt/vclxbutton.cxx 2009-04-06 16:42:13.000000000 +0000
1149 @@ -31,7 +31,7 @@
1151 #include "vclxbutton.hxx"
1153 -#include <layout/layoutcore.hxx>
1154 +#include <layout/core/helper.hxx>
1155 #include <com/sun/star/awt/ImagePosition.hpp>
1156 #include <vcl/button.hxx>
1158 --- toolkit/source/awt/vclxdialog.cxx.old 2009-04-02 10:49:36.000000000 +0000
1159 +++ toolkit/source/awt/vclxdialog.cxx 2009-04-06 16:42:13.000000000 +0000
1160 @@ -211,6 +211,15 @@ void VCLXDialog::setTitle( const ::rtl::
1161 pWindow->SetText( Title );
1162 }
1164 +void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException)
1165 +{
1166 + ::vos::OGuard aGuard( GetMutex() );
1167 +
1168 + Window* pWindow = GetWindow();
1169 + if ( pWindow )
1170 + pWindow->SetHelpId( id );
1171 +}
1172 +
1173 ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException)
1174 {
1175 ::vos::OGuard aGuard( GetMutex() );
1176 --- toolkit/source/awt/vclxdialog.hxx.old 2009-04-02 10:49:36.000000000 +0000
1177 +++ toolkit/source/awt/vclxdialog.hxx 2009-04-06 16:42:13.000000000 +0000
1178 @@ -36,7 +36,7 @@
1179 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
1180 #include <com/sun/star/awt/XTopWindow.hpp>
1181 #include <comphelper/uno3.hxx>
1182 -#include <layout/bin.hxx>
1183 +#include <layout/core/bin.hxx>
1184 #include <toolkit/awt/vclxtopwindow.hxx>
1186 namespace layoutimpl
1187 @@ -44,10 +44,10 @@ namespace layoutimpl
1189 typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XDialog2 > VCLXDialog_Base;
1191 -class VCLXDialog :public VCLXWindow
1192 - ,public VCLXTopWindow_Base
1193 - ,public VCLXDialog_Base
1194 - ,public Bin
1195 +class TOOLKIT_DLLPUBLIC VCLXDialog : public VCLXWindow
1196 + , public VCLXTopWindow_Base
1197 + , public VCLXDialog_Base
1198 + , public Bin
1199 {
1200 private:
1201 bool bRealized, bResizeSafeguard;
1202 @@ -102,6 +102,7 @@ public:
1204 // ::com::sun::star::awt::XDialog2
1205 void SAL_CALL endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException);
1206 + void SAL_CALL setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException);
1208 };
1210 --- toolkit/source/awt/vclxplugin.cxx.old 2009-04-06 16:42:11.000000000 +0000
1211 +++ toolkit/source/awt/vclxplugin.cxx 2009-04-06 16:42:13.000000000 +0000
1212 @@ -40,6 +40,8 @@
1213 #include <toolkit/helper/property.hxx>
1214 #include <vcl/ctrl.hxx>
1216 +#include "forward.hxx"
1217 +
1218 namespace layoutimpl
1219 {
1221 @@ -63,7 +65,7 @@ void SAL_CALL VCLXPlugin::dispose() thro
1222 ::vos::OGuard aGuard( GetMutex() );
1224 lang::EventObject aDisposeEvent;
1225 - aDisposeEvent.Source = *this;
1226 + aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
1227 }
1229 VCLXWindow::dispose();
1230 --- toolkit/source/awt/vclxscroller.hxx.old 2009-04-02 10:49:36.000000000 +0000
1231 +++ toolkit/source/awt/vclxscroller.hxx 2009-04-06 16:42:13.000000000 +0000
1232 @@ -33,7 +33,7 @@
1233 #define LAYOUT_AWT_VCLXSCROLLER_HXX
1235 #include <comphelper/uno3.hxx>
1236 -#include <layout/bin.hxx>
1237 +#include <layout/core/bin.hxx>
1238 #include <toolkit/awt/vclxwindow.hxx>
1240 class ScrollBar;
1241 --- toolkit/source/awt/vclxsplitter.hxx.old 2009-04-02 10:49:36.000000000 +0000
1242 +++ toolkit/source/awt/vclxsplitter.hxx 2009-04-06 16:42:13.000000000 +0000
1243 @@ -35,7 +35,7 @@
1244 #include <com/sun/star/awt/MaxChildrenException.hpp>
1245 #include <com/sun/star/beans/XPropertySet.hpp>
1246 #include <comphelper/uno3.hxx>
1247 -#include <layout/box-base.hxx>
1248 +#include <layout/core/box-base.hxx>
1249 #include <toolkit/awt/vclxwindow.hxx>
1251 class Splitter;
1252 --- toolkit/source/awt/vclxtabcontrol.cxx.old 2009-04-02 10:49:36.000000000 +0000
1253 +++ toolkit/source/awt/vclxtabcontrol.cxx 2009-04-06 16:42:13.000000000 +0000
1254 @@ -43,8 +43,6 @@
1255 namespace layoutimpl
1256 {
1258 -using namespace ::com::sun::star::uno;
1259 -using namespace ::com::sun::star::awt;
1260 using namespace ::com::sun::star::lang;
1261 using namespace ::com::sun::star::beans;
1262 using namespace ::com::sun::star;
1263 @@ -76,12 +74,19 @@ VCLXTabControl::createChildProps( Box_Ba
1265 DBG_NAME( VCLXTabControl );
1267 +#if !defined (__GNUC__)
1268 +#define __PRETTY_FUNCTION__ __FUNCTION__
1269 +#endif /* !__GNUC__ */
1270 +
1271 VCLXTabControl::VCLXTabControl()
1272 : VCLXWindow()
1273 , VCLXTabControl_Base()
1274 , Box_Base()
1275 - , mnNextTabId( 1 )
1276 + , mTabId (1)
1277 + , bRealized (false)
1278 {
1279 + OSL_TRACE ("\n********%s:%x", __PRETTY_FUNCTION__, this);
1280 +
1281 DBG_CTOR( VCLXTabControl, NULL );
1282 }
1284 @@ -94,7 +99,7 @@ IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXTab
1286 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Base );
1288 -void SAL_CALL VCLXTabControl::dispose( ) throw(RuntimeException)
1289 +void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException)
1290 {
1291 {
1292 ::vos::OGuard aGuard( GetMutex() );
1293 @@ -108,38 +113,38 @@ void SAL_CALL VCLXTabControl::dispose( )
1294 }
1296 #if 0
1297 -void SAL_CALL VCLXTabControl::addTabListener( const Reference< XTabListener >& listener ) throw (RuntimeException)
1298 +void SAL_CALL VCLXTabControl::addTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
1299 {
1300 if ( listener.is() )
1301 maTabListeners.addInterface( listener );
1302 }
1304 -void SAL_CALL VCLXTabControl::removeTabListener( const Reference< XTabListener >& listener ) throw (RuntimeException)
1305 +void SAL_CALL VCLXTabControl::removeTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
1306 {
1307 if ( listener.is() )
1308 maTabListeners.removeInterface( listener );
1309 }
1310 #endif
1312 -TabControl *VCLXTabControl::getTabControl() const throw (RuntimeException)
1313 +TabControl *VCLXTabControl::getTabControl() const throw (uno::RuntimeException)
1314 {
1315 TabControl *pTabControl = static_cast< TabControl* >( GetWindow() );
1316 if ( pTabControl )
1317 return pTabControl;
1318 - throw RuntimeException();
1319 + throw uno::RuntimeException();
1320 }
1322 -sal_Int32 SAL_CALL VCLXTabControl::insertTab() throw (RuntimeException)
1323 +sal_Int32 SAL_CALL VCLXTabControl::insertTab() throw (uno::RuntimeException)
1324 {
1325 TabControl *pTabControl = getTabControl();
1326 - USHORT id = sal::static_int_cast< USHORT >( mnNextTabId++ );
1327 + USHORT id = sal::static_int_cast< USHORT >( mTabId++ );
1328 rtl::OUString title (RTL_CONSTASCII_USTRINGPARAM( "" ) );
1329 pTabControl->InsertPage( id, title.getStr(), TAB_APPEND );
1330 pTabControl->SetTabPage( id, new TabPage( pTabControl ) );
1331 return id;
1332 }
1334 -void SAL_CALL VCLXTabControl::removeTab( sal_Int32 ID ) throw (RuntimeException, IndexOutOfBoundsException)
1335 +void SAL_CALL VCLXTabControl::removeTab( sal_Int32 ID ) throw (uno::RuntimeException, IndexOutOfBoundsException)
1336 {
1337 TabControl *pTabControl = getTabControl();
1338 if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
1339 @@ -147,7 +152,7 @@ void SAL_CALL VCLXTabControl::removeTab(
1340 pTabControl->RemovePage( sal::static_int_cast< USHORT >( ID ) );
1341 }
1343 -void SAL_CALL VCLXTabControl::activateTab( sal_Int32 ID ) throw (RuntimeException, IndexOutOfBoundsException)
1344 +void SAL_CALL VCLXTabControl::activateTab( sal_Int32 ID ) throw (uno::RuntimeException, IndexOutOfBoundsException)
1345 {
1346 TabControl *pTabControl = getTabControl();
1347 if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
1348 @@ -155,15 +160,15 @@ void SAL_CALL VCLXTabControl::activateTa
1349 pTabControl->SelectTabPage( sal::static_int_cast< USHORT >( ID ) );
1350 }
1352 -sal_Int32 SAL_CALL VCLXTabControl::getActiveTabID() throw (RuntimeException)
1353 +sal_Int32 SAL_CALL VCLXTabControl::getActiveTabID() throw (uno::RuntimeException)
1354 {
1355 return getTabControl()->GetCurPageId( );
1356 }
1358 -void SAL_CALL VCLXTabControl::addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
1359 +void SAL_CALL VCLXTabControl::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
1360 {
1361 - for ( std::list< ::com::sun::star::uno::Reference
1362 - < ::com::sun::star::awt::XTabListener > >::const_iterator it
1363 + for ( std::list< uno::Reference
1364 + < awt::XTabListener > >::const_iterator it
1365 = mxTabListeners.begin(); it != mxTabListeners.end(); it++ )
1366 {
1367 if ( *it == xListener )
1368 @@ -173,10 +178,10 @@ void SAL_CALL VCLXTabControl::addTabList
1369 mxTabListeners.push_back( xListener );
1370 }
1372 -void SAL_CALL VCLXTabControl::removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
1373 +void SAL_CALL VCLXTabControl::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
1374 {
1375 - for ( std::list< ::com::sun::star::uno::Reference
1376 - < ::com::sun::star::awt::XTabListener > >::iterator it
1377 + for ( std::list< uno::Reference
1378 + < awt::XTabListener > >::iterator it
1379 = mxTabListeners.begin(); it != mxTabListeners.end(); it++ )
1380 {
1381 if ( *it == xListener )
1382 @@ -187,7 +192,7 @@ void SAL_CALL VCLXTabControl::removeTabL
1383 }
1384 }
1386 -void SAL_CALL VCLXTabControl::setTabProps( sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (RuntimeException, IndexOutOfBoundsException)
1387 +void SAL_CALL VCLXTabControl::setTabProps( sal_Int32 ID, const uno::Sequence< NamedValue >& Properties ) throw (uno::RuntimeException, IndexOutOfBoundsException)
1388 {
1389 TabControl *pTabControl = getTabControl();
1390 if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
1391 @@ -196,7 +201,7 @@ void SAL_CALL VCLXTabControl::setTabProp
1392 for ( int i = 0; i < Properties.getLength(); i++ )
1393 {
1394 const rtl::OUString &name = Properties[i].Name;
1395 - const Any &value = Properties[i].Value;
1396 + const uno::Any &value = Properties[i].Value;
1398 if ( name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) )
1399 {
1400 @@ -206,8 +211,8 @@ void SAL_CALL VCLXTabControl::setTabProp
1401 }
1402 }
1404 -Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID )
1405 - throw (IndexOutOfBoundsException, RuntimeException)
1406 +uno::Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID )
1407 + throw (IndexOutOfBoundsException, uno::RuntimeException)
1408 {
1409 TabControl *pTabControl = getTabControl();
1410 if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
1411 @@ -216,11 +221,11 @@ Sequence< NamedValue > SAL_CALL VCLXTabC
1412 #define ADD_PROP( seq, i, name, val ) { \
1413 NamedValue value; \
1414 value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
1415 - value.Value = makeAny( val ); \
1416 + value.Value = uno::makeAny( val ); \
1417 seq[i] = value; \
1418 }
1420 - Sequence< NamedValue > props( 2 );
1421 + uno::Sequence< NamedValue > props( 2 );
1422 ADD_PROP( props, 0, "Title", rtl::OUString( pTabControl->GetPageText( sal::static_int_cast< USHORT >( ID ) ) ) );
1423 ADD_PROP( props, 1, "Position", pTabControl->GetPagePos( sal::static_int_cast< USHORT >( ID ) ) );
1424 #undef ADD_PROP
1425 @@ -228,7 +233,7 @@ Sequence< NamedValue > SAL_CALL VCLXTabC
1426 }
1428 // TODO: draw tab border here
1429 -void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
1430 +void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::RuntimeException)
1431 {
1432 ::vos::OGuard aGuard( GetMutex() );
1434 @@ -249,16 +254,25 @@ void SAL_CALL VCLXTabControl::draw( sal_
1435 VCLXWindow::draw( nX, nY );
1436 }
1438 +void VCLXTabControl::AddChild (uno::Reference< awt::XLayoutConstrains > const& xChild)
1439 +
1440 +{
1441 + OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
1442 + mIdMap[ xChild ] = mTabId++;
1443 + Box_Base::AddChild( xChild );
1444 + OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
1445 +}
1446 +
1447 void SAL_CALL VCLXTabControl::addChild(
1448 - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > &xChild )
1449 - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::awt::MaxChildrenException)
1450 + const uno::Reference< awt::XLayoutConstrains > &xChild )
1451 + throw (uno::RuntimeException, awt::MaxChildrenException)
1452 {
1453 mIdMap[ xChild ] = insertTab();
1454 Box_Base::addChild( xChild );
1455 }
1457 -void SAL_CALL VCLXTabControl::removeChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > &xChild )
1458 - throw (::com::sun::star::uno::RuntimeException)
1459 +void SAL_CALL VCLXTabControl::removeChild( const uno::Reference< awt::XLayoutConstrains > &xChild )
1460 + throw (uno::RuntimeException)
1461 {
1462 removeTab( mIdMap[xChild] );
1463 mIdMap[ xChild ] = -1;
1464 @@ -284,22 +298,87 @@ static void setChildrenVisible( uno::Ref
1465 }
1466 }
1468 -void SAL_CALL VCLXTabControl::allocateArea(
1469 - const ::com::sun::star::awt::Rectangle &rArea )
1470 - throw (::com::sun::star::uno::RuntimeException)
1471 +void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
1472 + throw (uno::RuntimeException)
1473 {
1474 - maAllocation = rArea;
1475 + OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
1476 + maAllocation = area;
1478 TabControl *pTabControl = getTabControl();
1480 -// FIXME: this is wrong. We just want to set tab controls pos/size for the tabs menu,
1481 -// otherwise, it gets events that should go to children (I guess we could solve this
1482 -// by making the tabcontrol as the actual XWindow parent of its children, when importing...)
1483 -// Not sure about TabPage drawing... That doesn't work on gtk+; just ignoring that.
1484 -// LATER: Nah, the proper fix is to get the XWindow hierarchy straight.
1485 +// FIXME: this is wrong. We just want to set tab controls pos/size for
1486 +// the tabs menu, otherwise, it gets events that should go to children
1487 +// (I guess we could solve this by making the tabcontrol as the actual
1488 +// XWindow parent of its children, when importing...) Not sure about
1489 +// TabPage drawing... That doesn't work on gtk+; just ignoring that.
1490 +// LATER: Nah, the proper fix is to get the XWindow hierarchy
1491 +// straight.
1492 +
1493 +#if 0
1494 + setPosSize( area.X, area.Y, area.Width, area.Height, awt::PosSize::POSSIZE );
1495 +#else
1496 + awt::Size currentSize = getSize();
1497 + awt::Size requestedSize (area.Width, area.Height);
1498 +// requestedSize.Height = getHeightForWidth( area.Width );
1499 +
1500 + awt::Size minimumSize = getMinimumSize();
1501 + if (requestedSize.Width < minimumSize.Width)
1502 + requestedSize.Width = minimumSize.Width;
1503 + if (requestedSize.Height < minimumSize.Height)
1504 + requestedSize.Height = minimumSize.Height;
1505 +
1506 + Size pageSize = static_cast<TabControl*> (GetWindow ())->GetTabPageSizePixel ();
1507 + awt::Size pageBasedSize (0, 0);
1508 + pageBasedSize.Width = pageSize.Width ();
1509 + pageBasedSize.Height = pageSize.Height ();
1510 +
1511 + const int wc = 0;
1512 + const int hc = 20;
1513 + static int pwc = 0;
1514 + static int phc = 40;
1515 +
1516 + if (requestedSize.Width < pageBasedSize.Width)
1517 + requestedSize.Width = pageBasedSize.Width + wc;
1518 + if (requestedSize.Height < pageBasedSize.Height)
1519 + requestedSize.Height = pageBasedSize.Height + hc;
1520 +
1521 + Size windowSize = GetWindow()->GetSizePixel();
1522 + Window *parent = GetWindow()->GetParent();
1523 + Size parentSize = parent->GetSizePixel();
1524 +
1525 +#ifdef GCC_MAJOR
1526 + OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
1527 +#endif /* GCC_MAJOR */
1528 + OSL_TRACE ("%s: cursize: %d ,%d", __FUNCTION__, currentSize.Width, currentSize.Height );
1529 + OSL_TRACE ("%s: area: %d, %d", __FUNCTION__, area.Width, area.Height );
1530 + OSL_TRACE ("%s: minimum: %d, %d", __FUNCTION__, minimumSize.Width, minimumSize.Height );
1531 + OSL_TRACE ("%s: requestedSize: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
1532 + OSL_TRACE ("%s: pageBasedSize: %d, %d", __FUNCTION__, pageBasedSize.Width, pageBasedSize.Height );
1534 - setPosSize( rArea.X, rArea.Y, rArea.Width, rArea.Height, PosSize::POSSIZE );
1535 + //OSL_TRACE ("%s: parent: %d, %d", __FUNCTION__, parentSize.Width(), parentSize.Height() );
1536 + //OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, windowSize.Width(), windowSize.Height() );
1538 + //bRealized = false;
1539 + if (!bRealized)
1540 + {
1541 + setPosSize( area.X, area.Y, requestedSize.Width, requestedSize.Height, awt::PosSize::POSSIZE );
1542 + bRealized = true;
1543 + }
1544 + else
1545 + {
1546 + if ( requestedSize.Width > currentSize.Width + 10)
1547 + setPosSize( 0, 0, requestedSize.Width, 0, awt::PosSize::WIDTH );
1548 + if ( requestedSize.Height > currentSize.Height + 10)
1549 + setPosSize( 0, 0, 0, requestedSize.Height, awt::PosSize::HEIGHT );
1550 + }
1551 +#endif
1552 +
1553 + if (pageBasedSize.Width > parentSize.Width ()
1554 + || pageBasedSize.Height > parentSize.Height ())
1555 + //parent->SetSizePixel ( Size (pageBasedSize.Width, pageBasedSize.Height));
1556 + //parent->SetSizePixel ( Size (pageBasedSize.Width + pwc, pageBasedSize.Height + phc));
1557 + parent->SetSizePixel ( Size (requestedSize.Width + pwc, requestedSize.Height + phc));
1558 +
1559 // FIXME: we can save cycles by setting visibility more sensibly. Having
1560 // it here does makes it easier when changing tabs (just needs a recalc())
1561 unsigned i = 0;
1562 @@ -307,8 +386,8 @@ void SAL_CALL VCLXTabControl::allocateAr
1563 = maChildren.begin(); it != maChildren.end(); it++, i++ )
1564 {
1565 ChildData *child = static_cast<VCLXTabControl::ChildData*> ( *it );
1566 - ::com::sun::star::uno::Reference
1567 - < ::com::sun::star::awt::XLayoutConstrains > xChild( child->mxChild );
1568 + uno::Reference
1569 + < awt::XLayoutConstrains > xChild( child->mxChild );
1570 if ( xChild.is() )
1571 {
1572 uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY );
1573 @@ -340,15 +419,15 @@ void SAL_CALL VCLXTabControl::allocateAr
1574 }
1575 }
1577 -::com::sun::star::awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
1578 - throw(::com::sun::star::uno::RuntimeException)
1579 +awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
1580 + throw(uno::RuntimeException)
1581 {
1582 - awt::Size size = VCLXWindow::getMinimumSize();
1583 + awt::Size requestedSize = VCLXWindow::getMinimumSize();
1584 awt::Size childrenSize( 0, 0 );
1586 TabControl* pTabControl = static_cast< TabControl* >( GetWindow() );
1587 if ( !pTabControl )
1588 - return size;
1589 + return requestedSize;
1591 // calculate size to accomodate all children
1592 unsigned i = 0;
1593 @@ -367,10 +446,17 @@ void SAL_CALL VCLXTabControl::allocateAr
1594 }
1595 }
1597 - size.Width += childrenSize.Width;
1598 - size.Height += childrenSize.Height + 20;
1599 - maRequisition = size;
1600 - return size;
1601 +#ifdef GCC_MAJOR
1602 + OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
1603 +#endif /* GCC_MAJOR */
1604 + OSL_TRACE ("%s: children: %d", __FUNCTION__, i);
1605 + OSL_TRACE ("%s: childrenSize: %d, %d", __FUNCTION__, childrenSize.Width, childrenSize.Height );
1606 +
1607 + requestedSize.Width += childrenSize.Width;
1608 + requestedSize.Height += childrenSize.Height + 20;
1609 +
1610 + maRequisition = requestedSize;
1611 + return requestedSize;
1612 }
1614 void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
1615 @@ -391,12 +477,12 @@ void VCLXTabControl::ProcessWindowEvent(
1616 case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
1617 {
1618 ULONG page = (ULONG) _rVclWindowEvent.GetData();
1619 - for ( std::list< ::com::sun::star::uno::Reference
1620 - < ::com::sun::star::awt::XTabListener > >::iterator it
1621 + for ( std::list< uno::Reference
1622 + < awt::XTabListener > >::iterator it
1623 = mxTabListeners.begin(); it != mxTabListeners.end(); it++)
1624 {
1625 - ::com::sun::star::uno::Reference
1626 - < ::com::sun::star::awt::XTabListener > listener = *it;
1627 + uno::Reference
1628 + < awt::XTabListener > listener = *it;
1630 switch ( _rVclWindowEvent.GetId() )
1631 {
1632 @@ -414,7 +500,7 @@ void VCLXTabControl::ProcessWindowEvent(
1633 listener->removed( page );
1634 break;
1635 case VCLEVENT_TABPAGE_REMOVEDALL:
1636 - for ( int i = 1; i < mnNextTabId; i++)
1637 + for ( int i = 1; i < mTabId; i++)
1638 {
1639 if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( i ) ) )
1640 listener->removed( i );
1641 @@ -434,12 +520,12 @@ void VCLXTabControl::ProcessWindowEvent(
1642 }
1643 }
1645 -void SAL_CALL VCLXTabControl::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
1646 +void SAL_CALL VCLXTabControl::setProperty( const ::rtl::OUString& PropertyName, const uno::Any &Value ) throw(uno::RuntimeException)
1647 {
1648 VCLXWindow::setProperty( PropertyName, Value );
1649 }
1651 -Any SAL_CALL VCLXTabControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
1652 +uno::Any SAL_CALL VCLXTabControl::getProperty( const ::rtl::OUString& PropertyName ) throw(uno::RuntimeException)
1653 {
1654 return VCLXWindow::getProperty( PropertyName );
1655 }
1656 --- toolkit/source/awt/vclxtabcontrol.hxx.old 2009-04-02 10:49:36.000000000 +0000
1657 +++ toolkit/source/awt/vclxtabcontrol.hxx 2009-04-06 16:42:13.000000000 +0000
1658 @@ -34,7 +34,7 @@
1660 #include <com/sun/star/awt/XSimpleTabController.hpp>
1661 #include <comphelper/uno3.hxx>
1662 -#include <layout/box-base.hxx>
1663 +#include <layout/core/box-base.hxx>
1664 #include <map>
1665 #include <toolkit/awt/vclxwindow.hxx>
1667 @@ -50,9 +50,14 @@ class VCLXTabControl :public VCLXWindow
1668 ,public VCLXTabControl_Base
1669 ,public Box_Base
1670 {
1671 + int mTabId;
1672 + bool bRealized;
1673 +
1674 public:
1675 VCLXTabControl();
1677 + void AddChild (css::uno::Reference <css::awt::XLayoutConstrains> const &);
1678 +
1679 protected:
1680 ~VCLXTabControl();
1682 @@ -65,7 +70,7 @@ protected:
1683 // XComponent
1684 void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
1686 - virtual void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw (::com::sun::star::uno::RuntimeException);
1687 + virtual void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw (::com::sun::star::uno::RuntimeException);
1689 // XSimpleTabController
1690 virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException);
1691 @@ -108,10 +113,6 @@ protected:
1692 // VCLXWindow
1693 void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
1695 -
1696 - // Each tab page needs an unique id.
1697 - int mnNextTabId;
1698 -
1699 public:
1700 // Maps page ids to child references
1701 struct ChildData : public Box_Base::ChildData
1702 --- toolkit/source/awt/vclxtabpage.cxx.old 2009-04-06 16:42:11.000000000 +0000
1703 +++ toolkit/source/awt/vclxtabpage.cxx 2009-04-06 16:42:13.000000000 +0000
1704 @@ -41,6 +41,10 @@
1705 #include <vcl/tabpage.hxx>
1706 #include <vcl/tabctrl.hxx>
1708 +#if !defined (__GNUC__)
1709 +#define __PRETTY_FUNCTION__ __FUNCTION__
1710 +#endif /* !__GNUC__ */
1711 +
1712 namespace layoutimpl
1713 {
1715 @@ -72,7 +76,7 @@ void SAL_CALL VCLXTabPage::dispose() thr
1716 ::vos::OGuard aGuard( GetMutex() );
1718 lang::EventObject aDisposeEvent;
1719 - aDisposeEvent.Source = *this;
1720 + aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
1721 }
1723 VCLXWindow::dispose();
1724 @@ -81,44 +85,58 @@ void SAL_CALL VCLXTabPage::dispose() thr
1725 void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
1726 throw (uno::RuntimeException)
1727 {
1728 - awt::Size curSize = getSize();
1729 - awt::Size reqSize = getMinimumSize();
1730 - reqSize.Height = getHeightForWidth( area.Width );
1731 -
1732 - if ( curSize.Width > 0 && curSize.Height > 0
1733 - && reqSize.Width > curSize.Width )
1734 - reqSize.Width = curSize.Width;
1735 - if ( curSize.Width > 0 && curSize.Height > 0
1736 - && reqSize.Height > curSize.Height )
1737 - reqSize.Height = curSize.Height;
1738 + awt::Size currentSize = getSize();
1739 + awt::Size requestedSize = getMinimumSize();
1740 + requestedSize.Height = getHeightForWidth( area.Width );
1741 +
1742 + if ( currentSize.Width > 0 && currentSize.Height > 0
1743 + && requestedSize.Width > currentSize.Width )
1744 + requestedSize.Width = currentSize.Width;
1745 + if ( currentSize.Width > 0 && currentSize.Height > 0
1746 + && requestedSize.Height > currentSize.Height )
1747 + requestedSize.Height = currentSize.Height;
1749 // FIXME: missing destructor?
1750 if ( !GetWindow() )
1751 return;
1753 - Size window = GetWindow()->GetSizePixel();
1754 - Size parent = GetWindow()->GetParent()->GetSizePixel();
1755 + Size windowSize = GetWindow()->GetSizePixel();
1756 + Window *parent = GetWindow()->GetParent();
1757 + Size parentSize = parent->GetSizePixel();
1759 Point pos = GetWindow()->GetPosPixel();
1760 + OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
1761 OSL_TRACE ("%s: curpos: %d ,%d", __FUNCTION__, pos.X(), pos.Y() );
1763 - OSL_TRACE ("%s: cursize: %d ,%d", __FUNCTION__, curSize.Width, curSize.Height );
1764 + OSL_TRACE ("%s: cursize: %d ,%d", __FUNCTION__, currentSize.Width, currentSize.Height );
1765 OSL_TRACE ("%s: area: %d, %d", __FUNCTION__, area.Width, area.Height );
1766 - OSL_TRACE ("%s: reqSize: %d, %d", __FUNCTION__, reqSize.Width, reqSize.Height );
1767 - OSL_TRACE ("%s: parent: %d, %d", __FUNCTION__, parent.Width(), parent.Height() );
1768 - OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, window.Width(), window.Height() );
1769 + OSL_TRACE ("%s: requestedSize: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
1770 + OSL_TRACE ("%s: parent: %d, %d", __FUNCTION__, parentSize.Width(), parentSize.Height() );
1771 + OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, windowSize.Width(), windowSize.Height() );
1772 +
1773 +#if 0
1774 + if (requestedSize.Width > parentSize.Width ()
1775 + || requestedSize.Height > parentSize.Height ())
1776 + {
1777 + OSL_TRACE ("%s: ***setting parent: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
1778 + parent->SetSizePixel ( Size (requestedSize.Width, requestedSize.Height) );
1779 +
1780 + if (Window *grand_parent = parent->GetParent ())
1781 + grand_parent->SetSizePixel ( Size (requestedSize.Width, requestedSize.Height) );
1782 + }
1783 +#endif
1785 if ( !bRealized )
1786 {
1787 - setPosSize( 0, 0, reqSize.Width, reqSize.Height, awt::PosSize::SIZE );
1788 + setPosSize( area.X, area.Y, requestedSize.Width, requestedSize.Height, awt::PosSize::SIZE );
1789 bRealized = true;
1790 }
1791 else
1792 {
1793 - if ( reqSize.Width > curSize.Width )
1794 - setPosSize( 0, 0, reqSize.Width, 0, awt::PosSize::WIDTH );
1795 - if ( reqSize.Height > curSize.Height )
1796 - setPosSize( 0, 0, 0, reqSize.Height, awt::PosSize::HEIGHT );
1797 + if ( requestedSize.Width > currentSize.Width + 10)
1798 + setPosSize( 0, 0, requestedSize.Width, 0, awt::PosSize::WIDTH );
1799 + if ( requestedSize.Height > currentSize.Height + 10)
1800 + setPosSize( 0, 0, 0, requestedSize.Height, awt::PosSize::HEIGHT );
1801 }
1803 awt::Size newSize = getSize();
1804 --- toolkit/source/awt/vclxtabpage.hxx.old 2009-04-06 16:42:11.000000000 +0000
1805 +++ toolkit/source/awt/vclxtabpage.hxx 2009-04-06 16:42:13.000000000 +0000
1806 @@ -37,7 +37,7 @@
1807 #define LAYOUT_AWT_VCLXTABPAGE_HXX
1809 #include <toolkit/awt/vclxwindow.hxx>
1810 -#include <layout/bin.hxx>
1811 +#include <layout/core/bin.hxx>
1812 #include <comphelper/uno3.hxx>
1814 namespace layoutimpl
1815 @@ -49,6 +49,7 @@ class VCLXTabPage : public VCLXWindow
1816 , public Bin
1817 {
1818 bool bRealized;
1819 +
1820 public:
1821 VCLXTabPage( Window *p );
1823 --- toolkit/source/awt/vclxwindow.cxx.old 2009-04-06 16:41:46.000000000 +0000
1824 +++ toolkit/source/awt/vclxwindow.cxx 2009-04-06 16:42:13.000000000 +0000
1825 @@ -402,6 +402,10 @@ void VCLXWindowImpl::disposing()
1826 aEvent.Source = mrAntiImpl;
1828 maEventListeners.disposeAndClear( aEvent );
1829 +#if 0 // ENABLE_LAYOUT
1830 + /* FIXME: see layout::~ComboBox () */
1831 + if (!dynamic_cast<VCLXComboBox*> (this))
1832 +#endif /* 0 ENABLE_LAYOUT */
1833 maFocusListeners.disposeAndClear( aEvent );
1834 maWindowListeners.disposeAndClear( aEvent );
1835 maKeyListeners.disposeAndClear( aEvent );
1836 --- toolkit/source/awt/vclxwindows.cxx.old 2009-04-06 16:41:46.000000000 +0000
1837 +++ toolkit/source/awt/vclxwindows.cxx 2009-04-06 16:42:13.000000000 +0000
1838 @@ -417,6 +417,11 @@ VCLXButton::VCLXButton()
1839 {
1840 }
1842 +VCLXButton::~VCLXButton()
1843 +{
1844 + OSL_TRACE ("%s", __FUNCTION__);
1845 +}
1846 +
1847 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXButton::CreateAccessibleContext()
1848 {
1849 return getAccessibleFactory().createAccessibleContext( this );
1850 @@ -1362,6 +1367,13 @@ void VCLXRadioButton::ImplClickedOrToggl
1851 }
1852 }
1854 +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > VCLXRadioButton::getFirstActionListener ()
1855 +{
1856 + if (!maItemListeners.getLength ())
1857 + return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ();
1858 + return maActionListeners.getElements()[0];
1859 +}
1860 +
1861 // ----------------------------------------------------
1862 // class VCLXSpinField
1863 // ----------------------------------------------------
1864 @@ -2176,6 +2188,7 @@ VCLXDialog::VCLXDialog()
1866 VCLXDialog::~VCLXDialog()
1867 {
1868 + OSL_TRACE ("%s", __FUNCTION__);
1869 }
1871 // ::com::sun::star::uno::XInterface
1872 @@ -3744,6 +3757,11 @@ VCLXComboBox::VCLXComboBox()
1873 {
1874 }
1876 +VCLXComboBox::~VCLXComboBox()
1877 +{
1878 + OSL_TRACE ("%s", __FUNCTION__);
1879 +}
1880 +
1881 // ::com::sun::star::uno::XInterface
1882 ::com::sun::star::uno::Any VCLXComboBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
1883 {
1884 --- toolkit/source/layout/bin.cxx.old 2009-04-02 10:49:36.000000000 +0000
1885 +++ toolkit/source/layout/bin.cxx 1970-01-01 00:00:00.000000000 +0000
1886 @@ -1,190 +0,0 @@
1887 -/*************************************************************************
1888 - *
1889 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1890 - *
1891 - * Copyright 2008 by Sun Microsystems, Inc.
1892 - *
1893 - * OpenOffice.org - a multi-platform office productivity suite
1894 - *
1895 - * $RCSfile: bin.cxx,v $
1896 - *
1897 - * $Revision: 1.3 $
1898 - *
1899 - * This file is part of OpenOffice.org.
1900 - *
1901 - * OpenOffice.org is free software: you can redistribute it and/or modify
1902 - * it under the terms of the GNU Lesser General Public License version 3
1903 - * only, as published by the Free Software Foundation.
1904 - *
1905 - * OpenOffice.org is distributed in the hope that it will be useful,
1906 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
1907 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1908 - * GNU Lesser General Public License version 3 for more details
1909 - * (a copy is included in the LICENSE file that accompanied this code).
1910 - *
1911 - * You should have received a copy of the GNU Lesser General Public License
1912 - * version 3 along with OpenOffice.org. If not, see
1913 - * <http://www.openoffice.org/license.html>
1914 - * for a copy of the LGPLv3 License.
1915 - *
1916 - ************************************************************************/
1917 -
1918 -#include "bin.hxx"
1919 -
1920 -#include <sal/macros.h>
1921 -
1922 -namespace layoutimpl
1923 -{
1924 -
1925 -using namespace css;
1926 -
1927 -/* Bin */
1928 -
1929 -Bin::Bin() : Container()
1930 -{
1931 -}
1932 -
1933 -void SAL_CALL
1934 -Bin::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
1935 - throw (uno::RuntimeException, awt::MaxChildrenException)
1936 -{
1937 - if ( mxChild.is() )
1938 - throw awt::MaxChildrenException();
1939 - if ( xChild.is() )
1940 - {
1941 - mxChild = xChild;
1942 - setChildParent( xChild );
1943 - queueResize();
1944 - }
1945 -}
1946 -
1947 -void SAL_CALL
1948 -Bin::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
1949 - throw (uno::RuntimeException)
1950 -{
1951 - if ( xChild == mxChild )
1952 - {
1953 - mxChild = uno::Reference< awt::XLayoutConstrains >();
1954 - unsetChildParent( xChild );
1955 - queueResize();
1956 - }
1957 -}
1958 -
1959 -uno::Sequence< uno::Reference< awt::XLayoutConstrains > > SAL_CALL
1960 -Bin::getChildren()
1961 - throw (uno::RuntimeException)
1962 -{
1963 - return getSingleChild (mxChild);
1964 -}
1965 -
1966 -void SAL_CALL
1967 -Bin::allocateArea( const awt::Rectangle &rArea )
1968 - throw (uno::RuntimeException)
1969 -{
1970 - maAllocation = rArea;
1971 - if ( mxChild.is() )
1972 - allocateChildAt( mxChild, rArea );
1973 -}
1974 -
1975 -awt::Size SAL_CALL
1976 -Bin::getMinimumSize()
1977 - throw(uno::RuntimeException)
1978 -{
1979 - if ( mxChild.is() )
1980 - return maRequisition = maChildRequisition = mxChild->getMinimumSize();
1981 - return maRequisition = awt::Size( 0, 0 );
1982 -}
1983 -
1984 -uno::Reference< beans::XPropertySet > SAL_CALL
1985 -Bin::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& )
1986 - throw (uno::RuntimeException)
1987 -{
1988 - return uno::Reference< beans::XPropertySet >();
1989 -}
1990 -
1991 -sal_Bool SAL_CALL
1992 -Bin::hasHeightForWidth()
1993 - throw(uno::RuntimeException)
1994 -{
1995 - uno::Reference< awt::XLayoutContainer > xChildCont( mxChild, uno::UNO_QUERY );
1996 - if ( xChildCont.is() )
1997 - return xChildCont->hasHeightForWidth();
1998 - return false;
1999 -}
2000 -
2001 -sal_Int32 SAL_CALL
2002 -Bin::getHeightForWidth( sal_Int32 nWidth )
2003 - throw(uno::RuntimeException)
2004 -{
2005 - uno::Reference< awt::XLayoutContainer > xChildCont( mxChild, uno::UNO_QUERY );
2006 - if ( xChildCont.is() )
2007 - return xChildCont->getHeightForWidth( nWidth );
2008 - return maRequisition.Height;
2009 -}
2010 -
2011 -/* Align */
2012 -
2013 -Align::Align() : Bin()
2014 -{
2015 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Halign" ),
2016 - ::getCppuType( static_cast< const float* >( NULL ) ),
2017 - &fHorAlign );
2018 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Valign" ),
2019 - ::getCppuType( static_cast< const float* >( NULL ) ),
2020 - &fVerAlign );
2021 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Hfill" ),
2022 - ::getCppuType( static_cast< const float* >( NULL ) ),
2023 - &fHorFill );
2024 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Vfill" ),
2025 - ::getCppuType( static_cast< const float* >( NULL ) ),
2026 - &fVerFill );
2027 -
2028 - fHorAlign = fVerAlign = 0.5;
2029 - fHorFill = fVerFill = 0;
2030 -}
2031 -
2032 -void SAL_CALL
2033 -Align::allocateArea( const awt::Rectangle &rArea )
2034 - throw (uno::RuntimeException)
2035 -{
2036 - maAllocation = rArea;
2037 - if ( !mxChild.is() )
2038 - return;
2039 -
2040 - awt::Rectangle aChildArea;
2041 - aChildArea.Width = SAL_MIN( rArea.Width, maChildRequisition.Width );
2042 - aChildArea.Width += (sal_Int32) SAL_MAX(
2043 - 0, (rArea.Width - maChildRequisition.Width) * fHorFill );
2044 - aChildArea.Height = SAL_MIN( rArea.Height, maChildRequisition.Height );
2045 - aChildArea.Height += (sal_Int32) SAL_MAX(
2046 - 0, (rArea.Height - maChildRequisition.Height) * fVerFill );
2047 -
2048 - aChildArea.X = rArea.X + (sal_Int32)( (rArea.Width - aChildArea.Width) * fHorAlign );
2049 - aChildArea.Y = rArea.Y + (sal_Int32)( (rArea.Height - aChildArea.Height) * fVerAlign );
2050 -
2051 - allocateChildAt( mxChild, aChildArea );
2052 -}
2053 -
2054 -/* MinSize */
2055 -
2056 -MinSize::MinSize() : Bin()
2057 -{
2058 - mnMinWidth = mnMinHeight = 0;
2059 - addProp( RTL_CONSTASCII_USTRINGPARAM( "MinWidth" ),
2060 - ::getCppuType( static_cast< const long* >( NULL ) ),
2061 - &mnMinWidth );
2062 - addProp( RTL_CONSTASCII_USTRINGPARAM( "MinHeight" ),
2063 - ::getCppuType( static_cast< const long* >( NULL ) ),
2064 - &mnMinHeight );
2065 -}
2066 -
2067 -awt::Size SAL_CALL MinSize::getMinimumSize()
2068 - throw(uno::RuntimeException)
2069 -{
2070 - Bin::getMinimumSize();
2071 - maRequisition.Width = SAL_MAX( maRequisition.Width, mnMinWidth );
2072 - maRequisition.Height = SAL_MAX( maRequisition.Height, mnMinHeight );
2073 - return maRequisition;
2074 -}
2075 -
2076 -} // namespace layoutimpl
2077 --- toolkit/source/layout/bin.hxx.old 2009-04-02 10:49:36.000000000 +0000
2078 +++ toolkit/source/layout/bin.hxx 1970-01-01 00:00:00.000000000 +0000
2079 @@ -1,120 +0,0 @@
2080 -/*************************************************************************
2081 - *
2082 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2083 - *
2084 - * Copyright 2008 by Sun Microsystems, Inc.
2085 - *
2086 - * OpenOffice.org - a multi-platform office productivity suite
2087 - *
2088 - * $RCSfile: bin.hxx,v $
2089 - *
2090 - * $Revision: 1.3 $
2091 - *
2092 - * This file is part of OpenOffice.org.
2093 - *
2094 - * OpenOffice.org is free software: you can redistribute it and/or modify
2095 - * it under the terms of the GNU Lesser General Public License version 3
2096 - * only, as published by the Free Software Foundation.
2097 - *
2098 - * OpenOffice.org is distributed in the hope that it will be useful,
2099 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2100 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2101 - * GNU Lesser General Public License version 3 for more details
2102 - * (a copy is included in the LICENSE file that accompanied this code).
2103 - *
2104 - * You should have received a copy of the GNU Lesser General Public License
2105 - * version 3 along with OpenOffice.org. If not, see
2106 - * <http://www.openoffice.org/license.html>
2107 - * for a copy of the LGPLv3 License.
2108 - *
2109 - ************************************************************************/
2110 -
2111 -/* A few simple binary containers */
2112 -
2113 -#ifndef CORE_BIN_HXX
2114 -#define CORE_BIN_HXX
2115 -
2116 -#include "container.hxx"
2117 -
2118 -namespace layoutimpl
2119 -{
2120 -
2121 -class Bin : public Container
2122 -{
2123 -protected:
2124 - // Child
2125 - css::awt::Size maChildRequisition;
2126 - css::uno::Reference< css::awt::XLayoutConstrains > mxChild;
2127 -
2128 -public:
2129 - Bin();
2130 - virtual ~Bin() {}
2131 -
2132 - // css::awt::XLayoutContainer
2133 - virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2134 - throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
2135 - virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2136 - throw (css::uno::RuntimeException);
2137 -
2138 - virtual css::uno::Sequence< css::uno::Reference
2139 - < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
2140 - throw (css::uno::RuntimeException);
2141 -
2142 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
2143 - throw (css::uno::RuntimeException);
2144 -
2145 - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
2146 - const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2147 - throw (css::uno::RuntimeException);
2148 -
2149 - virtual sal_Bool SAL_CALL hasHeightForWidth()
2150 - throw(css::uno::RuntimeException);
2151 - virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
2152 - throw(css::uno::RuntimeException);
2153 -
2154 - // css::awt::XLayoutConstrains
2155 - virtual css::awt::Size SAL_CALL getMinimumSize()
2156 - throw(css::uno::RuntimeException);
2157 -
2158 - PROPHELPER_SET_INFO
2159 -};
2160 -
2161 -// Align gives control over child position on the allocated space.
2162 -class Align : public Bin
2163 -{
2164 - friend class AlignChildProps;
2165 -protected:
2166 - // properties
2167 - float fHorAlign, fVerAlign;
2168 - float fHorFill, fVerFill;
2169 -
2170 -public:
2171 - Align();
2172 -
2173 - // css::awt::XLayoutContainer
2174 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
2175 - throw (css::uno::RuntimeException);
2176 -
2177 - PROPHELPER_SET_INFO
2178 -};
2179 -
2180 -// Makes child request its or a specified size, whatever is larger.
2181 -class MinSize : public Bin
2182 -{
2183 -protected:
2184 - // properties
2185 - long mnMinWidth, mnMinHeight;
2186 -
2187 -public:
2188 - MinSize();
2189 -
2190 - // css::awt::XLayoutContainer
2191 - virtual css::awt::Size SAL_CALL getMinimumSize()
2192 - throw(css::uno::RuntimeException);
2193 -
2194 - PROPHELPER_SET_INFO
2195 -};
2196 -
2197 -} // namespace layoutimpl
2198 -
2199 -#endif /*CORE_BIN_HXX*/
2200 --- toolkit/source/layout/box-base.cxx.old 2009-04-02 10:49:36.000000000 +0000
2201 +++ toolkit/source/layout/box-base.cxx 1970-01-01 00:00:00.000000000 +0000
2202 @@ -1,170 +0,0 @@
2203 -/*************************************************************************
2204 - *
2205 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2206 - *
2207 - * Copyright 2008 by Sun Microsystems, Inc.
2208 - *
2209 - * OpenOffice.org - a multi-platform office productivity suite
2210 - *
2211 - * $RCSfile: box-base.cxx,v $
2212 - *
2213 - * $Revision: 1.2 $
2214 - *
2215 - * This file is part of OpenOffice.org.
2216 - *
2217 - * OpenOffice.org is free software: you can redistribute it and/or modify
2218 - * it under the terms of the GNU Lesser General Public License version 3
2219 - * only, as published by the Free Software Foundation.
2220 - *
2221 - * OpenOffice.org is distributed in the hope that it will be useful,
2222 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2223 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2224 - * GNU Lesser General Public License version 3 for more details
2225 - * (a copy is included in the LICENSE file that accompanied this code).
2226 - *
2227 - * You should have received a copy of the GNU Lesser General Public License
2228 - * version 3 along with OpenOffice.org. If not, see
2229 - * <http://www.openoffice.org/license.html>
2230 - * for a copy of the LGPLv3 License.
2231 - *
2232 - ************************************************************************/
2233 -
2234 -#include "box.hxx"
2235 -
2236 -#include <tools/debug.hxx>
2237 -#include <sal/macros.h>
2238 -
2239 -#include <com/sun/star/awt/XWindow2.hpp>
2240 -
2241 -// fixed point precision for distributing error
2242 -#define FIXED_PT 16
2243 -
2244 -namespace layoutimpl
2245 -{
2246 -
2247 -using namespace css;
2248 -
2249 -Box_Base::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
2250 - : mxChild( xChild )
2251 - , mxProps()
2252 - , maRequisition()
2253 -{
2254 -}
2255 -
2256 -static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
2257 -{
2258 - if ( !xWidget.is() )
2259 - {
2260 - DBG_ERROR( "FIXME: invalid child !" );
2261 - return true;
2262 - }
2263 -
2264 - uno::Reference< awt::XWindow2 > xWindow( xWidget, uno::UNO_QUERY );
2265 - if ( xWindow.is() && !xWindow->isVisible() )
2266 - return false;
2267 -
2268 - uno::Reference< awt::XLayoutContainer > xContainer( xWidget, uno::UNO_QUERY );
2269 - if ( xContainer.is() )
2270 - {
2271 - uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren
2272 - = xContainer->getChildren();
2273 -
2274 - // FIXME: <flow> workaround: empty visible containers always visible:
2275 - if ( !aChildren.getLength() )
2276 - return true;
2277 -
2278 - for ( int i = 0; i < aChildren.getLength(); i++ )
2279 - if ( isVisible( aChildren[i] ) )
2280 - return true;
2281 - return false; // this would kill flow without workaround above
2282 - }
2283 -
2284 - return true;
2285 -}
2286 -
2287 -bool Box_Base::ChildData::isVisible()
2288 -{
2289 - // FIXME: call the 'isVisible' method on it ?
2290 - return layoutimpl::isVisible( mxChild );
2291 -}
2292 -
2293 -void SAL_CALL
2294 -Box_Base::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
2295 - throw (uno::RuntimeException, awt::MaxChildrenException)
2296 -{
2297 - if ( xChild.is() )
2298 - {
2299 - ChildData *pData = createChild( xChild );
2300 - maChildren.push_back( pData );
2301 - setChildParent( xChild );
2302 - queueResize();
2303 - }
2304 -}
2305 -
2306 -Box_Base::ChildData*
2307 -Box_Base::removeChildData( std::list< ChildData* > lst, css::uno::Reference< css::awt::XLayoutConstrains > const& xChild )
2308 -{
2309 - for ( std::list< ChildData* >::iterator it = lst.begin();
2310 - it != lst.end(); it++ )
2311 - {
2312 - if ( (*it)->mxChild == xChild )
2313 - {
2314 - lst.erase( it );
2315 - return *it;
2316 - }
2317 - }
2318 - return 0;
2319 -}
2320 -
2321 -void SAL_CALL
2322 -Box_Base::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
2323 - throw (uno::RuntimeException)
2324 -{
2325 - if ( ChildData* p = removeChildData( maChildren, xChild ) )
2326 - {
2327 - delete p;
2328 - unsetChildParent( xChild );
2329 - queueResize();
2330 - }
2331 - else
2332 - {
2333 - DBG_ERROR( "Box_Base: removeChild: no such child" );
2334 - }
2335 -}
2336 -
2337 -uno::Sequence< uno::Reference < awt::XLayoutConstrains > > SAL_CALL
2338 -Box_Base::getChildren()
2339 - throw (uno::RuntimeException)
2340 -{
2341 - uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
2342 - unsigned int index = 0;
2343 - for ( std::list< ChildData* >::iterator it = maChildren.begin();
2344 - it != maChildren.end(); it++, index++ )
2345 - children[index] = ( *it )->mxChild;
2346 -
2347 - return children;
2348 -}
2349 -
2350 -uno::Reference< beans::XPropertySet > SAL_CALL
2351 -Box_Base::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& xChild )
2352 - throw (uno::RuntimeException)
2353 -{
2354 -
2355 - for ( std::list< ChildData * >::iterator it = maChildren.begin();
2356 - it != maChildren.end(); it++)
2357 - {
2358 - if ( ( *it )->mxChild == xChild )
2359 - {
2360 - if ( !( *it )->mxProps.is() )
2361 - {
2362 - PropHelper *pProps = createChildProps( *it );
2363 - pProps->setChangeListener( this );
2364 - ( *it )->mxProps = pProps;
2365 - }
2366 - return (*it)->mxProps;
2367 - }
2368 - }
2369 - return uno::Reference< beans::XPropertySet >();
2370 -}
2371 -
2372 -} // namespace layoutimpl
2373 --- toolkit/source/layout/box-base.hxx.old 2009-04-06 16:42:11.000000000 +0000
2374 +++ toolkit/source/layout/box-base.hxx 1970-01-01 00:00:00.000000000 +0000
2375 @@ -1,90 +0,0 @@
2376 -/*************************************************************************
2377 - *
2378 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2379 - *
2380 - * Copyright 2008 by Sun Microsystems, Inc.
2381 - *
2382 - * OpenOffice.org - a multi-platform office productivity suite
2383 - *
2384 - * $RCSfile: box-base.hxx,v $
2385 - *
2386 - * $Revision: 1.2 $
2387 - *
2388 - * This file is part of OpenOffice.org.
2389 - *
2390 - * OpenOffice.org is free software: you can redistribute it and/or modify
2391 - * it under the terms of the GNU Lesser General Public License version 3
2392 - * only, as published by the Free Software Foundation.
2393 - *
2394 - * OpenOffice.org is distributed in the hope that it will be useful,
2395 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2396 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2397 - * GNU Lesser General Public License version 3 for more details
2398 - * (a copy is included in the LICENSE file that accompanied this code).
2399 - *
2400 - * You should have received a copy of the GNU Lesser General Public License
2401 - * version 3 along with OpenOffice.org. If not, see
2402 - * <http://www.openoffice.org/license.html>
2403 - * for a copy of the LGPLv3 License.
2404 - *
2405 - ************************************************************************/
2406 -
2407 -#ifndef CORE_BOX_BASE_HXX
2408 -#define CORE_BOX_BASE_HXX
2409 -
2410 -#include "container.hxx"
2411 -
2412 -#include <list>
2413 -
2414 -namespace layoutimpl
2415 -{
2416 -
2417 -class Box_Base : public Container
2418 -{
2419 -public:
2420 - // Children properties
2421 - struct ChildData
2422 - {
2423 - css::uno::Reference< css::awt::XLayoutConstrains > mxChild;
2424 - css::uno::Reference< css::beans::XPropertySet > mxProps;
2425 - css::awt::Size maRequisition;
2426 - virtual bool isVisible();
2427 -
2428 - ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
2429 - virtual ~ChildData() { };
2430 - };
2431 -
2432 - struct ChildProps: public PropHelper
2433 - {
2434 - //ChildProps( ChildProps* );
2435 - PROPHELPER_SET_INFO
2436 - };
2437 -
2438 -protected:
2439 - std::list< ChildData* > maChildren;
2440 -
2441 -
2442 - virtual ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) = 0;
2443 - virtual ChildProps *createChildProps( ChildData* pData ) = 0;
2444 -
2445 - ChildData *removeChildData( std::list< ChildData *>, css::uno::Reference< css::awt::XLayoutConstrains > const& Child );
2446 -
2447 -public:
2448 - // css::awt::XLayoutContainer
2449 - virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2450 - throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
2451 - virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2452 - throw (css::uno::RuntimeException);
2453 -
2454 - virtual css::uno::Sequence< css::uno::Reference
2455 - < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
2456 - throw (css::uno::RuntimeException);
2457 -
2458 - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
2459 - const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
2460 - throw (css::uno::RuntimeException);
2461 -};
2462 -
2463 -} // namespace layoutimpl
2464 -
2465 -#endif /* CORE_BOX_BASE HXX */
2466 --- toolkit/source/layout/box.cxx.old 2009-04-02 10:49:36.000000000 +0000
2467 +++ toolkit/source/layout/box.cxx 1970-01-01 00:00:00.000000000 +0000
2468 @@ -1,285 +0,0 @@
2469 -/*************************************************************************
2470 - *
2471 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2472 - *
2473 - * Copyright 2008 by Sun Microsystems, Inc.
2474 - *
2475 - * OpenOffice.org - a multi-platform office productivity suite
2476 - *
2477 - * $RCSfile: box.cxx,v $
2478 - *
2479 - * $Revision: 1.3 $
2480 - *
2481 - * This file is part of OpenOffice.org.
2482 - *
2483 - * OpenOffice.org is free software: you can redistribute it and/or modify
2484 - * it under the terms of the GNU Lesser General Public License version 3
2485 - * only, as published by the Free Software Foundation.
2486 - *
2487 - * OpenOffice.org is distributed in the hope that it will be useful,
2488 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2489 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2490 - * GNU Lesser General Public License version 3 for more details
2491 - * (a copy is included in the LICENSE file that accompanied this code).
2492 - *
2493 - * You should have received a copy of the GNU Lesser General Public License
2494 - * version 3 along with OpenOffice.org. If not, see
2495 - * <http://www.openoffice.org/license.html>
2496 - * for a copy of the LGPLv3 License.
2497 - *
2498 - ************************************************************************/
2499 -
2500 -#include "box.hxx"
2501 -
2502 -#include <tools/debug.hxx>
2503 -#include <sal/macros.h>
2504 -
2505 -// fixed point precision for distributing error
2506 -#define FIXED_PT 16
2507 -
2508 -namespace layoutimpl
2509 -{
2510 -
2511 -using namespace css;
2512 -
2513 -Box::ChildProps::ChildProps( Box::ChildData *pData )
2514 -{
2515 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Expand" ),
2516 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
2517 - &(pData->mbExpand) );
2518 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Fill" ),
2519 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
2520 - &(pData->mbFill) );
2521 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Padding" ),
2522 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
2523 - &(pData->mnPadding) );
2524 -}
2525 -
2526 -Box::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
2527 - : Box_Base::ChildData( xChild )
2528 - , mnPadding( 0 )
2529 - , mbExpand( true )
2530 - , mbFill( true )
2531 -{
2532 -}
2533 -
2534 -Box::ChildData*
2535 -Box::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
2536 -{
2537 - return new ChildData( xChild );
2538 -}
2539 -
2540 -Box::ChildProps*
2541 -Box::createChildProps( Box_Base::ChildData *pData )
2542 -{
2543 - return new ChildProps( static_cast<Box::ChildData*> ( pData ) );
2544 -}
2545 -
2546 -Box::Box( bool horizontal )
2547 - : Box_Base()
2548 - , mnSpacing( 0 )
2549 - , mbHomogeneous( false )
2550 - , mbHorizontal( horizontal )
2551 -{
2552 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ),
2553 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
2554 - &mbHomogeneous );
2555 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Spacing" ),
2556 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
2557 - &mnSpacing );
2558 - mbHasFlowChildren = false;
2559 -}
2560 -
2561 -awt::Size
2562 -Box::calculateSize( long nWidth )
2563 -{
2564 - int nVisibleChildren = 0;
2565 - // primary vs secundary axis (instead of a X and Y)
2566 - int nPrimSize = 0;
2567 - int nSecSize = 0;
2568 - int nFlowMinWidth = 0; // in case the box only has flow children
2569 -
2570 - mbHasFlowChildren = false;
2571 -
2572 - for ( std::list<Box_Base::ChildData *>::const_iterator it
2573 - = maChildren.begin(); it != maChildren.end(); it++ )
2574 - {
2575 - ChildData *child = static_cast<Box::ChildData*> ( *it );
2576 - if ( !child->isVisible() )
2577 - continue;
2578 -
2579 - uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
2580 - bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
2581 -
2582 - awt::Size aChildSize = child->maRequisition = child->mxChild->getMinimumSize();
2583 -
2584 - if ( !mbHorizontal /*vertical*/ && bFlow )
2585 - {
2586 - if ( nFlowMinWidth == 0 || nFlowMinWidth > aChildSize.Width )
2587 - nFlowMinWidth = aChildSize.Width;
2588 - mbHasFlowChildren = true;
2589 - }
2590 - else
2591 - {
2592 - int size = primDim( aChildSize ) + child->mnPadding * 2;
2593 - if ( mbHomogeneous )
2594 - nPrimSize = SAL_MAX( nPrimSize, size );
2595 - else
2596 - nPrimSize += size;
2597 -
2598 - nSecSize = SAL_MAX( nSecSize, secDim( aChildSize ) );
2599 - }
2600 - nVisibleChildren++;
2601 - }
2602 -
2603 - if ( nVisibleChildren )
2604 - {
2605 - if ( mbHomogeneous )
2606 - nPrimSize *= nVisibleChildren;
2607 - nPrimSize += (nVisibleChildren - 1) * mnSpacing;
2608 - }
2609 -
2610 - if ( mbHasFlowChildren )
2611 - {
2612 - if ( nWidth == 0 )
2613 - nWidth = nSecSize ? nSecSize : nFlowMinWidth;
2614 - for ( std::list<Box_Base::ChildData *>::const_iterator it
2615 - = maChildren.begin(); it != maChildren.end(); it++ )
2616 - {
2617 - ChildData *child = static_cast<Box::ChildData*> ( *it );
2618 - if ( !child->isVisible() )
2619 - continue;
2620 -
2621 - uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
2622 - bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
2623 -
2624 - if ( bFlow )
2625 - nPrimSize += xChildCont->getHeightForWidth( nWidth );
2626 - }
2627 - }
2628 -
2629 - nPrimSize += mnBorderWidth * 2;
2630 - nSecSize += mnBorderWidth * 2;
2631 - return awt::Size( mbHorizontal ? nPrimSize : nSecSize,
2632 - mbHorizontal ? nSecSize : nPrimSize );
2633 -}
2634 -
2635 -awt::Size SAL_CALL
2636 -Box::getMinimumSize() throw(uno::RuntimeException)
2637 -{
2638 - maRequisition = calculateSize();
2639 - return maRequisition;
2640 -}
2641 -
2642 -sal_Bool SAL_CALL
2643 -Box::hasHeightForWidth()
2644 - throw(uno::RuntimeException)
2645 -{
2646 - return mbHasFlowChildren;
2647 -}
2648 -
2649 -sal_Int32 SAL_CALL
2650 -Box::getHeightForWidth( sal_Int32 nWidth )
2651 - throw(uno::RuntimeException)
2652 -{
2653 - if ( hasHeightForWidth() )
2654 - return calculateSize( nWidth ).Height;
2655 - return maRequisition.Height;
2656 -}
2657 -
2658 -void SAL_CALL
2659 -Box::allocateArea( const awt::Rectangle &newArea )
2660 - throw (uno::RuntimeException)
2661 -{
2662 - maAllocation = newArea;
2663 - int nVisibleChildren = 0, nExpandChildren = 0;
2664 -
2665 - for ( std::list<Box_Base::ChildData *>::const_iterator it
2666 - = maChildren.begin(); it != maChildren.end(); it++ )
2667 - {
2668 - ChildData *child = static_cast<Box::ChildData*> ( *it );
2669 - if ( child->isVisible() )
2670 - {
2671 - nVisibleChildren++;
2672 - if ( child->mbExpand )
2673 - nExpandChildren++;
2674 - }
2675 - }
2676 - if ( !nVisibleChildren )
2677 - return;
2678 -
2679 - // split rectangle for dimension helpers
2680 - awt::Point newPoint( newArea.X, newArea.Y );
2681 - awt::Size newSize( newArea.Width, newArea.Height );
2682 -
2683 - int nExtraSpace;
2684 - if ( mbHomogeneous )
2685 - nExtraSpace = ( ( primDim( newSize ) - mnBorderWidth * 2 -
2686 - ( nVisibleChildren - 1 ) * mnSpacing )) / nVisibleChildren;
2687 - else if ( nExpandChildren )
2688 - {
2689 - int reqSize = primDim( maRequisition );
2690 - if ( !mbHorizontal && hasHeightForWidth() )
2691 - reqSize = getHeightForWidth( newArea.Width );
2692 - nExtraSpace = ( primDim( newSize ) - reqSize ) / nExpandChildren;
2693 - }
2694 - else
2695 - nExtraSpace = 0;
2696 -
2697 - int nChildPrimPoint, nChildSecPoint, nChildPrimSize, nChildSecSize;
2698 -
2699 - int nStartPoint = primDim( newPoint ) + mnBorderWidth;
2700 - int nBoxSecSize = SAL_MAX( 1, secDim( newSize ) - mnBorderWidth * 2 );
2701 -
2702 - for ( std::list<Box_Base::ChildData *>::const_iterator it
2703 - = maChildren.begin(); it != maChildren.end(); it++ )
2704 - {
2705 - ChildData *child = static_cast<Box::ChildData*> ( *it );
2706 - if ( !child->isVisible() )
2707 - continue;
2708 -
2709 - awt::Point aChildPos;
2710 - int nBoxPrimSize; // of the available box space
2711 -
2712 - if ( mbHomogeneous )
2713 - nBoxPrimSize = nExtraSpace;
2714 - else
2715 - {
2716 - uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
2717 - bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
2718 - if ( !mbHorizontal && bFlow )
2719 - nBoxPrimSize = xChildCont->getHeightForWidth( newArea.Width );
2720 - else
2721 - nBoxPrimSize = primDim( child->maRequisition );
2722 - nBoxPrimSize += child->mnPadding;
2723 - if ( child->mbExpand )
2724 - nBoxPrimSize += nExtraSpace;
2725 - }
2726 -
2727 - nChildPrimPoint = nStartPoint + child->mnPadding;
2728 - nChildSecPoint = secDim( newPoint ) + mnBorderWidth;
2729 -
2730 - nChildSecSize = nBoxSecSize;
2731 - if ( child->mbFill )
2732 - nChildPrimSize = SAL_MAX( 1, nBoxPrimSize - child->mnPadding);
2733 - else
2734 - {
2735 - nChildPrimSize = primDim( child->maRequisition );
2736 - nChildPrimPoint += (nBoxPrimSize - nChildPrimSize) / 2;
2737 -
2738 - nChildSecPoint += (nBoxSecSize - nChildSecSize) / 2;
2739 - }
2740 -
2741 - awt::Rectangle area;
2742 - area.X = mbHorizontal ? nChildPrimPoint : nChildSecPoint;
2743 - area.Y = mbHorizontal ? nChildSecPoint : nChildPrimPoint;
2744 - area.Width = mbHorizontal ? nChildPrimSize : nChildSecSize;
2745 - area.Height = mbHorizontal ? nChildSecSize : nChildPrimSize;
2746 -
2747 - allocateChildAt( child->mxChild, area );
2748 -
2749 - nStartPoint += nBoxPrimSize + mnSpacing + child->mnPadding;
2750 - }
2751 -}
2752 -
2753 -} // namespace layoutimpl
2754 --- toolkit/source/layout/box.hxx.old 2009-04-02 10:49:36.000000000 +0000
2755 +++ toolkit/source/layout/box.hxx 1970-01-01 00:00:00.000000000 +0000
2756 @@ -1,108 +0,0 @@
2757 -/*************************************************************************
2758 - *
2759 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2760 - *
2761 - * Copyright 2008 by Sun Microsystems, Inc.
2762 - *
2763 - * OpenOffice.org - a multi-platform office productivity suite
2764 - *
2765 - * $RCSfile: box.hxx,v $
2766 - *
2767 - * $Revision: 1.3 $
2768 - *
2769 - * This file is part of OpenOffice.org.
2770 - *
2771 - * OpenOffice.org is free software: you can redistribute it and/or modify
2772 - * it under the terms of the GNU Lesser General Public License version 3
2773 - * only, as published by the Free Software Foundation.
2774 - *
2775 - * OpenOffice.org is distributed in the hope that it will be useful,
2776 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2777 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2778 - * GNU Lesser General Public License version 3 for more details
2779 - * (a copy is included in the LICENSE file that accompanied this code).
2780 - *
2781 - * You should have received a copy of the GNU Lesser General Public License
2782 - * version 3 along with OpenOffice.org. If not, see
2783 - * <http://www.openoffice.org/license.html>
2784 - * for a copy of the LGPLv3 License.
2785 - *
2786 - ************************************************************************/
2787 -
2788 -#ifndef CORE_BOX_HXX
2789 -#define CORE_BOX_HXX
2790 -
2791 -#include "box-base.hxx"
2792 -
2793 -#include <com/sun/star/awt/Point.hpp>
2794 -
2795 -namespace layoutimpl
2796 -{
2797 -
2798 -class Box : public Box_Base
2799 -{
2800 -protected:
2801 - // Box properties (i.e. affect all children)
2802 - sal_Int32 mnSpacing;
2803 - sal_Bool mbHomogeneous;
2804 - sal_Bool mbHorizontal; // false for Vertical
2805 - bool mbHasFlowChildren;
2806 -
2807 -public:
2808 - // Children properties
2809 - struct ChildData : public Box_Base::ChildData
2810 - {
2811 - sal_Int32 mnPadding;
2812 - sal_Bool mbExpand;
2813 - sal_Bool mbFill;
2814 - ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
2815 - };
2816 -
2817 - struct ChildProps : public Box_Base::ChildProps
2818 - {
2819 - ChildProps( ChildData *pData );
2820 - };
2821 -
2822 -protected:
2823 - ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
2824 - ChildProps *createChildProps( Box_Base::ChildData* pData );
2825 -
2826 -public:
2827 - Box( bool horizontal );
2828 -
2829 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
2830 - throw (css::uno::RuntimeException);
2831 -
2832 - virtual css::awt::Size SAL_CALL getMinimumSize()
2833 - throw(css::uno::RuntimeException);
2834 - virtual sal_Bool SAL_CALL hasHeightForWidth()
2835 - throw(css::uno::RuntimeException);
2836 - virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
2837 - throw(css::uno::RuntimeException);
2838 -
2839 - // helper: mix of getMinimumSize() and getHeightForWidth()
2840 - css::awt::Size calculateSize( long nWidth = 0 );
2841 -
2842 - PROPHELPER_SET_INFO
2843 -
2844 -private:
2845 - /* Helpers to deal with the joint Box directions. */
2846 - inline int primDim (const css::awt::Size &size)
2847 - { if (mbHorizontal) return size.Width; else return size.Height; }
2848 - inline int secDim (const css::awt::Size &size)
2849 - { if (mbHorizontal) return size.Height; else return size.Width; }
2850 - inline int primDim (const css::awt::Point &point)
2851 - { if (mbHorizontal) return point.X; else return point.Y; }
2852 - inline int secDim (const css::awt::Point &point)
2853 - { if (mbHorizontal) return point.Y; else return point.X; }
2854 -};
2855 -
2856 -struct VBox : public Box
2857 -{ VBox() : Box (false) {} };
2858 -
2859 -struct HBox : public Box
2860 -{ HBox() : Box (true) {} };
2861 -
2862 -} // namespace layoutimpl
2863 -
2864 -#endif /* CORE_BOX_HXX */
2865 --- toolkit/source/layout/byteseq.cxx.old 2009-04-02 10:49:36.000000000 +0000
2866 +++ toolkit/source/layout/byteseq.cxx 1970-01-01 00:00:00.000000000 +0000
2867 @@ -1,79 +0,0 @@
2868 -/*************************************************************************
2869 - *
2870 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2871 - *
2872 - * Copyright 2008 by Sun Microsystems, Inc.
2873 - *
2874 - * OpenOffice.org - a multi-platform office productivity suite
2875 - *
2876 - * $RCSfile: byteseq.cxx,v $
2877 - * $Revision: 1.4 $
2878 - *
2879 - * This file is part of OpenOffice.org.
2880 - *
2881 - * OpenOffice.org is free software: you can redistribute it and/or modify
2882 - * it under the terms of the GNU Lesser General Public License version 3
2883 - * only, as published by the Free Software Foundation.
2884 - *
2885 - * OpenOffice.org is distributed in the hope that it will be useful,
2886 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2887 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2888 - * GNU Lesser General Public License version 3 for more details
2889 - * (a copy is included in the LICENSE file that accompanied this code).
2890 - *
2891 - * You should have received a copy of the GNU Lesser General Public License
2892 - * version 3 along with OpenOffice.org. If not, see
2893 - * <http://www.openoffice.org/license.html>
2894 - * for a copy of the LGPLv3 License.
2895 - *
2896 - ************************************************************************/
2897 -
2898 -#include <com/sun/star/io/XInputStream.hpp>
2899 -#include <osl/file.hxx>
2900 -#include <comphelper/oslfile2streamwrap.hxx>
2901 -
2902 -using osl::File;
2903 -using osl::FileBase;
2904 -using namespace ::com::sun::star;
2905 -
2906 -namespace layoutimpl
2907 -{
2908 -
2909 -uno::Reference< io::XInputStream > getFileAsStream( const rtl::OUString &rName )
2910 -{
2911 - rtl::OUString sFileURL;
2912 - if( FileBase::E_None != FileBase::getFileURLFromSystemPath( rName, sFileURL ) )
2913 - sFileURL = rName; // maybe it already was a file url
2914 -
2915 - File * blobFile = new File(sFileURL);
2916 - File::RC errorCode = blobFile->open(OpenFlag_Read);
2917 -
2918 - uno::Reference<io::XInputStream> xResult;
2919 - switch (errorCode)
2920 - {
2921 - case osl::File::E_None: // got it
2922 - xResult.set( new comphelper::OSLInputStreamWrapper(blobFile,true) );
2923 - break;
2924 -
2925 - case osl::File::E_NOENT: // no file => no stream
2926 - delete blobFile;
2927 - break;
2928 -
2929 - default:
2930 - delete blobFile;
2931 -/* {
2932 - rtl::OUStringBuffer sMsg;
2933 - sMsg.appendAscii("Cannot open output file \"");
2934 - sMsg.append(aURL);
2935 - sMsg.appendAscii("\" : ");
2936 - sMsg.append(configmgr::FileHelper::createOSLErrorString(errorCode));
2937 -
2938 - throw io::IOException(sMsg.makeStringAndClear(),NULL);
2939 - }
2940 -*/
2941 - }
2942 -
2943 - return xResult;
2944 -}
2945 -
2946 -} // namespace layoutimpl
2947 --- toolkit/source/layout/container.cxx.old 2009-04-02 10:49:36.000000000 +0000
2948 +++ toolkit/source/layout/container.cxx 1970-01-01 00:00:00.000000000 +0000
2949 @@ -1,167 +0,0 @@
2950 -/*************************************************************************
2951 - *
2952 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2953 - *
2954 - * Copyright 2008 by Sun Microsystems, Inc.
2955 - *
2956 - * OpenOffice.org - a multi-platform office productivity suite
2957 - *
2958 - * $RCSfile: container.cxx,v $
2959 - *
2960 - * $Revision: 1.3 $
2961 - *
2962 - * This file is part of OpenOffice.org.
2963 - *
2964 - * OpenOffice.org is free software: you can redistribute it and/or modify
2965 - * it under the terms of the GNU Lesser General Public License version 3
2966 - * only, as published by the Free Software Foundation.
2967 - *
2968 - * OpenOffice.org is distributed in the hope that it will be useful,
2969 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2970 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2971 - * GNU Lesser General Public License version 3 for more details
2972 - * (a copy is included in the LICENSE file that accompanied this code).
2973 - *
2974 - * You should have received a copy of the GNU Lesser General Public License
2975 - * version 3 along with OpenOffice.org. If not, see
2976 - * <http://www.openoffice.org/license.html>
2977 - * for a copy of the LGPLv3 License.
2978 - *
2979 - ************************************************************************/
2980 -
2981 -#include "container.hxx"
2982 -
2983 -#include <com/sun/star/awt/XWindow.hpp>
2984 -#include <com/sun/star/awt/PosSize.hpp>
2985 -#include <tools/debug.hxx>
2986 -
2987 -namespace layoutimpl {
2988 -
2989 -using namespace css;
2990 -
2991 -Container::Container()
2992 - : Container_Base()
2993 - , PropHelper()
2994 - , mnBorderWidth( 0 )
2995 -{
2996 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Border" ),
2997 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
2998 - &mnBorderWidth );
2999 - setChangeListener( this );
3000 -}
3001 -
3002 -uno::Any
3003 -Container::queryInterface( const uno::Type & rType ) throw (uno::RuntimeException)
3004 -{
3005 - uno::Any aRet = Container_Base::queryInterface( rType );
3006 - return aRet.hasValue() ? aRet : PropHelper::queryInterface( rType );
3007 -}
3008 -
3009 -void
3010 -Container::allocateChildAt( const uno::Reference< awt::XLayoutConstrains > &xChild,
3011 - const awt::Rectangle &rArea )
3012 - throw( uno::RuntimeException )
3013 -{
3014 - uno::Reference< awt::XLayoutContainer > xCont( xChild, uno::UNO_QUERY );
3015 - if ( xCont.is() )
3016 - xCont->allocateArea( rArea );
3017 - else
3018 - {
3019 - uno::Reference< awt::XWindow > xWindow( xChild, uno::UNO_QUERY );
3020 - if ( xWindow.is() )
3021 - xWindow->setPosSize( rArea.X, rArea.Y, rArea.Width, rArea.Height,
3022 - awt::PosSize::POSSIZE );
3023 - else
3024 - {
3025 - DBG_ERROR( "Error: non-sizeable child" );
3026 - }
3027 - }
3028 -}
3029 -
3030 -uno::Sequence< uno::Reference< awt::XLayoutConstrains > >
3031 -Container::getSingleChild ( uno::Reference< awt::XLayoutConstrains >const &xChildOrNil )
3032 -{
3033 - uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aSeq( ( xChildOrNil.is() ? 1 : 0 ) );
3034 - if ( xChildOrNil.is() )
3035 - aSeq[0] = xChildOrNil;
3036 - return aSeq;
3037 -}
3038 -
3039 -void
3040 -Container::queueResize()
3041 -{
3042 - if ( mxLayoutUnit.is() )
3043 - mxLayoutUnit->queueResize( uno::Reference< awt::XLayoutContainer >( this ) );
3044 -}
3045 -
3046 -void
3047 -Container::setChildParent( const uno::Reference< awt::XLayoutConstrains >& xChild )
3048 -{
3049 - uno::Reference< awt::XLayoutContainer > xContChild( xChild, uno::UNO_QUERY );
3050 - if ( xContChild.is() )
3051 - {
3052 - xContChild->setParent( uno::Reference< awt::XLayoutContainer >( this ) );
3053 -#if 0
3054 - assert( !mxLayoutUnit.is() );
3055 - xContChild->setLayoutUnit( mxLayoutUnit );
3056 -#endif
3057 - }
3058 -}
3059 -
3060 -void
3061 -Container::unsetChildParent( const uno::Reference< awt::XLayoutConstrains >& xChild )
3062 -{
3063 - uno::Reference< awt::XLayoutContainer > xContChild( xChild, uno::UNO_QUERY );
3064 - if ( xContChild.is() )
3065 - {
3066 - xContChild->setParent( uno::Reference< awt::XLayoutContainer >() );
3067 -#if 0
3068 - xContChild->setLayoutUnit( uno::Reference< awt::XLayoutUnit >() );
3069 -#endif
3070 - }
3071 -}
3072 -
3073 -#if 0
3074 -std::string
3075 -Container::getLabel() // debug label
3076 -{
3077 - std::string depth;
3078 - uno::Reference< awt::XLayoutContainer > xContainer( this );
3079 - while ( xContainer.is() )
3080 - {
3081 - int node = 0; // child nb
3082 - uno::Reference< awt::XLayoutContainer > xParent = xContainer->getContainerParent();
3083 - if ( xParent.is() )
3084 - {
3085 -
3086 - uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
3087 - aChildren = xParent->getChildren();
3088 - for ( node = 0; node < aChildren.getLength(); node++ )
3089 - if ( aChildren[ node ] == xContainer )
3090 - break;
3091 - }
3092 -
3093 - char str[ 8 ];
3094 - snprintf( str, 8, "%d", node );
3095 - if ( depth.empty() )
3096 - depth = std::string( str );
3097 - else
3098 - depth = std::string( str ) + ":" + depth;
3099 -
3100 - xContainer = xParent;
3101 - }
3102 -
3103 - return std::string( getName() ) + " (" + depth + ")";
3104 -}
3105 -#endif
3106 -
3107 -void Container::propertiesChanged()
3108 -{
3109 - // cl: why this assertion? This is also called to set properties at the top level widget which has no parent!?
3110 - // DBG_ASSERT( mxParent.is(), "Properties listener: error container doesn't have parent" );
3111 -
3112 - if ( mxLayoutUnit.is() && mxParent.is() )
3113 - mxLayoutUnit->queueResize( mxParent );
3114 -}
3115 -
3116 -}
3117 --- toolkit/source/layout/container.hxx.old 2009-04-02 10:49:36.000000000 +0000
3118 +++ toolkit/source/layout/container.hxx 1970-01-01 00:00:00.000000000 +0000
3119 @@ -1,140 +0,0 @@
3120 -/*************************************************************************
3121 - *
3122 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3123 - *
3124 - * Copyright 2008 by Sun Microsystems, Inc.
3125 - *
3126 - * OpenOffice.org - a multi-platform office productivity suite
3127 - *
3128 - * $RCSfile: container.hxx,v $
3129 - *
3130 - * $Revision: 1.3 $
3131 - *
3132 - * This file is part of OpenOffice.org.
3133 - *
3134 - * OpenOffice.org is free software: you can redistribute it and/or modify
3135 - * it under the terms of the GNU Lesser General Public License version 3
3136 - * only, as published by the Free Software Foundation.
3137 - *
3138 - * OpenOffice.org is distributed in the hope that it will be useful,
3139 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3140 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3141 - * GNU Lesser General Public License version 3 for more details
3142 - * (a copy is included in the LICENSE file that accompanied this code).
3143 - *
3144 - * You should have received a copy of the GNU Lesser General Public License
3145 - * version 3 along with OpenOffice.org. If not, see
3146 - * <http://www.openoffice.org/license.html>
3147 - * for a copy of the LGPLv3 License.
3148 - *
3149 - ************************************************************************/
3150 -
3151 -#ifndef CORE_CONTAINER_HXX
3152 -#define CORE_CONTAINER_HXX
3153 -
3154 -#include "helper.hxx"
3155 -
3156 -#include <cppuhelper/implbase2.hxx>
3157 -#include <com/sun/star/awt/MaxChildrenException.hpp>
3158 -
3159 -namespace layoutimpl
3160 -{
3161 -namespace css = ::com::sun::star;
3162 -
3163 -typedef ::cppu::WeakImplHelper2< css::awt::XLayoutContainer,
3164 - css::awt::XLayoutConstrains > Container_Base;
3165 -
3166 -class Container : public Container_Base, public PropHelper, public PropHelper::Listener
3167 -{
3168 - friend class ChildProps;
3169 -protected:
3170 - // Widget properties
3171 - css::uno::Reference< css::awt::XLayoutContainer > mxParent;
3172 - css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
3173 - css::awt::Size maRequisition;
3174 - css::awt::Rectangle maAllocation;
3175 -
3176 - // Container properties
3177 - sal_Int32 mnBorderWidth;
3178 -
3179 - // Utilities
3180 - void allocateChildAt( const css::uno::Reference< css::awt::XLayoutConstrains > &xChild,
3181 - const css::awt::Rectangle &rArea )
3182 - throw (css::uno::RuntimeException);
3183 - static css::uno::Sequence< css::uno::Reference< css::awt::XLayoutConstrains > >
3184 - getSingleChild (const css::uno::Reference< css::awt::XLayoutConstrains > &xChildOrNil);
3185 - void setChildParent( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild );
3186 - void unsetChildParent( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild );
3187 -
3188 - void queueResize();
3189 - void forceRecalc() { allocateArea( maAllocation ); }
3190 -
3191 -public:
3192 - Container();
3193 - virtual ~Container() {}
3194 -
3195 - // XInterface
3196 - virtual void SAL_CALL acquire() throw() { PropHelper::acquire(); }
3197 - virtual void SAL_CALL release() throw() { PropHelper::release(); }
3198 - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
3199 -
3200 - // css::awt::XLayoutContainer
3201 - virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3202 - throw (css::uno::RuntimeException, css::awt::MaxChildrenException) = 0;
3203 - virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3204 - throw (css::uno::RuntimeException) = 0;
3205 -
3206 - virtual css::uno::Sequence< css::uno::Reference
3207 - < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
3208 - throw (css::uno::RuntimeException) = 0;
3209 -
3210 - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
3211 - const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3212 - throw (css::uno::RuntimeException) = 0;
3213 -
3214 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
3215 - throw (css::uno::RuntimeException) = 0;
3216 -
3217 - void SAL_CALL setLayoutUnit( const css::uno::Reference< css::awt::XLayoutUnit > &xUnit )
3218 - throw(css::uno::RuntimeException)
3219 - { mxLayoutUnit = xUnit; }
3220 - css::uno::Reference< css::awt::XLayoutUnit > SAL_CALL getLayoutUnit()
3221 - throw(css::uno::RuntimeException)
3222 - { return mxLayoutUnit; }
3223 -
3224 - css::awt::Size SAL_CALL getRequestedSize() throw(css::uno::RuntimeException)
3225 - { return maRequisition; }
3226 - com::sun::star::awt::Rectangle SAL_CALL getAllocatedArea() throw(css::uno::RuntimeException)
3227 - { return maAllocation; }
3228 -
3229 - virtual sal_Bool SAL_CALL hasHeightForWidth()
3230 - throw(css::uno::RuntimeException) = 0;
3231 - virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
3232 - throw(css::uno::RuntimeException) = 0;
3233 -
3234 - // css::awt::XLayoutContainer: css::container::XChild
3235 - css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
3236 - throw (css::uno::RuntimeException)
3237 - { return mxParent; }
3238 - void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface > &xParent )
3239 - throw (css::uno::RuntimeException)
3240 - { mxParent = css::uno::Reference< css::awt::XLayoutContainer >( xParent, css::uno::UNO_QUERY ); }
3241 -
3242 - // css::awt::XLayoutConstrains
3243 - virtual css::awt::Size SAL_CALL getMinimumSize()
3244 - throw(css::uno::RuntimeException) = 0;
3245 - // (not properly implemented in toolkit, ignore it.)
3246 - css::awt::Size SAL_CALL getPreferredSize()
3247 - throw(css::uno::RuntimeException) { return getMinimumSize(); } // TODO: use this for flow?
3248 - css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize )
3249 - throw(css::uno::RuntimeException) { return rNewSize; }
3250 -
3251 -PROPHELPER_SET_INFO
3252 -
3253 -protected:
3254 - void propertiesChanged();
3255 -};
3256 -
3257 -} // namespace layoutimpl
3258 -
3259 -#endif /*CORE_CONTAINER_HXX*/
3260 --- toolkit/source/layout/core/bin.cxx.old 1970-01-01 00:00:00.000000000 +0000
3261 +++ toolkit/source/layout/core/bin.cxx 2009-04-06 16:42:13.000000000 +0000
3262 @@ -0,0 +1,190 @@
3263 +/*************************************************************************
3264 + *
3265 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3266 + *
3267 + * Copyright 2008 by Sun Microsystems, Inc.
3268 + *
3269 + * OpenOffice.org - a multi-platform office productivity suite
3270 + *
3271 + * $RCSfile$
3272 + *
3273 + * $Revision$
3274 + *
3275 + * This file is part of OpenOffice.org.
3276 + *
3277 + * OpenOffice.org is free software: you can redistribute it and/or modify
3278 + * it under the terms of the GNU Lesser General Public License version 3
3279 + * only, as published by the Free Software Foundation.
3280 + *
3281 + * OpenOffice.org is distributed in the hope that it will be useful,
3282 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3283 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3284 + * GNU Lesser General Public License version 3 for more details
3285 + * (a copy is included in the LICENSE file that accompanied this code).
3286 + *
3287 + * You should have received a copy of the GNU Lesser General Public License
3288 + * version 3 along with OpenOffice.org. If not, see
3289 + * <http://www.openoffice.org/license.html>
3290 + * for a copy of the LGPLv3 License.
3291 + *
3292 + ************************************************************************/
3293 +
3294 +#include "bin.hxx"
3295 +
3296 +#include <sal/macros.h>
3297 +
3298 +namespace layoutimpl
3299 +{
3300 +
3301 +using namespace css;
3302 +
3303 +/* Bin */
3304 +
3305 +Bin::Bin() : Container()
3306 +{
3307 +}
3308 +
3309 +void SAL_CALL
3310 +Bin::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
3311 + throw (uno::RuntimeException, awt::MaxChildrenException)
3312 +{
3313 + if ( mxChild.is() )
3314 + throw awt::MaxChildrenException();
3315 + if ( xChild.is() )
3316 + {
3317 + mxChild = xChild;
3318 + setChildParent( xChild );
3319 + queueResize();
3320 + }
3321 +}
3322 +
3323 +void SAL_CALL
3324 +Bin::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
3325 + throw (uno::RuntimeException)
3326 +{
3327 + if ( xChild == mxChild )
3328 + {
3329 + mxChild = uno::Reference< awt::XLayoutConstrains >();
3330 + unsetChildParent( xChild );
3331 + queueResize();
3332 + }
3333 +}
3334 +
3335 +uno::Sequence< uno::Reference< awt::XLayoutConstrains > > SAL_CALL
3336 +Bin::getChildren()
3337 + throw (uno::RuntimeException)
3338 +{
3339 + return getSingleChild (mxChild);
3340 +}
3341 +
3342 +void SAL_CALL
3343 +Bin::allocateArea( const awt::Rectangle &rArea )
3344 + throw (uno::RuntimeException)
3345 +{
3346 + maAllocation = rArea;
3347 + if ( mxChild.is() )
3348 + allocateChildAt( mxChild, rArea );
3349 +}
3350 +
3351 +awt::Size SAL_CALL
3352 +Bin::getMinimumSize()
3353 + throw(uno::RuntimeException)
3354 +{
3355 + if ( mxChild.is() )
3356 + return maRequisition = maChildRequisition = mxChild->getMinimumSize();
3357 + return maRequisition = awt::Size( 0, 0 );
3358 +}
3359 +
3360 +uno::Reference< beans::XPropertySet > SAL_CALL
3361 +Bin::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& )
3362 + throw (uno::RuntimeException)
3363 +{
3364 + return uno::Reference< beans::XPropertySet >();
3365 +}
3366 +
3367 +sal_Bool SAL_CALL
3368 +Bin::hasHeightForWidth()
3369 + throw(uno::RuntimeException)
3370 +{
3371 + uno::Reference< awt::XLayoutContainer > xChildCont( mxChild, uno::UNO_QUERY );
3372 + if ( xChildCont.is() )
3373 + return xChildCont->hasHeightForWidth();
3374 + return false;
3375 +}
3376 +
3377 +sal_Int32 SAL_CALL
3378 +Bin::getHeightForWidth( sal_Int32 nWidth )
3379 + throw(uno::RuntimeException)
3380 +{
3381 + uno::Reference< awt::XLayoutContainer > xChildCont( mxChild, uno::UNO_QUERY );
3382 + if ( xChildCont.is() )
3383 + return xChildCont->getHeightForWidth( nWidth );
3384 + return maRequisition.Height;
3385 +}
3386 +
3387 +/* Align */
3388 +
3389 +Align::Align() : Bin()
3390 +{
3391 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Halign" ),
3392 + ::getCppuType( static_cast< const float* >( NULL ) ),
3393 + &fHorAlign );
3394 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Valign" ),
3395 + ::getCppuType( static_cast< const float* >( NULL ) ),
3396 + &fVerAlign );
3397 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Hfill" ),
3398 + ::getCppuType( static_cast< const float* >( NULL ) ),
3399 + &fHorFill );
3400 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Vfill" ),
3401 + ::getCppuType( static_cast< const float* >( NULL ) ),
3402 + &fVerFill );
3403 +
3404 + fHorAlign = fVerAlign = 0.5;
3405 + fHorFill = fVerFill = 0;
3406 +}
3407 +
3408 +void SAL_CALL
3409 +Align::allocateArea( const awt::Rectangle &rArea )
3410 + throw (uno::RuntimeException)
3411 +{
3412 + maAllocation = rArea;
3413 + if ( !mxChild.is() )
3414 + return;
3415 +
3416 + awt::Rectangle aChildArea;
3417 + aChildArea.Width = SAL_MIN( rArea.Width, maChildRequisition.Width );
3418 + aChildArea.Width += (sal_Int32) SAL_MAX(
3419 + 0, (rArea.Width - maChildRequisition.Width) * fHorFill );
3420 + aChildArea.Height = SAL_MIN( rArea.Height, maChildRequisition.Height );
3421 + aChildArea.Height += (sal_Int32) SAL_MAX(
3422 + 0, (rArea.Height - maChildRequisition.Height) * fVerFill );
3423 +
3424 + aChildArea.X = rArea.X + (sal_Int32)( (rArea.Width - aChildArea.Width) * fHorAlign );
3425 + aChildArea.Y = rArea.Y + (sal_Int32)( (rArea.Height - aChildArea.Height) * fVerAlign );
3426 +
3427 + allocateChildAt( mxChild, aChildArea );
3428 +}
3429 +
3430 +/* MinSize */
3431 +
3432 +MinSize::MinSize() : Bin()
3433 +{
3434 + mnMinWidth = mnMinHeight = 0;
3435 + addProp( RTL_CONSTASCII_USTRINGPARAM( "MinWidth" ),
3436 + ::getCppuType( static_cast< const long* >( NULL ) ),
3437 + &mnMinWidth );
3438 + addProp( RTL_CONSTASCII_USTRINGPARAM( "MinHeight" ),
3439 + ::getCppuType( static_cast< const long* >( NULL ) ),
3440 + &mnMinHeight );
3441 +}
3442 +
3443 +awt::Size SAL_CALL MinSize::getMinimumSize()
3444 + throw(uno::RuntimeException)
3445 +{
3446 + Bin::getMinimumSize();
3447 + maRequisition.Width = SAL_MAX( maRequisition.Width, mnMinWidth );
3448 + maRequisition.Height = SAL_MAX( maRequisition.Height, mnMinHeight );
3449 + return maRequisition;
3450 +}
3451 +
3452 +} // namespace layoutimpl
3453 --- toolkit/source/layout/core/bin.hxx.old 1970-01-01 00:00:00.000000000 +0000
3454 +++ toolkit/source/layout/core/bin.hxx 2009-04-06 16:42:13.000000000 +0000
3455 @@ -0,0 +1,120 @@
3456 +/*************************************************************************
3457 + *
3458 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3459 + *
3460 + * Copyright 2008 by Sun Microsystems, Inc.
3461 + *
3462 + * OpenOffice.org - a multi-platform office productivity suite
3463 + *
3464 + * $RCSfile$
3465 + *
3466 + * $Revision$
3467 + *
3468 + * This file is part of OpenOffice.org.
3469 + *
3470 + * OpenOffice.org is free software: you can redistribute it and/or modify
3471 + * it under the terms of the GNU Lesser General Public License version 3
3472 + * only, as published by the Free Software Foundation.
3473 + *
3474 + * OpenOffice.org is distributed in the hope that it will be useful,
3475 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3476 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3477 + * GNU Lesser General Public License version 3 for more details
3478 + * (a copy is included in the LICENSE file that accompanied this code).
3479 + *
3480 + * You should have received a copy of the GNU Lesser General Public License
3481 + * version 3 along with OpenOffice.org. If not, see
3482 + * <http://www.openoffice.org/license.html>
3483 + * for a copy of the LGPLv3 License.
3484 + *
3485 + ************************************************************************/
3486 +
3487 +/* A few simple binary containers */
3488 +
3489 +#ifndef LAYOUT_CORE_BIN_HXX
3490 +#define LAYOUT_CORE_BIN_HXX
3491 +
3492 +#include <layout/core/container.hxx>
3493 +
3494 +namespace layoutimpl
3495 +{
3496 +
3497 +class Bin : public Container
3498 +{
3499 +protected:
3500 + // Child
3501 + css::awt::Size maChildRequisition;
3502 + css::uno::Reference< css::awt::XLayoutConstrains > mxChild;
3503 +
3504 +public:
3505 + Bin();
3506 + virtual ~Bin() {}
3507 +
3508 + // css::awt::XLayoutContainer
3509 + virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3510 + throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
3511 + virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3512 + throw (css::uno::RuntimeException);
3513 +
3514 + virtual css::uno::Sequence< css::uno::Reference
3515 + < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
3516 + throw (css::uno::RuntimeException);
3517 +
3518 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
3519 + throw (css::uno::RuntimeException);
3520 +
3521 + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
3522 + const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3523 + throw (css::uno::RuntimeException);
3524 +
3525 + virtual sal_Bool SAL_CALL hasHeightForWidth()
3526 + throw(css::uno::RuntimeException);
3527 + virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
3528 + throw(css::uno::RuntimeException);
3529 +
3530 + // css::awt::XLayoutConstrains
3531 + virtual css::awt::Size SAL_CALL getMinimumSize()
3532 + throw(css::uno::RuntimeException);
3533 +
3534 + PROPHELPER_SET_INFO
3535 +};
3536 +
3537 +// Align gives control over child position on the allocated space.
3538 +class Align : public Bin
3539 +{
3540 + friend class AlignChildProps;
3541 +protected:
3542 + // properties
3543 + float fHorAlign, fVerAlign;
3544 + float fHorFill, fVerFill;
3545 +
3546 +public:
3547 + Align();
3548 +
3549 + // css::awt::XLayoutContainer
3550 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
3551 + throw (css::uno::RuntimeException);
3552 +
3553 + PROPHELPER_SET_INFO
3554 +};
3555 +
3556 +// Makes child request its or a specified size, whatever is larger.
3557 +class MinSize : public Bin
3558 +{
3559 +protected:
3560 + // properties
3561 + long mnMinWidth, mnMinHeight;
3562 +
3563 +public:
3564 + MinSize();
3565 +
3566 + // css::awt::XLayoutContainer
3567 + virtual css::awt::Size SAL_CALL getMinimumSize()
3568 + throw(css::uno::RuntimeException);
3569 +
3570 + PROPHELPER_SET_INFO
3571 +};
3572 +
3573 +} // namespace layoutimpl
3574 +
3575 +#endif /* LAYOUT_CORE_BIN_HXX */
3576 --- toolkit/source/layout/core/box-base.cxx.old 1970-01-01 00:00:00.000000000 +0000
3577 +++ toolkit/source/layout/core/box-base.cxx 2009-04-06 16:42:13.000000000 +0000
3578 @@ -0,0 +1,176 @@
3579 +/*************************************************************************
3580 + *
3581 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3582 + *
3583 + * Copyright 2008 by Sun Microsystems, Inc.
3584 + *
3585 + * OpenOffice.org - a multi-platform office productivity suite
3586 + *
3587 + * $RCSfile$
3588 + *
3589 + * $Revision$
3590 + *
3591 + * This file is part of OpenOffice.org.
3592 + *
3593 + * OpenOffice.org is free software: you can redistribute it and/or modify
3594 + * it under the terms of the GNU Lesser General Public License version 3
3595 + * only, as published by the Free Software Foundation.
3596 + *
3597 + * OpenOffice.org is distributed in the hope that it will be useful,
3598 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3599 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3600 + * GNU Lesser General Public License version 3 for more details
3601 + * (a copy is included in the LICENSE file that accompanied this code).
3602 + *
3603 + * You should have received a copy of the GNU Lesser General Public License
3604 + * version 3 along with OpenOffice.org. If not, see
3605 + * <http://www.openoffice.org/license.html>
3606 + * for a copy of the LGPLv3 License.
3607 + *
3608 + ************************************************************************/
3609 +
3610 +#include "box.hxx"
3611 +
3612 +#include <tools/debug.hxx>
3613 +#include <sal/macros.h>
3614 +
3615 +#include <com/sun/star/awt/XWindow2.hpp>
3616 +
3617 +// fixed point precision for distributing error
3618 +#define FIXED_PT 16
3619 +
3620 +namespace layoutimpl
3621 +{
3622 +
3623 +using namespace css;
3624 +
3625 +Box_Base::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
3626 + : mxChild( xChild )
3627 + , mxProps()
3628 + , maRequisition()
3629 +{
3630 +}
3631 +
3632 +static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
3633 +{
3634 + if ( !xWidget.is() )
3635 + {
3636 + DBG_ERROR( "FIXME: invalid child !" );
3637 + return true;
3638 + }
3639 +
3640 + uno::Reference< awt::XWindow2 > xWindow( xWidget, uno::UNO_QUERY );
3641 + if ( xWindow.is() && !xWindow->isVisible() )
3642 + return false;
3643 +
3644 + uno::Reference< awt::XLayoutContainer > xContainer( xWidget, uno::UNO_QUERY );
3645 + if ( xContainer.is() )
3646 + {
3647 + uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren
3648 + = xContainer->getChildren();
3649 +
3650 + // FIXME: <flow> workaround: empty visible containers always visible:
3651 + if ( !aChildren.getLength() )
3652 + return true;
3653 +
3654 + for ( int i = 0; i < aChildren.getLength(); i++ )
3655 + if ( isVisible( aChildren[i] ) )
3656 + return true;
3657 + return false; // this would kill flow without workaround above
3658 + }
3659 +
3660 + return true;
3661 +}
3662 +
3663 +bool Box_Base::ChildData::isVisible()
3664 +{
3665 + // FIXME: call the 'isVisible' method on it ?
3666 + return layoutimpl::isVisible( mxChild );
3667 +}
3668 +
3669 +void
3670 +Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> const& xChild)
3671 +{
3672 + ChildData *pData = createChild (xChild);
3673 + maChildren.push_back (pData);
3674 + queueResize ();
3675 +}
3676 +
3677 +void SAL_CALL
3678 +Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> const& xChild)
3679 + throw (uno::RuntimeException, awt::MaxChildrenException)
3680 +{
3681 + if (xChild.is ())
3682 + {
3683 + AddChild (xChild);
3684 + setChildParent (xChild);
3685 + }
3686 +}
3687 +
3688 +Box_Base::ChildData*
3689 +Box_Base::removeChildData( std::list< ChildData* > lst, css::uno::Reference< css::awt::XLayoutConstrains > const& xChild )
3690 +{
3691 + for ( std::list< ChildData* >::iterator it = lst.begin();
3692 + it != lst.end(); it++ )
3693 + {
3694 + if ( (*it)->mxChild == xChild )
3695 + {
3696 + lst.erase( it );
3697 + return *it;
3698 + }
3699 + }
3700 + return 0;
3701 +}
3702 +
3703 +void SAL_CALL
3704 +Box_Base::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
3705 + throw (uno::RuntimeException)
3706 +{
3707 + if ( ChildData* p = removeChildData( maChildren, xChild ) )
3708 + {
3709 + delete p;
3710 + unsetChildParent( xChild );
3711 + queueResize();
3712 + }
3713 + else
3714 + {
3715 + DBG_ERROR( "Box_Base: removeChild: no such child" );
3716 + }
3717 +}
3718 +
3719 +uno::Sequence< uno::Reference < awt::XLayoutConstrains > > SAL_CALL
3720 +Box_Base::getChildren()
3721 + throw (uno::RuntimeException)
3722 +{
3723 + uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
3724 + unsigned int index = 0;
3725 + for ( std::list< ChildData* >::iterator it = maChildren.begin();
3726 + it != maChildren.end(); it++, index++ )
3727 + children[index] = ( *it )->mxChild;
3728 +
3729 + return children;
3730 +}
3731 +
3732 +uno::Reference< beans::XPropertySet > SAL_CALL
3733 +Box_Base::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& xChild )
3734 + throw (uno::RuntimeException)
3735 +{
3736 +
3737 + for ( std::list< ChildData * >::iterator it = maChildren.begin();
3738 + it != maChildren.end(); it++)
3739 + {
3740 + if ( ( *it )->mxChild == xChild )
3741 + {
3742 + if ( !( *it )->mxProps.is() )
3743 + {
3744 + PropHelper *pProps = createChildProps( *it );
3745 + pProps->setChangeListener( this );
3746 + ( *it )->mxProps = pProps;
3747 + }
3748 + return (*it)->mxProps;
3749 + }
3750 + }
3751 + return uno::Reference< beans::XPropertySet >();
3752 +}
3753 +
3754 +} // namespace layoutimpl
3755 --- toolkit/source/layout/core/box-base.hxx.old 1970-01-01 00:00:00.000000000 +0000
3756 +++ toolkit/source/layout/core/box-base.hxx 2009-04-06 16:42:13.000000000 +0000
3757 @@ -0,0 +1,92 @@
3758 +/*************************************************************************
3759 + *
3760 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3761 + *
3762 + * Copyright 2008 by Sun Microsystems, Inc.
3763 + *
3764 + * OpenOffice.org - a multi-platform office productivity suite
3765 + *
3766 + * $RCSfile$
3767 + *
3768 + * $Revision$
3769 + *
3770 + * This file is part of OpenOffice.org.
3771 + *
3772 + * OpenOffice.org is free software: you can redistribute it and/or modify
3773 + * it under the terms of the GNU Lesser General Public License version 3
3774 + * only, as published by the Free Software Foundation.
3775 + *
3776 + * OpenOffice.org is distributed in the hope that it will be useful,
3777 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3778 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3779 + * GNU Lesser General Public License version 3 for more details
3780 + * (a copy is included in the LICENSE file that accompanied this code).
3781 + *
3782 + * You should have received a copy of the GNU Lesser General Public License
3783 + * version 3 along with OpenOffice.org. If not, see
3784 + * <http://www.openoffice.org/license.html>
3785 + * for a copy of the LGPLv3 License.
3786 + *
3787 + ************************************************************************/
3788 +
3789 +#ifndef LAYOUT_CORE_BOX_BASE_HXX
3790 +#define LAYOUT_CORE_BOX_BASE_HXX
3791 +
3792 +#include <layout/core/container.hxx>
3793 +
3794 +#include <list>
3795 +
3796 +namespace layoutimpl
3797 +{
3798 +
3799 +class Box_Base : public Container
3800 +{
3801 +public:
3802 + // Children properties
3803 + struct ChildData
3804 + {
3805 + css::uno::Reference< css::awt::XLayoutConstrains > mxChild;
3806 + css::uno::Reference< css::beans::XPropertySet > mxProps;
3807 + css::awt::Size maRequisition;
3808 + virtual bool isVisible();
3809 +
3810 + ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
3811 + virtual ~ChildData() { };
3812 + };
3813 +
3814 + struct ChildProps: public PropHelper
3815 + {
3816 + //ChildProps( ChildProps* );
3817 + PROPHELPER_SET_INFO
3818 + };
3819 +
3820 +protected:
3821 + std::list< ChildData* > maChildren;
3822 +
3823 +
3824 + virtual ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) = 0;
3825 + virtual ChildProps *createChildProps( ChildData* pData ) = 0;
3826 +
3827 + ChildData *removeChildData( std::list< ChildData *>, css::uno::Reference< css::awt::XLayoutConstrains > const& Child );
3828 +
3829 +public:
3830 + void AddChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child);
3831 +
3832 + // css::awt::XLayoutContainer
3833 + virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child)
3834 + throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
3835 + virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3836 + throw (css::uno::RuntimeException);
3837 +
3838 + virtual css::uno::Sequence< css::uno::Reference
3839 + < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
3840 + throw (css::uno::RuntimeException);
3841 +
3842 + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
3843 + const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
3844 + throw (css::uno::RuntimeException);
3845 +};
3846 +
3847 +} // namespace layoutimpl
3848 +
3849 +#endif /* LAYOUT_CORE_BOX_BASE HXX */
3850 --- toolkit/source/layout/core/box.cxx.old 1970-01-01 00:00:00.000000000 +0000
3851 +++ toolkit/source/layout/core/box.cxx 2009-04-06 16:42:13.000000000 +0000
3852 @@ -0,0 +1,285 @@
3853 +/*************************************************************************
3854 + *
3855 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3856 + *
3857 + * Copyright 2008 by Sun Microsystems, Inc.
3858 + *
3859 + * OpenOffice.org - a multi-platform office productivity suite
3860 + *
3861 + * $RCSfile$
3862 + *
3863 + * $Revision$
3864 + *
3865 + * This file is part of OpenOffice.org.
3866 + *
3867 + * OpenOffice.org is free software: you can redistribute it and/or modify
3868 + * it under the terms of the GNU Lesser General Public License version 3
3869 + * only, as published by the Free Software Foundation.
3870 + *
3871 + * OpenOffice.org is distributed in the hope that it will be useful,
3872 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3873 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3874 + * GNU Lesser General Public License version 3 for more details
3875 + * (a copy is included in the LICENSE file that accompanied this code).
3876 + *
3877 + * You should have received a copy of the GNU Lesser General Public License
3878 + * version 3 along with OpenOffice.org. If not, see
3879 + * <http://www.openoffice.org/license.html>
3880 + * for a copy of the LGPLv3 License.
3881 + *
3882 + ************************************************************************/
3883 +
3884 +#include "box.hxx"
3885 +
3886 +#include <tools/debug.hxx>
3887 +#include <sal/macros.h>
3888 +
3889 +// fixed point precision for distributing error
3890 +#define FIXED_PT 16
3891 +
3892 +namespace layoutimpl
3893 +{
3894 +
3895 +using namespace css;
3896 +
3897 +Box::ChildProps::ChildProps( Box::ChildData *pData )
3898 +{
3899 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Expand" ),
3900 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
3901 + &(pData->mbExpand) );
3902 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Fill" ),
3903 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
3904 + &(pData->mbFill) );
3905 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Padding" ),
3906 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
3907 + &(pData->mnPadding) );
3908 +}
3909 +
3910 +Box::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
3911 + : Box_Base::ChildData( xChild )
3912 + , mnPadding( 0 )
3913 + , mbExpand( true )
3914 + , mbFill( true )
3915 +{
3916 +}
3917 +
3918 +Box::ChildData*
3919 +Box::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
3920 + {
3921 + return new ChildData( xChild );
3922 + }
3923 +
3924 +Box::ChildProps*
3925 +Box::createChildProps( Box_Base::ChildData *pData )
3926 +{
3927 + return new ChildProps( static_cast<Box::ChildData*> ( pData ) );
3928 +}
3929 +
3930 +Box::Box( bool horizontal )
3931 + : Box_Base()
3932 + , mnSpacing( 0 )
3933 + , mbHomogeneous( false )
3934 + , mbHorizontal( horizontal )
3935 +{
3936 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ),
3937 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
3938 + &mbHomogeneous );
3939 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Spacing" ),
3940 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
3941 + &mnSpacing );
3942 + mbHasFlowChildren = false;
3943 +}
3944 +
3945 +awt::Size
3946 +Box::calculateSize( long nWidth )
3947 +{
3948 + int nVisibleChildren = 0;
3949 + // primary vs secundary axis (instead of a X and Y)
3950 + int nPrimSize = 0;
3951 + int nSecSize = 0;
3952 + int nFlowMinWidth = 0; // in case the box only has flow children
3953 +
3954 + mbHasFlowChildren = false;
3955 +
3956 + for ( std::list<Box_Base::ChildData *>::const_iterator it
3957 + = maChildren.begin(); it != maChildren.end(); it++ )
3958 + {
3959 + ChildData *child = static_cast<Box::ChildData*> ( *it );
3960 + if ( !child->isVisible() )
3961 + continue;
3962 +
3963 + uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
3964 + bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
3965 +
3966 + awt::Size aChildSize = child->maRequisition = child->mxChild->getMinimumSize();
3967 +
3968 + if ( !mbHorizontal /*vertical*/ && bFlow )
3969 + {
3970 + if ( nFlowMinWidth == 0 || nFlowMinWidth > aChildSize.Width )
3971 + nFlowMinWidth = aChildSize.Width;
3972 + mbHasFlowChildren = true;
3973 + }
3974 + else
3975 + {
3976 + int size = primDim( aChildSize ) + child->mnPadding * 2;
3977 + if ( mbHomogeneous )
3978 + nPrimSize = SAL_MAX( nPrimSize, size );
3979 + else
3980 + nPrimSize += size;
3981 +
3982 + nSecSize = SAL_MAX( nSecSize, secDim( aChildSize ) );
3983 + }
3984 + nVisibleChildren++;
3985 + }
3986 +
3987 + if ( nVisibleChildren )
3988 + {
3989 + if ( mbHomogeneous )
3990 + nPrimSize *= nVisibleChildren;
3991 + nPrimSize += (nVisibleChildren - 1) * mnSpacing;
3992 + }
3993 +
3994 + if ( mbHasFlowChildren )
3995 + {
3996 + if ( nWidth == 0 )
3997 + nWidth = nSecSize ? nSecSize : nFlowMinWidth;
3998 + for ( std::list<Box_Base::ChildData *>::const_iterator it
3999 + = maChildren.begin(); it != maChildren.end(); it++ )
4000 + {
4001 + ChildData *child = static_cast<Box::ChildData*> ( *it );
4002 + if ( !child->isVisible() )
4003 + continue;
4004 +
4005 + uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
4006 + bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
4007 +
4008 + if ( bFlow )
4009 + nPrimSize += xChildCont->getHeightForWidth( nWidth );
4010 + }
4011 + }
4012 +
4013 + nPrimSize += mnBorderWidth * 2;
4014 + nSecSize += mnBorderWidth * 2;
4015 + return awt::Size( mbHorizontal ? nPrimSize : nSecSize,
4016 + mbHorizontal ? nSecSize : nPrimSize );
4017 +}
4018 +
4019 +awt::Size SAL_CALL
4020 +Box::getMinimumSize() throw(uno::RuntimeException)
4021 +{
4022 + maRequisition = calculateSize();
4023 + return maRequisition;
4024 +}
4025 +
4026 +sal_Bool SAL_CALL
4027 +Box::hasHeightForWidth()
4028 + throw(uno::RuntimeException)
4029 +{
4030 + return mbHasFlowChildren;
4031 +}
4032 +
4033 +sal_Int32 SAL_CALL
4034 +Box::getHeightForWidth( sal_Int32 nWidth )
4035 + throw(uno::RuntimeException)
4036 +{
4037 + if ( hasHeightForWidth() )
4038 + return calculateSize( nWidth ).Height;
4039 + return maRequisition.Height;
4040 +}
4041 +
4042 +void SAL_CALL
4043 +Box::allocateArea( const awt::Rectangle &newArea )
4044 + throw (uno::RuntimeException)
4045 +{
4046 + maAllocation = newArea;
4047 + int nVisibleChildren = 0, nExpandChildren = 0;
4048 +
4049 + for ( std::list<Box_Base::ChildData *>::const_iterator it
4050 + = maChildren.begin(); it != maChildren.end(); it++ )
4051 + {
4052 + ChildData *child = static_cast<Box::ChildData*> ( *it );
4053 + if ( child->isVisible() )
4054 + {
4055 + nVisibleChildren++;
4056 + if ( child->mbExpand )
4057 + nExpandChildren++;
4058 + }
4059 + }
4060 + if ( !nVisibleChildren )
4061 + return;
4062 +
4063 + // split rectangle for dimension helpers
4064 + awt::Point newPoint( newArea.X, newArea.Y );
4065 + awt::Size newSize( newArea.Width, newArea.Height );
4066 +
4067 + int nExtraSpace;
4068 + if ( mbHomogeneous )
4069 + nExtraSpace = ( ( primDim( newSize ) - mnBorderWidth * 2 -
4070 + ( nVisibleChildren - 1 ) * mnSpacing )) / nVisibleChildren;
4071 + else if ( nExpandChildren )
4072 + {
4073 + int reqSize = primDim( maRequisition );
4074 + if ( !mbHorizontal && hasHeightForWidth() )
4075 + reqSize = getHeightForWidth( newArea.Width );
4076 + nExtraSpace = ( primDim( newSize ) - reqSize ) / nExpandChildren;
4077 + }
4078 + else
4079 + nExtraSpace = 0;
4080 +
4081 + int nChildPrimPoint, nChildSecPoint, nChildPrimSize, nChildSecSize;
4082 +
4083 + int nStartPoint = primDim( newPoint ) + mnBorderWidth;
4084 + int nBoxSecSize = SAL_MAX( 1, secDim( newSize ) - mnBorderWidth * 2 );
4085 +
4086 + for ( std::list<Box_Base::ChildData *>::const_iterator it
4087 + = maChildren.begin(); it != maChildren.end(); it++ )
4088 + {
4089 + ChildData *child = static_cast<Box::ChildData*> ( *it );
4090 + if ( !child->isVisible() )
4091 + continue;
4092 +
4093 + awt::Point aChildPos;
4094 + int nBoxPrimSize; // of the available box space
4095 +
4096 + if ( mbHomogeneous )
4097 + nBoxPrimSize = nExtraSpace;
4098 + else
4099 + {
4100 + uno::Reference< awt::XLayoutContainer > xChildCont( child->mxChild, uno::UNO_QUERY );
4101 + bool bFlow = xChildCont.is() && xChildCont->hasHeightForWidth();
4102 + if ( !mbHorizontal && bFlow )
4103 + nBoxPrimSize = xChildCont->getHeightForWidth( newArea.Width );
4104 + else
4105 + nBoxPrimSize = primDim( child->maRequisition );
4106 + nBoxPrimSize += child->mnPadding;
4107 + if ( child->mbExpand )
4108 + nBoxPrimSize += nExtraSpace;
4109 + }
4110 +
4111 + nChildPrimPoint = nStartPoint + child->mnPadding;
4112 + nChildSecPoint = secDim( newPoint ) + mnBorderWidth;
4113 +
4114 + nChildSecSize = nBoxSecSize;
4115 + if ( child->mbFill )
4116 + nChildPrimSize = SAL_MAX( 1, nBoxPrimSize - child->mnPadding);
4117 + else
4118 + {
4119 + nChildPrimSize = primDim( child->maRequisition );
4120 + nChildPrimPoint += (nBoxPrimSize - nChildPrimSize) / 2;
4121 +
4122 + nChildSecPoint += (nBoxSecSize - nChildSecSize) / 2;
4123 + }
4124 +
4125 + awt::Rectangle area;
4126 + area.X = mbHorizontal ? nChildPrimPoint : nChildSecPoint;
4127 + area.Y = mbHorizontal ? nChildSecPoint : nChildPrimPoint;
4128 + area.Width = mbHorizontal ? nChildPrimSize : nChildSecSize;
4129 + area.Height = mbHorizontal ? nChildSecSize : nChildPrimSize;
4130 +
4131 + allocateChildAt( child->mxChild, area );
4132 +
4133 + nStartPoint += nBoxPrimSize + mnSpacing + child->mnPadding;
4134 + }
4135 +}
4136 +
4137 +} // namespace layoutimpl
4138 --- toolkit/source/layout/core/box.hxx.old 1970-01-01 00:00:00.000000000 +0000
4139 +++ toolkit/source/layout/core/box.hxx 2009-04-06 16:42:13.000000000 +0000
4140 @@ -0,0 +1,108 @@
4141 +/*************************************************************************
4142 + *
4143 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4144 + *
4145 + * Copyright 2008 by Sun Microsystems, Inc.
4146 + *
4147 + * OpenOffice.org - a multi-platform office productivity suite
4148 + *
4149 + * $RCSfile$
4150 + *
4151 + * $Revision$
4152 + *
4153 + * This file is part of OpenOffice.org.
4154 + *
4155 + * OpenOffice.org is free software: you can redistribute it and/or modify
4156 + * it under the terms of the GNU Lesser General Public License version 3
4157 + * only, as published by the Free Software Foundation.
4158 + *
4159 + * OpenOffice.org is distributed in the hope that it will be useful,
4160 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4161 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4162 + * GNU Lesser General Public License version 3 for more details
4163 + * (a copy is included in the LICENSE file that accompanied this code).
4164 + *
4165 + * You should have received a copy of the GNU Lesser General Public License
4166 + * version 3 along with OpenOffice.org. If not, see
4167 + * <http://www.openoffice.org/license.html>
4168 + * for a copy of the LGPLv3 License.
4169 + *
4170 + ************************************************************************/
4171 +
4172 +#ifndef LAYOUT_CORE_BOX_HXX
4173 +#define LAYOUT_CORE_BOX_HXX
4174 +
4175 +#include <layout/core/box-base.hxx>
4176 +
4177 +#include <com/sun/star/awt/Point.hpp>
4178 +
4179 +namespace layoutimpl
4180 +{
4181 +
4182 +class Box : public Box_Base
4183 +{
4184 +protected:
4185 + // Box properties (i.e. affect all children)
4186 + sal_Int32 mnSpacing;
4187 + sal_Bool mbHomogeneous;
4188 + sal_Bool mbHorizontal; // false for Vertical
4189 + bool mbHasFlowChildren;
4190 +
4191 +public:
4192 + // Children properties
4193 + struct ChildData : public Box_Base::ChildData
4194 + {
4195 + sal_Int32 mnPadding;
4196 + sal_Bool mbExpand;
4197 + sal_Bool mbFill;
4198 + ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
4199 + };
4200 +
4201 + struct ChildProps : public Box_Base::ChildProps
4202 + {
4203 + ChildProps( ChildData *pData );
4204 + };
4205 +
4206 +protected:
4207 + ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
4208 + ChildProps *createChildProps( Box_Base::ChildData* pData );
4209 +
4210 +public:
4211 + Box( bool horizontal );
4212 +
4213 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
4214 + throw (css::uno::RuntimeException);
4215 +
4216 + virtual css::awt::Size SAL_CALL getMinimumSize()
4217 + throw(css::uno::RuntimeException);
4218 + virtual sal_Bool SAL_CALL hasHeightForWidth()
4219 + throw(css::uno::RuntimeException);
4220 + virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
4221 + throw(css::uno::RuntimeException);
4222 +
4223 + // helper: mix of getMinimumSize() and getHeightForWidth()
4224 + css::awt::Size calculateSize( long nWidth = 0 );
4225 +
4226 + PROPHELPER_SET_INFO
4227 +
4228 +private:
4229 + /* Helpers to deal with the joint Box directions. */
4230 + inline int primDim (const css::awt::Size &size)
4231 + { if (mbHorizontal) return size.Width; else return size.Height; }
4232 + inline int secDim (const css::awt::Size &size)
4233 + { if (mbHorizontal) return size.Height; else return size.Width; }
4234 + inline int primDim (const css::awt::Point &point)
4235 + { if (mbHorizontal) return point.X; else return point.Y; }
4236 + inline int secDim (const css::awt::Point &point)
4237 + { if (mbHorizontal) return point.Y; else return point.X; }
4238 +};
4239 +
4240 +struct VBox : public Box
4241 +{ VBox() : Box (false) {} };
4242 +
4243 +struct HBox : public Box
4244 +{ HBox() : Box (true) {} };
4245 +
4246 +} // namespace layoutimpl
4247 +
4248 +#endif /* LAYOUT_CORE_BOX_HXX */
4249 --- toolkit/source/layout/core/byteseq.cxx.old 1970-01-01 00:00:00.000000000 +0000
4250 +++ toolkit/source/layout/core/byteseq.cxx 2009-04-06 16:42:13.000000000 +0000
4251 @@ -0,0 +1,79 @@
4252 +/*************************************************************************
4253 + *
4254 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4255 + *
4256 + * Copyright 2008 by Sun Microsystems, Inc.
4257 + *
4258 + * OpenOffice.org - a multi-platform office productivity suite
4259 + *
4260 + * $RCSfile: byteseq.cxx,v $
4261 + * $Revision: 1.3 $
4262 + *
4263 + * This file is part of OpenOffice.org.
4264 + *
4265 + * OpenOffice.org is free software: you can redistribute it and/or modify
4266 + * it under the terms of the GNU Lesser General Public License version 3
4267 + * only, as published by the Free Software Foundation.
4268 + *
4269 + * OpenOffice.org is distributed in the hope that it will be useful,
4270 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4271 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4272 + * GNU Lesser General Public License version 3 for more details
4273 + * (a copy is included in the LICENSE file that accompanied this code).
4274 + *
4275 + * You should have received a copy of the GNU Lesser General Public License
4276 + * version 3 along with OpenOffice.org. If not, see
4277 + * <http://www.openoffice.org/license.html>
4278 + * for a copy of the LGPLv3 License.
4279 + *
4280 + ************************************************************************/
4281 +
4282 +#include <com/sun/star/io/XInputStream.hpp>
4283 +#include <osl/file.hxx>
4284 +#include <comphelper/oslfile2streamwrap.hxx>
4285 +
4286 +using osl::File;
4287 +using osl::FileBase;
4288 +using namespace ::com::sun::star;
4289 +
4290 +namespace layoutimpl
4291 +{
4292 +
4293 +uno::Reference< io::XInputStream > getFileAsStream( const rtl::OUString &rName )
4294 +{
4295 + rtl::OUString sFileURL;
4296 + if( FileBase::E_None != FileBase::getFileURLFromSystemPath( rName, sFileURL ) )
4297 + sFileURL = rName; // maybe it already was a file url
4298 +
4299 + File * blobFile = new File(sFileURL);
4300 + File::RC errorCode = blobFile->open(OpenFlag_Read);
4301 +
4302 + uno::Reference<io::XInputStream> xResult;
4303 + switch (errorCode)
4304 + {
4305 + case osl::File::E_None: // got it
4306 + xResult.set( new comphelper::OSLInputStreamWrapper(blobFile,true) );
4307 + break;
4308 +
4309 + case osl::File::E_NOENT: // no file => no stream
4310 + delete blobFile;
4311 + break;
4312 +
4313 + default:
4314 + delete blobFile;
4315 +/* {
4316 + rtl::OUStringBuffer sMsg;
4317 + sMsg.appendAscii("Cannot open output file \"");
4318 + sMsg.append(aURL);
4319 + sMsg.appendAscii("\" : ");
4320 + sMsg.append(configmgr::FileHelper::createOSLErrorString(errorCode));
4321 +
4322 + throw io::IOException(sMsg.makeStringAndClear(),NULL);
4323 + }
4324 +*/
4325 + }
4326 +
4327 + return xResult;
4328 +}
4329 +
4330 +} // namespace layoutimpl
4331 --- toolkit/source/layout/core/container.cxx.old 1970-01-01 00:00:00.000000000 +0000
4332 +++ toolkit/source/layout/core/container.cxx 2009-04-06 16:42:13.000000000 +0000
4333 @@ -0,0 +1,167 @@
4334 +/*************************************************************************
4335 + *
4336 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4337 + *
4338 + * Copyright 2008 by Sun Microsystems, Inc.
4339 + *
4340 + * OpenOffice.org - a multi-platform office productivity suite
4341 + *
4342 + * $RCSfile$
4343 + *
4344 + * $Revision$
4345 + *
4346 + * This file is part of OpenOffice.org.
4347 + *
4348 + * OpenOffice.org is free software: you can redistribute it and/or modify
4349 + * it under the terms of the GNU Lesser General Public License version 3
4350 + * only, as published by the Free Software Foundation.
4351 + *
4352 + * OpenOffice.org is distributed in the hope that it will be useful,
4353 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4354 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4355 + * GNU Lesser General Public License version 3 for more details
4356 + * (a copy is included in the LICENSE file that accompanied this code).
4357 + *
4358 + * You should have received a copy of the GNU Lesser General Public License
4359 + * version 3 along with OpenOffice.org. If not, see
4360 + * <http://www.openoffice.org/license.html>
4361 + * for a copy of the LGPLv3 License.
4362 + *
4363 + ************************************************************************/
4364 +
4365 +#include "container.hxx"
4366 +
4367 +#include <com/sun/star/awt/XWindow.hpp>
4368 +#include <com/sun/star/awt/PosSize.hpp>
4369 +#include <tools/debug.hxx>
4370 +
4371 +namespace layoutimpl {
4372 +
4373 +using namespace css;
4374 +
4375 +Container::Container()
4376 + : Container_Base()
4377 + , PropHelper()
4378 + , mnBorderWidth( 0 )
4379 +{
4380 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Border" ),
4381 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
4382 + &mnBorderWidth );
4383 + setChangeListener( this );
4384 +}
4385 +
4386 +uno::Any
4387 +Container::queryInterface( const uno::Type & rType ) throw (uno::RuntimeException)
4388 +{
4389 + uno::Any aRet = Container_Base::queryInterface( rType );
4390 + return aRet.hasValue() ? aRet : PropHelper::queryInterface( rType );
4391 +}
4392 +
4393 +void
4394 +Container::allocateChildAt( const uno::Reference< awt::XLayoutConstrains > &xChild,
4395 + const awt::Rectangle &rArea )
4396 + throw( uno::RuntimeException )
4397 +{
4398 + uno::Reference< awt::XLayoutContainer > xCont( xChild, uno::UNO_QUERY );
4399 + if ( xCont.is() )
4400 + xCont->allocateArea( rArea );
4401 + else
4402 + {
4403 + uno::Reference< awt::XWindow > xWindow( xChild, uno::UNO_QUERY );
4404 + if ( xWindow.is() )
4405 + xWindow->setPosSize( rArea.X, rArea.Y, rArea.Width, rArea.Height,
4406 + awt::PosSize::POSSIZE );
4407 + else
4408 + {
4409 + DBG_ERROR( "Error: non-sizeable child" );
4410 + }
4411 + }
4412 +}
4413 +
4414 +uno::Sequence< uno::Reference< awt::XLayoutConstrains > >
4415 +Container::getSingleChild ( uno::Reference< awt::XLayoutConstrains >const &xChildOrNil )
4416 +{
4417 + uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aSeq( ( xChildOrNil.is() ? 1 : 0 ) );
4418 + if ( xChildOrNil.is() )
4419 + aSeq[0] = xChildOrNil;
4420 + return aSeq;
4421 +}
4422 +
4423 +void
4424 +Container::queueResize()
4425 +{
4426 + if ( mxLayoutUnit.is() )
4427 + mxLayoutUnit->queueResize( uno::Reference< awt::XLayoutContainer >( this ) );
4428 +}
4429 +
4430 +void
4431 +Container::setChildParent( const uno::Reference< awt::XLayoutConstrains >& xChild )
4432 +{
4433 + uno::Reference< awt::XLayoutContainer > xContChild( xChild, uno::UNO_QUERY );
4434 + if ( xContChild.is() )
4435 + {
4436 + xContChild->setParent( uno::Reference< awt::XLayoutContainer >( this ) );
4437 +#if 0
4438 + assert( !mxLayoutUnit.is() );
4439 + xContChild->setLayoutUnit( mxLayoutUnit );
4440 +#endif
4441 + }
4442 +}
4443 +
4444 +void
4445 +Container::unsetChildParent( const uno::Reference< awt::XLayoutConstrains >& xChild )
4446 +{
4447 + uno::Reference< awt::XLayoutContainer > xContChild( xChild, uno::UNO_QUERY );
4448 + if ( xContChild.is() )
4449 + {
4450 + xContChild->setParent( uno::Reference< awt::XLayoutContainer >() );
4451 +#if 0
4452 + xContChild->setLayoutUnit( uno::Reference< awt::XLayoutUnit >() );
4453 +#endif
4454 + }
4455 +}
4456 +
4457 +#if 0
4458 +std::string
4459 +Container::getLabel() // debug label
4460 +{
4461 + std::string depth;
4462 + uno::Reference< awt::XLayoutContainer > xContainer( this );
4463 + while ( xContainer.is() )
4464 + {
4465 + int node = 0; // child nb
4466 + uno::Reference< awt::XLayoutContainer > xParent = xContainer->getContainerParent();
4467 + if ( xParent.is() )
4468 + {
4469 +
4470 + uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
4471 + aChildren = xParent->getChildren();
4472 + for ( node = 0; node < aChildren.getLength(); node++ )
4473 + if ( aChildren[ node ] == xContainer )
4474 + break;
4475 + }
4476 +
4477 + char str[ 8 ];
4478 + snprintf( str, 8, "%d", node );
4479 + if ( depth.empty() )
4480 + depth = std::string( str );
4481 + else
4482 + depth = std::string( str ) + ":" + depth;
4483 +
4484 + xContainer = xParent;
4485 + }
4486 +
4487 + return std::string( getName() ) + " (" + depth + ")";
4488 +}
4489 +#endif
4490 +
4491 +void Container::propertiesChanged()
4492 +{
4493 + // cl: why this assertion? This is also called to set properties at the top level widget which has no parent!?
4494 + // DBG_ASSERT( mxParent.is(), "Properties listener: error container doesn't have parent" );
4495 +
4496 + if ( mxLayoutUnit.is() && mxParent.is() )
4497 + mxLayoutUnit->queueResize( mxParent );
4498 +}
4499 +
4500 +}
4501 --- toolkit/source/layout/core/container.hxx.old 1970-01-01 00:00:00.000000000 +0000
4502 +++ toolkit/source/layout/core/container.hxx 2009-04-06 16:42:13.000000000 +0000
4503 @@ -0,0 +1,140 @@
4504 +/*************************************************************************
4505 + *
4506 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4507 + *
4508 + * Copyright 2008 by Sun Microsystems, Inc.
4509 + *
4510 + * OpenOffice.org - a multi-platform office productivity suite
4511 + *
4512 + * $RCSfile$
4513 + *
4514 + * $Revision$
4515 + *
4516 + * This file is part of OpenOffice.org.
4517 + *
4518 + * OpenOffice.org is free software: you can redistribute it and/or modify
4519 + * it under the terms of the GNU Lesser General Public License version 3
4520 + * only, as published by the Free Software Foundation.
4521 + *
4522 + * OpenOffice.org is distributed in the hope that it will be useful,
4523 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4524 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4525 + * GNU Lesser General Public License version 3 for more details
4526 + * (a copy is included in the LICENSE file that accompanied this code).
4527 + *
4528 + * You should have received a copy of the GNU Lesser General Public License
4529 + * version 3 along with OpenOffice.org. If not, see
4530 + * <http://www.openoffice.org/license.html>
4531 + * for a copy of the LGPLv3 License.
4532 + *
4533 + ************************************************************************/
4534 +
4535 +#ifndef LAYOUT_CORE_CONTAINER_HXX
4536 +#define LAYOUT_CORE_CONTAINER_HXX
4537 +
4538 +#include <layout/core/helper.hxx>
4539 +
4540 +#include <cppuhelper/implbase2.hxx>
4541 +#include <com/sun/star/awt/MaxChildrenException.hpp>
4542 +
4543 +namespace layoutimpl
4544 +{
4545 +namespace css = ::com::sun::star;
4546 +
4547 +typedef ::cppu::WeakImplHelper2< css::awt::XLayoutContainer,
4548 + css::awt::XLayoutConstrains > Container_Base;
4549 +
4550 +class Container : public Container_Base, public PropHelper, public PropHelper::Listener
4551 +{
4552 + friend class ChildProps;
4553 +protected:
4554 + // Widget properties
4555 + css::uno::Reference< css::awt::XLayoutContainer > mxParent;
4556 + css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
4557 + css::awt::Size maRequisition;
4558 + css::awt::Rectangle maAllocation;
4559 +
4560 + // Container properties
4561 + sal_Int32 mnBorderWidth;
4562 +
4563 + // Utilities
4564 + void allocateChildAt( const css::uno::Reference< css::awt::XLayoutConstrains > &xChild,
4565 + const css::awt::Rectangle &rArea )
4566 + throw (css::uno::RuntimeException);
4567 + static css::uno::Sequence< css::uno::Reference< css::awt::XLayoutConstrains > >
4568 + getSingleChild (const css::uno::Reference< css::awt::XLayoutConstrains > &xChildOrNil);
4569 + void setChildParent( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild );
4570 + void unsetChildParent( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild );
4571 +
4572 + void queueResize();
4573 + void forceRecalc() { allocateArea( maAllocation ); }
4574 +
4575 +public:
4576 + Container();
4577 + virtual ~Container() {}
4578 +
4579 + // XInterface
4580 + virtual void SAL_CALL acquire() throw() { PropHelper::acquire(); }
4581 + virtual void SAL_CALL release() throw() { PropHelper::release(); }
4582 + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
4583 +
4584 + // css::awt::XLayoutContainer
4585 + virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
4586 + throw (css::uno::RuntimeException, css::awt::MaxChildrenException) = 0;
4587 + virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
4588 + throw (css::uno::RuntimeException) = 0;
4589 +
4590 + virtual css::uno::Sequence< css::uno::Reference
4591 + < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
4592 + throw (css::uno::RuntimeException) = 0;
4593 +
4594 + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
4595 + const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
4596 + throw (css::uno::RuntimeException) = 0;
4597 +
4598 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
4599 + throw (css::uno::RuntimeException) = 0;
4600 +
4601 + void SAL_CALL setLayoutUnit( const css::uno::Reference< css::awt::XLayoutUnit > &xUnit )
4602 + throw(css::uno::RuntimeException)
4603 + { mxLayoutUnit = xUnit; }
4604 + css::uno::Reference< css::awt::XLayoutUnit > SAL_CALL getLayoutUnit()
4605 + throw(css::uno::RuntimeException)
4606 + { return mxLayoutUnit; }
4607 +
4608 + css::awt::Size SAL_CALL getRequestedSize() throw(css::uno::RuntimeException)
4609 + { return maRequisition; }
4610 + com::sun::star::awt::Rectangle SAL_CALL getAllocatedArea() throw(css::uno::RuntimeException)
4611 + { return maAllocation; }
4612 +
4613 + virtual sal_Bool SAL_CALL hasHeightForWidth()
4614 + throw(css::uno::RuntimeException) = 0;
4615 + virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
4616 + throw(css::uno::RuntimeException) = 0;
4617 +
4618 + // css::awt::XLayoutContainer: css::container::XChild
4619 + css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
4620 + throw (css::uno::RuntimeException)
4621 + { return mxParent; }
4622 + void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface > &xParent )
4623 + throw (css::uno::RuntimeException)
4624 + { mxParent = css::uno::Reference< css::awt::XLayoutContainer >( xParent, css::uno::UNO_QUERY ); }
4625 +
4626 + // css::awt::XLayoutConstrains
4627 + virtual css::awt::Size SAL_CALL getMinimumSize()
4628 + throw(css::uno::RuntimeException) = 0;
4629 + // (not properly implemented in toolkit, ignore it.)
4630 + css::awt::Size SAL_CALL getPreferredSize()
4631 + throw(css::uno::RuntimeException) { return getMinimumSize(); } // TODO: use this for flow?
4632 + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize )
4633 + throw(css::uno::RuntimeException) { return rNewSize; }
4634 +
4635 +PROPHELPER_SET_INFO
4636 +
4637 +protected:
4638 + void propertiesChanged();
4639 +};
4640 +
4641 +} // namespace layoutimpl
4642 +
4643 +#endif /* LAYOUT_CORE_CONTAINER_HXX */
4644 --- toolkit/source/layout/core/dialogbuttonhbox.cxx.old 1970-01-01 00:00:00.000000000 +0000
4645 +++ toolkit/source/layout/core/dialogbuttonhbox.cxx 2009-04-06 16:42:13.000000000 +0000
4646 @@ -0,0 +1,294 @@
4647 +/*************************************************************************
4648 + *
4649 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4650 + *
4651 + * Copyright 2008 by Sun Microsystems, Inc.
4652 + *
4653 + * OpenOffice.org - a multi-platform office productivity suite
4654 + *
4655 + * $RCSfile$
4656 + *
4657 + * $Revision$
4658 + *
4659 + * This file is part of OpenOffice.org.
4660 + *
4661 + * OpenOffice.org is free software: you can redistribute it and/or modify
4662 + * it under the terms of the GNU Lesser General Public License version 3
4663 + * only, as published by the Free Software Foundation.
4664 + *
4665 + * OpenOffice.org is distributed in the hope that it will be useful,
4666 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4667 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4668 + * GNU Lesser General Public License version 3 for more details
4669 + * (a copy is included in the LICENSE file that accompanied this code).
4670 + *
4671 + * You should have received a copy of the GNU Lesser General Public License
4672 + * version 3 along with OpenOffice.org. If not, see
4673 + * <http://www.openoffice.org/license.html>
4674 + * for a copy of the LGPLv3 License.
4675 + *
4676 + ************************************************************************/
4677 +
4678 +#include <awt/vclxbutton.hxx>
4679 +#include <tools/debug.hxx>
4680 +#include <toolkit/awt/vclxwindows.hxx>
4681 +#include <vcl/button.hxx>
4682 +
4683 +#include "dialogbuttonhbox.hxx"
4684 +#include "flow.hxx"
4685 +#include "proplist.hxx"
4686 +
4687 +#if TEST_LAYOUT && !defined( DBG_UTIL )
4688 +#include <cstdio>
4689 +#undef DBG_ERROR
4690 +#define DBG_ERROR printf
4691 +#undef DBG_ERROR1
4692 +#define DBG_ERROR1 printf
4693 +#undef DBG_ERROR2
4694 +#define DBG_ERROR2 printf
4695 +#endif /* TEST_LAYOUT && !DBG_UTIL */
4696 +
4697 +namespace layoutimpl
4698 +{
4699 +
4700 +using namespace css;
4701 +
4702 +//FIXME: how to set platform-dependant variables?
4703 +DialogButtonHBox::Ordering const DialogButtonHBox::DEFAULT_ORDERING =
4704 +#if defined( MACOSX )
4705 + DialogButtonHBox::MACOS;
4706 +#elif defined( SAL_W32 )
4707 +DialogButtonHBox::WINDOWS;
4708 +#elif defined( ENABLE_KDE )
4709 +DialogButtonHBox::KDE;
4710 +#else /* !MACOSX && !SAL_W32 && !ENABLE_KDE */
4711 +DialogButtonHBox::GNOME;
4712 +#endif /* !MACOSX && !SAL_W32 && !ENABLE_KDE */
4713 +
4714 +DialogButtonHBox::DialogButtonHBox()
4715 + : HBox()
4716 + , mnOrdering( DEFAULT_ORDERING )
4717 + , mFlow()
4718 + , mpAction( 0 )
4719 + , mpAffirmative( 0 )
4720 + , mpAlternate( 0 )
4721 + , mpApply( 0 )
4722 + , mpCancel( 0 )
4723 + , mpFlow( createChild( uno::Reference< awt::XLayoutConstrains > ( &mFlow ) ) )
4724 + , mpHelp( 0 )
4725 + , mpReset( 0 )
4726 +{
4727 + mbHomogeneous = true;
4728 +}
4729 +
4730 +void
4731 +DialogButtonHBox::setOrdering( rtl::OUString const& ordering )
4732 +{
4733 + if ( ordering.equalsIgnoreAsciiCaseAscii( "GNOME" ) )
4734 + mnOrdering = GNOME;
4735 + else if ( ordering.equalsIgnoreAsciiCaseAscii( "KDE" ) )
4736 + mnOrdering = KDE;
4737 + else if ( ordering.equalsIgnoreAsciiCaseAscii( "MacOS" ) )
4738 + mnOrdering = MACOS;
4739 + else if ( ordering.equalsIgnoreAsciiCaseAscii( "Windows" ) )
4740 + mnOrdering = WINDOWS;
4741 + else
4742 + {
4743 + DBG_ERROR1( "DialogButtonHBox: no such ordering: %s", OUSTRING_CSTR( ordering ) );
4744 + }
4745 +}
4746 +
4747 +void
4748 +DialogButtonHBox::addChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
4749 + throw ( uno::RuntimeException, awt::MaxChildrenException )
4750 +{
4751 + if ( !xChild.is() )
4752 + return;
4753 +
4754 + ChildData *p = createChild( xChild );
4755 +
4756 +#define IS_BUTTON(t) dynamic_cast<VCLX##t##Button *>( xChild.get () )
4757 +
4758 + /* Sort Retry as Action */
4759 + if ( !mpAction && IS_BUTTON( Retry ) )
4760 + mpAction = p;
4761 + else if ( !mpAffirmative && IS_BUTTON( OK ) )
4762 + mpAffirmative = p;
4763 + else if ( !mpAffirmative && IS_BUTTON( Yes ) )
4764 + mpAffirmative = p;
4765 + else if ( !mpAlternate && IS_BUTTON( No ) )
4766 + mpAlternate = p;
4767 + /* Sort Ignore as Alternate */
4768 + else if ( !mpAlternate && IS_BUTTON( Ignore ) )
4769 + mpAlternate = p;
4770 + else if ( !mpApply && IS_BUTTON( Apply ) )
4771 + mpApply = p;
4772 + else if ( !mpCancel && IS_BUTTON( Cancel ) )
4773 + mpCancel = p;
4774 + /* Let the user overwrite Flow */
4775 + else if ( /* !mpFlow && */ dynamic_cast<Flow *>( xChild.get () ) )
4776 + mpFlow = p;
4777 + else if ( !mpHelp && IS_BUTTON( Help ) )
4778 + mpHelp = p;
4779 + else if ( !mpReset && IS_BUTTON( Reset ) )
4780 + mpReset = p;
4781 + else
4782 + maOther.push_back( p );
4783 + orderChildren();
4784 + setChildParent( xChild );
4785 + queueResize();
4786 +}
4787 +
4788 +void
4789 +DialogButtonHBox::orderChildren()
4790 +{
4791 + if ( mnOrdering == WINDOWS )
4792 + windowsOrdering();
4793 + else if ( mnOrdering == MACOS )
4794 + macosOrdering();
4795 + else if ( mnOrdering == KDE )
4796 + kdeOrdering();
4797 + else if ( 1 || mnOrdering == GNOME )
4798 + gnomeOrdering();
4799 +}
4800 +
4801 +void SAL_CALL
4802 +DialogButtonHBox::removeChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
4803 + throw ( uno::RuntimeException)
4804 +{
4805 + if ( !xChild.is ())
4806 + return;
4807 +
4808 + Box_Base::ChildData *p = 0;
4809 +
4810 + if ( mpAction && mpAction->mxChild == xChild )
4811 + p = mpAction;
4812 + else if ( mpAffirmative && mpAffirmative->mxChild == xChild )
4813 + p = mpAffirmative;
4814 + else if ( mpAlternate && mpAlternate->mxChild == xChild )
4815 + p = mpAlternate;
4816 + else if ( mpApply && mpApply->mxChild == xChild )
4817 + p = mpApply;
4818 + else if ( mpCancel && mpCancel->mxChild == xChild )
4819 + p = mpCancel;
4820 + else if ( mpFlow && mpFlow->mxChild == xChild )
4821 + p = mpFlow;
4822 + else if ( mpReset && mpReset->mxChild == xChild )
4823 + p = mpReset;
4824 + else if ( mpHelp && mpHelp->mxChild == xChild )
4825 + p = mpHelp;
4826 + else
4827 + p = removeChildData( maOther, xChild );
4828 +
4829 + if ( p )
4830 + {
4831 + delete p;
4832 + unsetChildParent( xChild );
4833 + orderChildren();
4834 + queueResize();
4835 + }
4836 + else
4837 + {
4838 + DBG_ERROR( "DialogButtonHBox: removeChild: no such child" );
4839 + }
4840 +}
4841 +
4842 +void
4843 +DialogButtonHBox::gnomeOrdering()
4844 +{
4845 + std::list< Box_Base::ChildData * > ordered;
4846 + if ( mpHelp )
4847 + ordered.push_back( mpHelp );
4848 + if ( mpReset )
4849 + ordered.push_back( mpReset );
4850 + if ( mpFlow && ( mpHelp || mpReset ) )
4851 + ordered.push_back( mpFlow );
4852 + ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
4853 + if ( mpAction )
4854 + ordered.push_back( mpAction );
4855 + if ( mpApply )
4856 + ordered.push_back( mpApply );
4857 + if ( mpAlternate )
4858 + ordered.push_back( mpAlternate );
4859 + if ( mpCancel )
4860 + ordered.push_back( mpCancel );
4861 + if ( mpAffirmative )
4862 + ordered.push_back( mpAffirmative );
4863 + maChildren = ordered;
4864 +}
4865 +
4866 +void
4867 +DialogButtonHBox::kdeOrdering()
4868 +{
4869 + std::list< Box_Base::ChildData * > ordered;
4870 + if ( mpHelp )
4871 + ordered.push_back( mpHelp );
4872 + if ( mpReset )
4873 + ordered.push_back( mpReset );
4874 + if ( mpFlow && ( mpHelp || mpReset ) )
4875 + ordered.push_back( mpFlow );
4876 + ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
4877 + if ( mpAction )
4878 + ordered.push_back( mpAction );
4879 + if ( mpAffirmative )
4880 + ordered.push_back( mpAffirmative );
4881 + if ( mpApply )
4882 + ordered.push_back( mpApply );
4883 + if ( mpAlternate )
4884 + ordered.push_back( mpAlternate );
4885 + if ( mpCancel )
4886 + ordered.push_back( mpCancel );
4887 + maChildren = ordered;
4888 +}
4889 +
4890 +void
4891 +DialogButtonHBox::macosOrdering()
4892 +{
4893 + std::list< Box_Base::ChildData * > ordered;
4894 + if ( mpHelp )
4895 + ordered.push_back( mpHelp );
4896 + if ( mpReset )
4897 + ordered.push_back( mpReset );
4898 + if ( mpApply )
4899 + ordered.push_back( mpApply );
4900 + if ( mpAction )
4901 + ordered.push_back( mpAction );
4902 + ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
4903 + if ( mpFlow ) // Always flow? && ( maOther.size () || mpHelp || mpReset || mpAction ) )
4904 + ordered.push_back( mpFlow );
4905 + if ( mpAlternate )
4906 + ordered.push_back( mpAlternate );
4907 + if ( mpFlow && mpAlternate )
4908 + ordered.push_back( mpFlow );
4909 + if ( mpCancel )
4910 + ordered.push_back( mpCancel );
4911 + if ( mpAffirmative )
4912 + ordered.push_back( mpAffirmative );
4913 + maChildren = ordered;
4914 +}
4915 +
4916 +void
4917 +DialogButtonHBox::windowsOrdering()
4918 +{
4919 + std::list< Box_Base::ChildData * > ordered;
4920 + if ( mpReset )
4921 + ordered.push_back( mpReset );
4922 + if ( mpReset && mpFlow )
4923 + ordered.push_back( mpFlow );
4924 + if ( mpAffirmative )
4925 + ordered.push_back( mpAffirmative );
4926 + if ( mpAlternate )
4927 + ordered.push_back( mpAlternate );
4928 + if ( mpAction )
4929 + ordered.push_back( mpAction );
4930 + if ( mpCancel )
4931 + ordered.push_back( mpCancel );
4932 + if ( mpApply )
4933 + ordered.push_back( mpApply );
4934 + ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
4935 + if ( mpHelp )
4936 + ordered.push_back( mpHelp );
4937 + maChildren = ordered;
4938 +}
4939 +
4940 +} // namespace layoutimpl
4941 --- toolkit/source/layout/core/dialogbuttonhbox.hxx.old 1970-01-01 00:00:00.000000000 +0000
4942 +++ toolkit/source/layout/core/dialogbuttonhbox.hxx 2009-04-06 16:42:13.000000000 +0000
4943 @@ -0,0 +1,77 @@
4944 +/*************************************************************************
4945 + *
4946 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4947 + *
4948 + * Copyright 2008 by Sun Microsystems, Inc.
4949 + *
4950 + * OpenOffice.org - a multi-platform office productivity suite
4951 + *
4952 + * $RCSfile$
4953 + *
4954 + * $Revision$
4955 + *
4956 + * This file is part of OpenOffice.org.
4957 + *
4958 + * OpenOffice.org is free software: you can redistribute it and/or modify
4959 + * it under the terms of the GNU Lesser General Public License version 3
4960 + * only, as published by the Free Software Foundation.
4961 + *
4962 + * OpenOffice.org is distributed in the hope that it will be useful,
4963 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4964 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4965 + * GNU Lesser General Public License version 3 for more details
4966 + * (a copy is included in the LICENSE file that accompanied this code).
4967 + *
4968 + * You should have received a copy of the GNU Lesser General Public License
4969 + * version 3 along with OpenOffice.org. If not, see
4970 + * <http://www.openoffice.org/license.html>
4971 + * for a copy of the LGPLv3 License.
4972 + *
4973 + ************************************************************************/
4974 +
4975 +#ifndef LAYOUT_CORE_DIALOGBUTTONHBOX_HXX
4976 +#define LAYOUT_CORE_DIALOGBUTTONHBOX_HXX
4977 +
4978 +#include <layout/core/box.hxx>
4979 +#include <layout/core/flow.hxx>
4980 +
4981 +namespace layoutimpl
4982 +{
4983 +
4984 +class DialogButtonHBox : public HBox
4985 +{
4986 +public:
4987 + DialogButtonHBox();
4988 +
4989 + void setOrdering( rtl::OUString const& ordering );
4990 + void SAL_CALL addChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) throw ( css::uno::RuntimeException, css::awt::MaxChildrenException );
4991 + void SAL_CALL removeChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) throw ( css::uno::RuntimeException );
4992 +
4993 +private:
4994 + enum Ordering { PLATFORM, GNOME, KDE, MACOS, WINDOWS };
4995 +
4996 + void orderChildren();
4997 + void gnomeOrdering();
4998 + void kdeOrdering();
4999 + void macosOrdering();
5000 + void windowsOrdering();
5001 +
5002 + static Ordering const DEFAULT_ORDERING;
5003 + Ordering mnOrdering;
5004 + Flow mFlow;
5005 +
5006 + ChildData *mpAction; /* [..]?, [Retry?] */
5007 + ChildData *mpAffirmative; /* OK, Yes, Save */
5008 + ChildData *mpAlternate; /* NO, [Ignore?], Don't save, Quit without saving */
5009 + ChildData *mpApply; /* Deprecated? */
5010 + ChildData *mpCancel; /* Cancel, Close */
5011 + ChildData *mpFlow;
5012 + ChildData *mpHelp;
5013 + ChildData *mpReset;
5014 +
5015 + std::list< Box_Base::ChildData *> maOther;
5016 +};
5017 +
5018 +} // namespace layoutimpl
5019 +
5020 +#endif /* LAYOUT_CORE_DIALOGBUTTONHBOX_HXX */
5021 --- toolkit/source/layout/core/factory.cxx.old 1970-01-01 00:00:00.000000000 +0000
5022 +++ toolkit/source/layout/core/factory.cxx 2009-04-06 16:42:13.000000000 +0000
5023 @@ -0,0 +1,154 @@
5024 +/*************************************************************************
5025 + *
5026 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5027 + *
5028 + * Copyright 2008 by Sun Microsystems, Inc.
5029 + *
5030 + * OpenOffice.org - a multi-platform office productivity suite
5031 + *
5032 + * $RCSfile$
5033 + *
5034 + * $Revision$
5035 + *
5036 + * This file is part of OpenOffice.org.
5037 + *
5038 + * OpenOffice.org is free software: you can redistribute it and/or modify
5039 + * it under the terms of the GNU Lesser General Public License version 3
5040 + * only, as published by the Free Software Foundation.
5041 + *
5042 + * OpenOffice.org is distributed in the hope that it will be useful,
5043 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5044 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5045 + * GNU Lesser General Public License version 3 for more details
5046 + * (a copy is included in the LICENSE file that accompanied this code).
5047 + *
5048 + * You should have received a copy of the GNU Lesser General Public License
5049 + * version 3 along with OpenOffice.org. If not, see
5050 + * <http://www.openoffice.org/license.html>
5051 + * for a copy of the LGPLv3 License.
5052 + *
5053 + ************************************************************************/
5054 +
5055 +#include "factory.hxx"
5056 +
5057 +#include <com/sun/star/registry/XRegistryKey.hpp>
5058 +#include <com/sun/star/registry/InvalidRegistryException.hpp>
5059 +#include <cppuhelper/factory.hxx>
5060 +
5061 +#include "root.hxx"
5062 +
5063 +using namespace ::com::sun::star;
5064 +using namespace layoutimpl;
5065 +
5066 +void * SAL_CALL comp_Layout_component_getFactory( const char * pImplName, void * pServiceManager, void * /*registryKey*/ )
5067 + {
5068 + void * pRet = 0;
5069 +
5070 + ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
5071 + uno::Reference< lang::XSingleServiceFactory > xFactory;
5072 +
5073 + if ( pServiceManager && aImplName.equals( LayoutFactory::impl_staticGetImplementationName() ) )
5074 + xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ),
5075 + LayoutFactory::impl_staticGetImplementationName(),
5076 + LayoutFactory::impl_staticCreateSelfInstance,
5077 + LayoutFactory::impl_staticGetSupportedServiceNames() );
5078 + if ( xFactory.is() )
5079 + {
5080 + xFactory->acquire();
5081 + pRet = xFactory.get();
5082 + }
5083 +
5084 + return pRet;
5085 + }
5086 +
5087 +sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, void * pRegistryKey )
5088 + {
5089 + if ( pRegistryKey )
5090 + {
5091 + try
5092 + {
5093 + uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
5094 + uno::Reference< registry::XRegistryKey > xNewKey;
5095 +
5096 + xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
5097 + LayoutFactory::impl_staticGetImplementationName() +
5098 + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
5099 +
5100 + const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
5101 + for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
5102 + xNewKey->createKey( aServices.getConstArray()[i] );
5103 +
5104 + return sal_True;
5105 + }
5106 + catch (registry::InvalidRegistryException &)
5107 + {
5108 + OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
5109 + }
5110 + }
5111 + return sal_False;
5112 + }
5113 +
5114 +// Component registration
5115 +::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
5116 +{
5117 + return ::rtl::OUString::createFromAscii( "com.sun.star.comp.awt.Layout" );
5118 +}
5119 +
5120 +uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::impl_staticGetSupportedServiceNames()
5121 +{
5122 + uno::Sequence< ::rtl::OUString > aRet(2);
5123 + aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.awt.Layout");
5124 + aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.awt.Layout");
5125 + return aRet;
5126 +}
5127 +
5128 +uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::impl_staticCreateSelfInstance(
5129 + const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
5130 +{
5131 + return uno::Reference< uno::XInterface >( *new LayoutFactory( xServiceManager ) );
5132 +}
5133 +
5134 +// XServiceInfo
5135 +::rtl::OUString SAL_CALL LayoutFactory::getImplementationName()
5136 + throw ( uno::RuntimeException )
5137 +{
5138 + return impl_staticGetImplementationName();
5139 +}
5140 +
5141 +uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::getSupportedServiceNames()
5142 + throw ( uno::RuntimeException )
5143 +{
5144 + return impl_staticGetSupportedServiceNames();
5145 +}
5146 +
5147 +sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& ServiceName )
5148 + throw ( uno::RuntimeException )
5149 +{
5150 + uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
5151 + for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
5152 + if ( ServiceName.compareTo( aSeq[i] ) == 0 )
5153 + return sal_True;
5154 +
5155 + return sal_False;
5156 +}
5157 +
5158 +// XSingleServiceFactory
5159 +uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::createInstance()
5160 + throw ( uno::Exception,
5161 + uno::RuntimeException )
5162 +{
5163 + return uno::Reference< uno::XInterface >(
5164 + static_cast< OWeakObject* >( new LayoutRoot( m_xFactory ) ),
5165 + uno::UNO_QUERY );
5166 +}
5167 +
5168 +uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::createInstanceWithArguments(
5169 + const uno::Sequence< uno::Any >& aArguments )
5170 + throw ( uno::Exception,
5171 + uno::RuntimeException )
5172 +{
5173 + uno::Reference< uno::XInterface > layout = createInstance();
5174 + uno::Reference< lang::XInitialization > xInit( layout, uno::UNO_QUERY );
5175 + xInit->initialize( aArguments );
5176 + return layout;
5177 +}
5178 --- toolkit/source/layout/core/factory.hxx.old 1970-01-01 00:00:00.000000000 +0000
5179 +++ toolkit/source/layout/core/factory.hxx 2009-04-06 16:42:13.000000000 +0000
5180 @@ -0,0 +1,78 @@
5181 +/*************************************************************************
5182 + *
5183 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5184 + *
5185 + * Copyright 2008 by Sun Microsystems, Inc.
5186 + *
5187 + * OpenOffice.org - a multi-platform office productivity suite
5188 + *
5189 + * $RCSfile$
5190 + *
5191 + * $Revision$
5192 + *
5193 + * This file is part of OpenOffice.org.
5194 + *
5195 + * OpenOffice.org is free software: you can redistribute it and/or modify
5196 + * it under the terms of the GNU Lesser General Public License version 3
5197 + * only, as published by the Free Software Foundation.
5198 + *
5199 + * OpenOffice.org is distributed in the hope that it will be useful,
5200 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5201 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5202 + * GNU Lesser General Public License version 3 for more details
5203 + * (a copy is included in the LICENSE file that accompanied this code).
5204 + *
5205 + * You should have received a copy of the GNU Lesser General Public License
5206 + * version 3 along with OpenOffice.org. If not, see
5207 + * <http://www.openoffice.org/license.html>
5208 + * for a copy of the LGPLv3 License.
5209 + *
5210 + ************************************************************************/
5211 +
5212 +#ifndef LAYOUT_CORE_FACTORY_HXX
5213 +#define LAYOUT_CORE_FACTORY_HXX
5214 +
5215 +#include <com/sun/star/lang/XSingleServiceFactory.hpp>
5216 +#include <com/sun/star/lang/XServiceInfo.hpp>
5217 +#include <cppuhelper/implbase2.hxx>
5218 +#include <toolkit/dllapi.h>
5219 +
5220 +namespace layoutimpl
5221 +{
5222 +class Layout;
5223 +}
5224 +
5225 +class TOOLKIT_DLLPUBLIC LayoutFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
5226 + ::com::sun::star::lang::XServiceInfo >
5227 +{
5228 + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
5229 +
5230 +public:
5231 + LayoutFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
5232 + : m_xFactory( xFactory )
5233 + {
5234 + OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" );
5235 + }
5236 +
5237 + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
5238 + impl_staticGetSupportedServiceNames();
5239 +
5240 + static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
5241 +
5242 + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
5243 + impl_staticCreateSelfInstance(
5244 + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
5245 +
5246 +
5247 + // XSingleServiceFactory
5248 + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
5249 + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
5250 +
5251 + // XServiceInfo
5252 + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
5253 + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
5254 + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
5255 +
5256 +};
5257 +
5258 +#endif /* LAYOUT_CORE_FACTORY_HXX */
5259 --- toolkit/source/layout/core/flow.cxx.old 1970-01-01 00:00:00.000000000 +0000
5260 +++ toolkit/source/layout/core/flow.cxx 2009-04-06 16:42:13.000000000 +0000
5261 @@ -0,0 +1,207 @@
5262 +/*************************************************************************
5263 + *
5264 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5265 + *
5266 + * Copyright 2008 by Sun Microsystems, Inc.
5267 + *
5268 + * OpenOffice.org - a multi-platform office productivity suite
5269 + *
5270 + * $RCSfile$
5271 + *
5272 + * $Revision$
5273 + *
5274 + * This file is part of OpenOffice.org.
5275 + *
5276 + * OpenOffice.org is free software: you can redistribute it and/or modify
5277 + * it under the terms of the GNU Lesser General Public License version 3
5278 + * only, as published by the Free Software Foundation.
5279 + *
5280 + * OpenOffice.org is distributed in the hope that it will be useful,
5281 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5282 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5283 + * GNU Lesser General Public License version 3 for more details
5284 + * (a copy is included in the LICENSE file that accompanied this code).
5285 + *
5286 + * You should have received a copy of the GNU Lesser General Public License
5287 + * version 3 along with OpenOffice.org. If not, see
5288 + * <http://www.openoffice.org/license.html>
5289 + * for a copy of the LGPLv3 License.
5290 + *
5291 + ************************************************************************/
5292 +
5293 +#include "flow.hxx"
5294 +
5295 +#include <sal/macros.h>
5296 +
5297 +namespace layoutimpl
5298 +{
5299 +
5300 +using namespace css;
5301 +
5302 +bool Flow::ChildData::isVisible()
5303 +{
5304 + return xChild.is();
5305 +}
5306 +
5307 +Flow::Flow()
5308 + : Container()
5309 + , mnSpacing( 0 )
5310 + , mbHomogeneous( false )
5311 +{
5312 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ),
5313 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
5314 + &mbHomogeneous );
5315 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Spacing" ),
5316 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
5317 + &mnSpacing );
5318 +}
5319 +
5320 +void SAL_CALL
5321 +Flow::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
5322 + throw (uno::RuntimeException, css::awt::MaxChildrenException)
5323 +{
5324 + if ( xChild.is() )
5325 + {
5326 + ChildData *pData = new ChildData();
5327 + pData->xChild = xChild;
5328 + maChildren.push_back( pData );
5329 +
5330 + setChildParent( xChild );
5331 + queueResize();
5332 + }
5333 +}
5334 +
5335 +void SAL_CALL
5336 +Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild )
5337 + throw (css::uno::RuntimeException)
5338 +{
5339 + for ( std::list< ChildData * >::iterator it = maChildren.begin();
5340 + it != maChildren.end(); it++ )
5341 + {
5342 + if ( (*it)->xChild == xChild )
5343 + {
5344 + delete *it;
5345 + maChildren.erase( it );
5346 +
5347 + unsetChildParent( xChild );
5348 + queueResize();
5349 + break;
5350 + }
5351 + }
5352 +}
5353 +
5354 +css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > SAL_CALL
5355 +Flow::getChildren()
5356 + throw (css::uno::RuntimeException)
5357 +{
5358 + uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
5359 + unsigned int i = 0;
5360 + for ( std::list< ChildData * >::iterator it = maChildren.begin();
5361 + it != maChildren.end(); it++, i++ )
5362 + children[i] = (*it)->xChild;
5363 +
5364 + return children;
5365 +}
5366 +
5367 +uno::Reference< beans::XPropertySet > SAL_CALL
5368 +Flow::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& /*xChild*/ )
5369 + throw (uno::RuntimeException)
5370 +{
5371 + return uno::Reference< beans::XPropertySet >();
5372 +}
5373 +
5374 +css::awt::Size
5375 +Flow::calculateSize( long nMaxWidth )
5376 +{
5377 + long nNeedHeight = 0;
5378 +
5379 + std::list<ChildData *>::const_iterator it;
5380 + mnEachWidth = 0;
5381 + // first pass, for homogeneous property
5382 + for (it = maChildren.begin(); it != maChildren.end(); it++)
5383 + {
5384 + if ( !(*it)->isVisible() )
5385 + continue;
5386 + (*it)->aRequisition = (*it)->xChild->getMinimumSize();
5387 + if ( mbHomogeneous )
5388 + mnEachWidth = SAL_MAX( mnEachWidth, (*it)->aRequisition.Width );
5389 + }
5390 +
5391 + long nRowWidth = 0, nRowHeight = 0;
5392 + for (it = maChildren.begin(); it != maChildren.end(); it++)
5393 + {
5394 + if ( !(*it)->isVisible() )
5395 + continue;
5396 +
5397 + awt::Size aChildSize = (*it)->aRequisition;
5398 + if ( mbHomogeneous )
5399 + aChildSize.Width = mnEachWidth;
5400 +
5401 + if ( nMaxWidth && nRowWidth > 0 && nRowWidth + aChildSize.Width > nMaxWidth )
5402 + {
5403 + nRowWidth = 0;
5404 + nNeedHeight += nRowHeight;
5405 + nRowHeight = 0;
5406 + }
5407 + nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
5408 + nRowWidth += aChildSize.Width;
5409 + }
5410 + nNeedHeight += nRowHeight;
5411 +
5412 + return awt::Size( nRowWidth, nNeedHeight );
5413 +}
5414 +
5415 +awt::Size SAL_CALL
5416 +Flow::getMinimumSize() throw(uno::RuntimeException)
5417 +{
5418 + return maRequisition = calculateSize( 0 );
5419 +}
5420 +
5421 +sal_Bool SAL_CALL
5422 +Flow::hasHeightForWidth()
5423 + throw(css::uno::RuntimeException)
5424 +{
5425 + return true;
5426 +}
5427 +
5428 +sal_Int32 SAL_CALL
5429 +Flow::getHeightForWidth( sal_Int32 nWidth )
5430 + throw(css::uno::RuntimeException)
5431 +{
5432 + return calculateSize( nWidth ).Height;
5433 +}
5434 +
5435 +void SAL_CALL
5436 +Flow::allocateArea( const css::awt::Rectangle &rArea )
5437 + throw (css::uno::RuntimeException)
5438 +{
5439 + maAllocation = rArea;
5440 +
5441 + std::list<ChildData *>::const_iterator it;
5442 + long nX = 0, nY = 0, nRowHeight = 0;
5443 + for (it = maChildren.begin(); it != maChildren.end(); it++)
5444 + {
5445 + ChildData *child = *it;
5446 + if ( !child->isVisible() )
5447 + continue;
5448 +
5449 + awt::Size aChildSize( child->aRequisition );
5450 + if ( mbHomogeneous )
5451 + aChildSize.Width = mnEachWidth;
5452 +
5453 + if ( nX > 0 && nX + aChildSize.Width > rArea.Width )
5454 + {
5455 + nX = 0;
5456 + nY += nRowHeight;
5457 + nRowHeight = 0;
5458 + }
5459 + nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
5460 +
5461 + allocateChildAt( child->xChild,
5462 + awt::Rectangle( rArea.X + nX, rArea.Y + nY, aChildSize.Width, aChildSize.Height ) );
5463 +
5464 + nX += aChildSize.Width;
5465 + }
5466 +}
5467 +
5468 +} // namespace layoutimpl
5469 --- toolkit/source/layout/core/flow.hxx.old 1970-01-01 00:00:00.000000000 +0000
5470 +++ toolkit/source/layout/core/flow.hxx 2009-04-06 16:42:13.000000000 +0000
5471 @@ -0,0 +1,99 @@
5472 +/*************************************************************************
5473 + *
5474 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5475 + *
5476 + * Copyright 2008 by Sun Microsystems, Inc.
5477 + *
5478 + * OpenOffice.org - a multi-platform office productivity suite
5479 + *
5480 + * $RCSfile$
5481 + *
5482 + * $Revision$
5483 + *
5484 + * This file is part of OpenOffice.org.
5485 + *
5486 + * OpenOffice.org is free software: you can redistribute it and/or modify
5487 + * it under the terms of the GNU Lesser General Public License version 3
5488 + * only, as published by the Free Software Foundation.
5489 + *
5490 + * OpenOffice.org is distributed in the hope that it will be useful,
5491 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5492 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5493 + * GNU Lesser General Public License version 3 for more details
5494 + * (a copy is included in the LICENSE file that accompanied this code).
5495 + *
5496 + * You should have received a copy of the GNU Lesser General Public License
5497 + * version 3 along with OpenOffice.org. If not, see
5498 + * <http://www.openoffice.org/license.html>
5499 + * for a copy of the LGPLv3 License.
5500 + *
5501 + ************************************************************************/
5502 +
5503 +#ifndef LAYOUT_CORE_FLOW_HXX
5504 +#define LAYOUT_CORE_FLOW_HXX
5505 +
5506 +#include <layout/core/container.hxx>
5507 +
5508 +#include <list>
5509 +
5510 +namespace layoutimpl
5511 +{
5512 +
5513 +class Flow : public Container
5514 +{
5515 +protected:
5516 + // Box properties (i.e. affect all children)
5517 + sal_Int32 mnSpacing;
5518 + sal_Bool mbHomogeneous;
5519 +
5520 +public:
5521 + // Children properties
5522 + struct ChildData
5523 + {
5524 + css::awt::Size aRequisition;
5525 + css::uno::Reference< css::awt::XLayoutConstrains > xChild;
5526 + css::uno::Reference< css::beans::XPropertySet > xProps;
5527 + bool isVisible();
5528 + };
5529 +
5530 +protected:
5531 + std::list< ChildData * > maChildren;
5532 + long mnEachWidth; // on homogeneous, the width of every child
5533 +
5534 +public:
5535 + Flow();
5536 +
5537 + // css::awt::XLayoutContainer
5538 + virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
5539 + throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
5540 + virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
5541 + throw (css::uno::RuntimeException);
5542 +
5543 + virtual css::uno::Sequence< css::uno::Reference
5544 + < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
5545 + throw (css::uno::RuntimeException);
5546 +
5547 + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
5548 + const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
5549 + throw (css::uno::RuntimeException);
5550 +
5551 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
5552 + throw (css::uno::RuntimeException);
5553 +
5554 + virtual css::awt::Size SAL_CALL getMinimumSize()
5555 + throw(css::uno::RuntimeException);
5556 + virtual sal_Bool SAL_CALL hasHeightForWidth()
5557 + throw(css::uno::RuntimeException);
5558 + virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
5559 + throw(css::uno::RuntimeException);
5560 +
5561 +PROPHELPER_SET_INFO
5562 +
5563 +private:
5564 + // shared between getMinimumSize() and getHeightForWidth()
5565 + css::awt::Size calculateSize( long nMaxWidth );
5566 +};
5567 +
5568 +} // namespace layoutimpl
5569 +
5570 +#endif /* LAYOUT_FLOW_CORE_HXX */
5571 --- toolkit/source/layout/core/helper.cxx.old 1970-01-01 00:00:00.000000000 +0000
5572 +++ toolkit/source/layout/core/helper.cxx 2009-04-06 16:42:13.000000000 +0000
5573 @@ -0,0 +1,662 @@
5574 +/*************************************************************************
5575 + *
5576 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5577 + *
5578 + * Copyright 2008 by Sun Microsystems, Inc.
5579 + *
5580 + * OpenOffice.org - a multi-platform office productivity suite
5581 + *
5582 + * $RCSfile$
5583 + *
5584 + * $Revision$
5585 + *
5586 + * This file is part of OpenOffice.org.
5587 + *
5588 + * OpenOffice.org is free software: you can redistribute it and/or modify
5589 + * it under the terms of the GNU Lesser General Public License version 3
5590 + * only, as published by the Free Software Foundation.
5591 + *
5592 + * OpenOffice.org is distributed in the hope that it will be useful,
5593 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
5594 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5595 + * GNU Lesser General Public License version 3 for more details
5596 + * (a copy is included in the LICENSE file that accompanied this code).
5597 + *
5598 + * You should have received a copy of the GNU Lesser General Public License
5599 + * version 3 along with OpenOffice.org. If not, see
5600 + * <http://www.openoffice.org/license.html>
5601 + * for a copy of the LGPLv3 License.
5602 + *
5603 + ************************************************************************/
5604 +
5605 +#include "helper.hxx"
5606 +
5607 +#include <assert.h>
5608 +#include <list>
5609 +#include <com/sun/star/awt/WindowAttribute.hpp>
5610 +#include <com/sun/star/awt/XWindow.hpp>
5611 +#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
5612 +#include <toolkit/awt/vclxwindow.hxx>
5613 +#include <tools/debug.hxx>
5614 +
5615 +#include "proplist.hxx"
5616 +
5617 +#if TEST_LAYOUT && !defined( DBG_UTIL )
5618 +#include <cstdio>
5619 +#undef DBG_ERROR
5620 +#define DBG_ERROR printf
5621 +#undef DBG_ERROR1
5622 +#define DBG_ERROR1 printf
5623 +#undef DBG_ERROR2
5624 +#define DBG_ERROR2 printf
5625 +#endif /* TEST_LAYOUT && !DBG_UTIL */
5626 +
5627 +namespace layoutimpl
5628 +{
5629 +using namespace com::sun::star;
5630 +using rtl::OUString;
5631 +
5632 +uno::Reference< awt::XWindowPeer >
5633 +getParent( uno::Reference< uno::XInterface > xRef )
5634 +{
5635 + do
5636 + {
5637 + uno::Reference< awt::XWindowPeer > xPeer( xRef, uno::UNO_QUERY );
5638 + if ( xPeer.is() )
5639 + return xPeer;
5640 +
5641 + uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
5642 + if ( xCont.is() )
5643 + xRef = xCont->getParent();
5644 + }
5645 + while ( xRef.is() );
5646 +
5647 + return uno::Reference< awt::XWindowPeer >();
5648 +}
5649 +
5650 +#if 0
5651 +static uno::Reference< awt::XWindowPeer >
5652 +getToplevel( uno::Reference< uno::XInterface > xRef )
5653 +{
5654 + uno::Reference< awt::XWindowPeer > xTop, i;
5655 + while ( ( i = uno::Reference< awt::XWindowPeer >( xRef, uno::UNO_QUERY ) ).is() )
5656 + {
5657 + xTop = i;
5658 +
5659 + uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
5660 + if ( xCont.is() )
5661 + xRef = xCont->getParent();
5662 + else
5663 + xRef = uno::Reference< awt::XWindowPeer >();
5664 + }
5665 +
5666 + return xTop;
5667 +}
5668 +#endif
5669 +
5670 +}
5671 +
5672 +#include "bin.hxx"
5673 +#include "box.hxx"
5674 +#include "dialogbuttonhbox.hxx"
5675 +#include "flow.hxx"
5676 +#include "localized-string.hxx"
5677 +#include "table.hxx"
5678 +
5679 +namespace layoutimpl
5680 +{
5681 +
5682 +oslModule WidgetFactory::mSfx2Library = 0;
5683 +WindowCreator WidgetFactory::mSfx2CreateWidget = 0;
5684 +
5685 +uno::Reference <awt::XLayoutContainer> WidgetFactory::createContainer (OUString const& name)
5686 +{
5687 + uno::Reference< awt::XLayoutContainer > xPeer;
5688 +
5689 + if ( name.equalsAscii( "hbox" ) )
5690 + xPeer = uno::Reference< awt::XLayoutContainer >( new HBox() );
5691 + else if ( name.equalsAscii( "vbox" ) )
5692 + xPeer = uno::Reference< awt::XLayoutContainer >( new VBox() );
5693 + else if ( name.equalsAscii( "table" ) )
5694 + xPeer = uno::Reference< awt::XLayoutContainer >( new Table() );
5695 + else if ( name.equalsAscii( "flow" ) )
5696 + xPeer = uno::Reference< awt::XLayoutContainer >( new Flow() );
5697 + else if ( name.equalsAscii( "bin" ) )
5698 + xPeer = uno::Reference< awt::XLayoutContainer >( new Bin() );
5699 + else if ( name.equalsAscii( "min-size" ) )
5700 + xPeer = uno::Reference< awt::XLayoutContainer >( new MinSize() );
5701 + else if ( name.equalsAscii( "align" ) )
5702 + xPeer = uno::Reference< awt::XLayoutContainer >( new Align() );
5703 + else if ( name.equalsAscii( "dialogbuttonhbox" ) )
5704 + xPeer = uno::Reference< awt::XLayoutContainer >( new DialogButtonHBox() );
5705 +
5706 + return xPeer;
5707 +}
5708 +
5709 +uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno::Reference <awt::XToolkit> xToolkit, uno::Reference <uno::XInterface> xParent, OUString const& name, long properties)
5710 +{
5711 + uno::Reference< awt::XLayoutConstrains > xPeer;
5712 + bool bToplevel = !xParent.is();
5713 +
5714 + // UNO Control Widget
5715 + awt::WindowDescriptor desc;
5716 + if ( bToplevel )
5717 + desc.Type = awt::WindowClass_TOP;
5718 + else
5719 + {
5720 + desc.Type = awt::WindowClass_SIMPLE;
5721 +
5722 +#if 0
5723 + // top container -- a wrapper for framewindow -- is de-coupled
5724 + // from awt::XWindowPeer. So, getParent() fails at it.
5725 + uno::Reference< awt::XWindowPeer > xWinParent = getParent( xParent );
5726 +#else
5727 + uno::Reference< awt::XWindowPeer > xWinParent( xParent, uno::UNO_QUERY );
5728 +#endif
5729 + assert( xParent.is() );
5730 + assert( xWinParent.is() );
5731 + /*
5732 + With the new three layer instarr/rpath feature, when
5733 + prepending toolkit/unxlngx6.pro/lib or $SOLARVER/lib to
5734 + LD_LIBRARY_PATH, VCLXWindow::GetImplementation returns 0x0
5735 + vclxtoolkit::ImplCreateWindow failing to create any widget;
5736 + although it succeeds here.
5737 +
5738 + While developing, one now must copy libtlx.so to
5739 + $OOO_INSTALL_PREFIX/openoffice.org/basis3.0/program/libtklx.so
5740 + each time.
5741 + */
5742 + VCLXWindow* parentComponent = VCLXWindow::GetImplementation( xWinParent );
5743 + if ( !parentComponent )
5744 + throw uno::RuntimeException(
5745 + OUString::createFromAscii( "parent has no implementation" ),
5746 + uno::Reference< uno::XInterface >() );
5747 + desc.Parent = xWinParent;
5748 + }
5749 +
5750 + desc.ParentIndex = 0;
5751 + // debugging help ...
5752 + desc.Bounds.X = 0;
5753 + desc.Bounds.Y = 0;
5754 + desc.Bounds.Width = 300;
5755 + desc.Bounds.Height = 200;
5756 +
5757 + desc.WindowAttributes = properties;
5758 + desc.WindowServiceName = name;
5759 +
5760 + uno::Reference< awt::XWindowPeer > xWinPeer;
5761 + try
5762 + {
5763 + OSL_TRACE("Asking toolkit: %s", OUSTRING_CSTR( desc.WindowServiceName ) );
5764 + xWinPeer = xToolkit->createWindow( desc );
5765 + if ( !xWinPeer.is() )
5766 + throw uno::RuntimeException(
5767 + OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot create peer" ) ),
5768 + uno::Reference< uno::XInterface >() );
5769 + xPeer = uno::Reference< awt::XLayoutConstrains >( xWinPeer, uno::UNO_QUERY );
5770 + }
5771 + catch( uno::Exception & )
5772 + {
5773 + DBG_ERROR1( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( name ) );
5774 + return uno::Reference< awt::XLayoutConstrains >();
5775 + }
5776 +
5777 +#if 0 // This shadows the show="false" property and seems otherwise
5778 + // unnecessary
5779 +
5780 + // default to visible, let then people change it on properties
5781 + if ( ! bToplevel )
5782 + {
5783 + uno::Reference< awt::XWindow> xWindow( xPeer, uno::UNO_QUERY );
5784 + if ( xWindow.is() )
5785 + xWindow->setVisible( true );
5786 + }
5787 +#endif
5788 +
5789 + return xPeer;
5790 +}
5791 +
5792 +uno::Reference< awt::XLayoutConstrains >
5793 +WidgetFactory::createWidget (uno::Reference< awt::XToolkit > xToolkit, uno::Reference< uno::XInterface > xParent, OUString const& name, long properties)
5794 +{
5795 + uno::Reference< awt::XLayoutConstrains > xPeer;
5796 +
5797 + xPeer = uno::Reference <awt::XLayoutConstrains> (createContainer (name), uno::UNO_QUERY);
5798 + if ( xPeer.is() )
5799 + return xPeer;
5800 +
5801 + xPeer = implCreateWidget (xParent, name, properties);
5802 + if (xPeer.is ())
5803 + return xPeer;
5804 +
5805 +#define FIXED_INFO 1
5806 +#if FIXED_INFO
5807 + OUString tName = name;
5808 + // FIXME
5809 + if ( name.equalsAscii( "fixedinfo" ) )
5810 + tName = OUString::createFromAscii( "fixedtext" );
5811 + xPeer = toolkitCreateWidget (xToolkit, xParent, tName, properties);
5812 +#else
5813 + xPeer = toolkitCreateWidget (xToolkit, xParent, name, properties);
5814 +#endif
5815 +
5816 + return xPeer;
5817 +}
5818 +
5819 +PropHelper::PropHelper() : LockHelper()
5820 + , cppu::OPropertySetHelper( maBrdcstHelper )
5821 + , pHelper( NULL )
5822 +{
5823 +}
5824 +
5825 +void
5826 +PropHelper::addProp (const char *pName, sal_Int32 nNameLen, rtl_TextEncoding e,
5827 + uno::Type aType, void *pPtr)
5828 +{
5829 + // this sucks rocks for effiency ...
5830 + PropDetails aDetails;
5831 + aDetails.aName = rtl::OUString::intern( pName, nNameLen, e );
5832 + aDetails.aType = aType;
5833 + aDetails.pValue = pPtr;
5834 + maDetails.push_back( aDetails );
5835 +}
5836 +
5837 +cppu::IPropertyArrayHelper & SAL_CALL
5838 +PropHelper::getInfoHelper()
5839 +{
5840 + if ( ! pHelper )
5841 + {
5842 + uno::Sequence< beans::Property > aProps( maDetails.size() );
5843 + for ( unsigned int i = 0; i < maDetails.size(); i++)
5844 + {
5845 + aProps[i].Name = maDetails[i].aName;
5846 + aProps[i].Type = maDetails[i].aType;
5847 + aProps[i].Handle = i;
5848 + aProps[i].Attributes = 0;
5849 + }
5850 + pHelper = new cppu::OPropertyArrayHelper( aProps, false /* fixme: faster ? */ );
5851 +
5852 + }
5853 + return *pHelper;
5854 +}
5855 +
5856 +sal_Bool SAL_CALL
5857 +PropHelper::convertFastPropertyValue(
5858 + uno::Any & rConvertedValue,
5859 + uno::Any & rOldValue,
5860 + sal_Int32 nHandle,
5861 + const uno::Any& rValue )
5862 + throw (lang::IllegalArgumentException)
5863 +{
5864 + OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
5865 +
5866 + // FIXME: no Any::getValue ...
5867 + getFastPropertyValue( rOldValue, nHandle );
5868 + if ( rOldValue != rValue )
5869 + {
5870 + rConvertedValue = rValue;
5871 + return sal_True; // changed
5872 + }
5873 + else
5874 + {
5875 + rConvertedValue.clear();
5876 + rOldValue.clear();
5877 + }
5878 + return sal_False;
5879 +}
5880 +
5881 +
5882 +void SAL_CALL
5883 +PropHelper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
5884 + const uno::Any& rValue )
5885 + throw (uno::Exception)
5886 +{
5887 + OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
5888 +
5889 + const PropDetails &rInfo = maDetails[ nHandle ];
5890 +
5891 + uno_type_assignData( rInfo.pValue, rInfo.aType.getTypeLibType(),
5892 + rValue.pData, rValue.pType,
5893 + 0, 0, 0 );
5894 +
5895 + if ( mpListener )
5896 + mpListener->propertiesChanged();
5897 +}
5898 +
5899 +void SAL_CALL
5900 +PropHelper::getFastPropertyValue( uno::Any& rValue,
5901 + sal_Int32 nHandle ) const
5902 +{
5903 + OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
5904 + const PropDetails &rInfo = maDetails[ nHandle ];
5905 +#if 0
5906 + switch ( rInfo.aType.getTypeClass() )
5907 + {
5908 +#define MAP(classtype,ctype) \
5909 + case uno::TypeClass_##classtype: \
5910 + rValue <<= *(ctype *)(rInfo.pValue); \
5911 + break
5912 + MAP( DOUBLE, double );
5913 + MAP( SHORT, sal_Int16 );
5914 + MAP( LONG, sal_Int32 );
5915 + MAP( UNSIGNED_SHORT, sal_uInt16 );
5916 + MAP( UNSIGNED_LONG, sal_uInt32 );
5917 + MAP( STRING, ::rtl::OUString );
5918 + default:
5919 + DBG_ERROR( "ERROR: unknown type to map!" );
5920 + break;
5921 + }
5922 +#undef MAP
5923 +#endif
5924 + rValue.setValue( rInfo.pValue, rInfo.aType );
5925 +}
5926 +
5927 +::com::sun::star::uno::Any
5928 +PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
5929 +{
5930 + return OPropertySetHelper::queryInterface( rType );
5931 +}
5932 +
5933 +} // namespace layoutimpl
5934 +
5935 +#include <awt/vclxbutton.hxx>
5936 +#include <awt/vclxdialog.hxx>
5937 +#include <awt/vclxfixedline.hxx>
5938 +#include <awt/vclxplugin.hxx>
5939 +#include <awt/vclxscroller.hxx>
5940 +#include <awt/vclxsplitter.hxx>
5941 +#include <awt/vclxtabcontrol.hxx>
5942 +#include <awt/vclxtabpage.hxx>
5943 +#include <toolkit/awt/vclxtoolkit.hxx>
5944 +#include <toolkit/awt/vclxwindow.hxx>
5945 +#include <vcl/button.hxx>
5946 +#include <vcl/dialog.hxx>
5947 +#include <vcl/fixed.hxx>
5948 +#include <vcl/tabctrl.hxx>
5949 +#include <vcl/tabpage.hxx>
5950 +#include <vcl/unohelp.hxx>
5951 +
5952 +#include <layout/layout.hxx>
5953 +#include <toolkit/awt/vclxwindows.hxx>
5954 +#include <vcl/lstbox.hxx>
5955 +#include <vcl.hxx>
5956 +
5957 +#include <typeinfo>
5958 +
5959 +namespace layoutimpl
5960 +{
5961 +
5962 +uno::Reference <awt::XLayoutConstrains> WidgetFactory::implCreateWidget (uno::Reference <uno::XInterface> xParent, OUString name, long attributes)
5963 +{
5964 + Window* parent = 0;
5965 +
5966 + if (VCLXWindow* parentComponent = VCLXWindow::GetImplementation (xParent))
5967 + parent = parentComponent->GetWindow ();
5968 +
5969 + VCLXWindow* component = 0;
5970 + Window* window = 0; //sfx2CreateWindow (&component, parent, name, attributes);
5971 + if (!window)
5972 + window = layoutCreateWindow (&component, parent, name, attributes);
5973 +
5974 + uno::Reference <awt::XLayoutConstrains> reference;
5975 + if (window)
5976 + {
5977 + window->SetCreatedWithToolkit( sal_True );
5978 + if ( component )
5979 + component->SetCreatedWithToolkit( true );
5980 + reference = component;
5981 + window->SetComponentInterface( component );
5982 + if ( attributes & awt::WindowAttribute::SHOW )
5983 + window->Show();
5984 + }
5985 +
5986 + return reference;
5987 +}
5988 +
5989 +extern "C" { static void SAL_CALL thisModule() {} }
5990 +
5991 +Window* WidgetFactory::sfx2CreateWindow (VCLXWindow** component, Window* parent, OUString const& name, long& attributes)
5992 +{
5993 + OSL_TRACE("Asking sfx2: %s", OUSTRING_CSTR (name));
5994 +
5995 + if (!mSfx2Library)
5996 + {
5997 + OUString libraryName = ::vcl::unohelper::CreateLibraryName ("sfx", TRUE);
5998 + mSfx2Library = osl_loadModuleRelative (&thisModule, libraryName.pData, SAL_LOADMODULE_DEFAULT);
5999 + if (mSfx2Library)
6000 + {
6001 + OUString functionName (RTL_CONSTASCII_USTRINGPARAM ("CreateWindow"));
6002 + mSfx2CreateWidget = (WindowCreator) osl_getFunctionSymbol (mSfx2Library, functionName.pData);
6003 + }
6004 + }
6005 +
6006 + if (mSfx2CreateWidget)
6007 + return mSfx2CreateWidget (component, name, parent, attributes);
6008 +
6009 + return 0;
6010 +}
6011 +
6012 +Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *parent, OUString const& name, long& attributes)
6013 +{
6014 + Window* window = 0;
6015 +
6016 + if (0)
6017 + {
6018 + ;
6019 + }
6020 + if ( name.equalsAscii( "dialog" ) )
6021 + {
6022 + if ( parent == NULL )
6023 + parent = DIALOG_NO_PARENT;
6024 + window = new Dialog( parent, ImplGetWinBits( attributes, 0 ) );
6025 + *component = new layoutimpl::VCLXDialog();
6026 +
6027 + attributes ^= awt::WindowAttribute::SHOW;
6028 + }
6029 + else if ( name.equalsAscii( "modaldialog" ) )
6030 + {
6031 + if ( parent == NULL )
6032 + parent = DIALOG_NO_PARENT;
6033 + window = new ModalDialog( parent, ImplGetWinBits( attributes, 0 ) );
6034 + *component = new layoutimpl::VCLXDialog();
6035 +
6036 + attributes ^= awt::WindowAttribute::SHOW;
6037 + }
6038 + else if ( name.equalsAscii( "modelessdialog" ) )
6039 + {
6040 + if ( parent == NULL )
6041 + parent = DIALOG_NO_PARENT;
6042 + window = new ModelessDialog (parent, ImplGetWinBits (attributes, 0));
6043 + *component = new layoutimpl::VCLXDialog();
6044 +
6045 + attributes ^= awt::WindowAttribute::SHOW;
6046 + }
6047 + else if ( name.equalsAscii( "sfxdialog" ) )
6048 + {
6049 + if ( parent == NULL )
6050 + parent = DIALOG_NO_PARENT;
6051 + window = new ClosingDialog (parent, ImplGetWinBits (attributes, 0));
6052 + *component = new layoutimpl::VCLXDialog();
6053 +
6054 + attributes ^= awt::WindowAttribute::SHOW;
6055 + }
6056 + else if ( name.equalsAscii( "sfxmodaldialog" ) )
6057 + {
6058 + if ( parent == NULL )
6059 + parent = DIALOG_NO_PARENT;
6060 + window = new ClosingModalDialog( parent,
6061 + ImplGetWinBits( attributes, 0 ) );
6062 + *component = new layoutimpl::VCLXDialog();
6063 +
6064 + attributes ^= awt::WindowAttribute::SHOW;
6065 + }
6066 + else if ( name.equalsAscii( "sfxmodelessdialog" ) )
6067 + {
6068 + if ( parent == NULL )
6069 + parent = DIALOG_NO_PARENT;
6070 + window = new ClosingModelessDialog (parent, ImplGetWinBits (attributes, 0));
6071 + *component = new layoutimpl::VCLXDialog();
6072 +
6073 + attributes ^= awt::WindowAttribute::SHOW;
6074 + }
6075 + else if ( name.equalsAscii( "tabcontrol" ) )
6076 + {
6077 + window = new TabControl( parent, ImplGetWinBits( attributes, WINDOW_TABCONTROL ) );
6078 + *component = new layoutimpl::VCLXTabControl();
6079 + }
6080 + else if ( name.equalsAscii( "scroller" ) )
6081 + {
6082 + // used FixedImage because I just want some empty non-intrusive widget
6083 + window = new FixedImage( parent, ImplGetWinBits( attributes, 0 ) );
6084 + *component = new layoutimpl::VCLXScroller();
6085 + }
6086 + else if ( name.equalsAscii( "hsplitter" ) || name.equalsAscii( "vsplitter" ) )
6087 + {
6088 + window = new FixedImage( parent, ImplGetWinBits( attributes, 0 ) );
6089 + *component = new layoutimpl::VCLXSplitter( name.equalsAscii( "hsplitter" ) );
6090 + }
6091 + else if ( name.equalsAscii( "hfixedline" ) || name.equalsAscii( "vfixedline" ) )
6092 + {
6093 + WinBits nStyle = ImplGetWinBits( attributes, 0 );
6094 + nStyle ^= WB_HORZ;
6095 + if ( name.equalsAscii( "hfixedline" ) )
6096 + nStyle |= WB_HORZ;
6097 + else
6098 + nStyle |= WB_VERT;
6099 + window = new FixedLine( parent, nStyle );
6100 + *component = new layoutimpl::VCLXFixedLine();
6101 + }
6102 + else if ( name.equalsAscii( "okbutton" ) )
6103 + {
6104 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6105 + *component = new layoutimpl::VCLXOKButton( window );
6106 + window->SetType (WINDOW_OKBUTTON);
6107 + }
6108 + else if ( name.equalsAscii( "cancelbutton" ) )
6109 + {
6110 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6111 + *component = new layoutimpl::VCLXCancelButton( window );
6112 + window->SetType (WINDOW_CANCELBUTTON);
6113 + }
6114 + else if ( name.equalsAscii( "yesbutton" ) )
6115 + {
6116 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6117 + *component = new layoutimpl::VCLXYesButton( window );
6118 + window->SetType (WINDOW_OKBUTTON);
6119 + }
6120 + else if ( name.equalsAscii( "nobutton" ) )
6121 + {
6122 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6123 + window->SetType (WINDOW_CANCELBUTTON);
6124 + *component = new layoutimpl::VCLXNoButton( window );
6125 + }
6126 + else if ( name.equalsAscii( "retrybutton" ) )
6127 + {
6128 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6129 + *component = new layoutimpl::VCLXRetryButton( window );
6130 + }
6131 + else if ( name.equalsAscii( "ignorebutton" ) )
6132 + {
6133 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6134 + *component = new layoutimpl::VCLXIgnoreButton( window );
6135 + }
6136 + else if ( name.equalsAscii( "resetbutton" ) )
6137 + {
6138 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6139 + *component = new layoutimpl::VCLXResetButton( window );
6140 + }
6141 + else if ( name.equalsAscii( "applybutton" ) )
6142 + {
6143 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6144 + *component = new layoutimpl::VCLXApplyButton( window );
6145 + }
6146 + else if ( name.equalsAscii( "helpbutton" ) )
6147 + {
6148 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6149 + *component = new layoutimpl::VCLXHelpButton( window );
6150 + window->SetType (WINDOW_HELPBUTTON);
6151 + }
6152 + else if ( name.equalsAscii( "morebutton" ) )
6153 + {
6154 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6155 + *component = new layoutimpl::VCLXMoreButton( window );
6156 + window->SetType (WINDOW_MOREBUTTON);
6157 + }
6158 + else if ( name.equalsAscii( "advancedbutton" ) )
6159 + {
6160 + window = new PushButton( parent, ImplGetWinBits( attributes, 0 ) );
6161 + *component = new layoutimpl::VCLXAdvancedButton( window );
6162 + }
6163 + else if ( name.equalsAscii( "plugin" ) )
6164 + {
6165 + window = new Control( parent, ImplGetWinBits( attributes, 0 ) );
6166 + OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, parent, typeid( *parent ).name() );
6167 + *component = new layoutimpl::VCLXPlugin( window, ImplGetWinBits( attributes, 0 ) );
6168 + }
6169 + else if ( name.equalsAscii( "tabpage" ) )
6170 + {
6171 +#if 0
6172 + if ( !parent )
6173 + parent = layout::TabPage::global_parent;
6174 +#else
6175 + if (layout::TabPage::global_parent)
6176 + parent = layout::TabPage::global_parent;
6177 + layout::TabPage::global_parent = 0;
6178 +#endif
6179 + //window = new TabPage( parent, ImplGetWinBits( attributes, 0 ) );
6180 + attributes ^= awt::WindowAttribute::SHOW;
6181 + WinBits nStyle = ImplGetWinBits( attributes, 0 );
6182 + nStyle |= WB_HIDE;
6183 + //nStyle |= WB_NODIALOGCONTROL;
6184 + //nStyle |= WB_DIALOGCONTROL;
6185 + //nStyle = 2147483714L;
6186 + OSL_TRACE( "in bits=%lu", nStyle );
6187 + window = new TabPage( parent, nStyle );
6188 + *component = new VCLXTabPage( window );
6189 + }
6190 + else if ( name.equalsAscii( "string" ) )
6191 + {
6192 + // FIXME: move <string>s.text to simple map<string> in root?
6193 + attributes &= ~awt::WindowAttribute::SHOW;
6194 + window = new Window( parent, ImplGetWinBits( attributes, 0 ) );
6195 + *component = new layoutimpl::LocalizedString();
6196 + }
6197 +#if 0 // parent paranoia
6198 + else if ( name.equalsAscii( "listbox" ) )
6199 + {
6200 + attributes |= awt::VclWindowPeerAttribute::DROPDOWN;
6201 + WinBits nStyle = ImplGetWinBits( attributes, 0 );
6202 + nStyle |= WB_DROPDOWN;
6203 + window = new ListBox( parent, nStyle );
6204 + *component = new VCLXListBox ();
6205 + }
6206 +#endif
6207 + return window;
6208 +}
6209 +
6210 +} // namespace layoutimpl
6211 +
6212 +// Avoid polluting the rest of the code with vcl linkage pieces ...
6213 +
6214 +#include <vcl/imagerepository.hxx>
6215 +#include <vcl/bitmapex.hxx>
6216 +#include <vcl/graph.hxx>
6217 +
6218 +namespace layoutimpl
6219 +{
6220 +
6221 +uno::Reference< graphic::XGraphic > loadGraphic( const char *pName )
6222 +{
6223 + BitmapEx aBmp;
6224 +
6225 + OUString aStr( pName, strlen( pName ), RTL_TEXTENCODING_ASCII_US );
6226 + if ( aStr.compareToAscii( ".uno:" ) == 0 )
6227 + aStr = aStr.copy( 5 ).toAsciiLowerCase();
6228 +
6229 + if ( !vcl::ImageRepository::loadImage( OUString::createFromAscii( pName ), aBmp, true ) )
6230 + return uno::Reference< graphic::XGraphic >();
6231 +
6232 + return Graphic( aBmp ).GetXGraphic();
6233 +}
6234 +
6235 +} // namespace layoutimpl
6236 --- toolkit/source/layout/core/helper.hxx.old 1970-01-01 00:00:00.000000000 +0000
6237 +++ toolkit/source/layout/core/helper.hxx 2009-04-06 16:42:13.000000000 +0000
6238 @@ -0,0 +1,163 @@
6239 +/*************************************************************************
6240 + *
6241 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6242 + *
6243 + * Copyright 2008 by Sun Microsystems, Inc.
6244 + *
6245 + * OpenOffice.org - a multi-platform office productivity suite
6246 + *
6247 + * $RCSfile$
6248 + *
6249 + * $Revision$
6250 + *
6251 + * This file is part of OpenOffice.org.
6252 + *
6253 + * OpenOffice.org is free software: you can redistribute it and/or modify
6254 + * it under the terms of the GNU Lesser General Public License version 3
6255 + * only, as published by the Free Software Foundation.
6256 + *
6257 + * OpenOffice.org is distributed in the hope that it will be useful,
6258 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
6259 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6260 + * GNU Lesser General Public License version 3 for more details
6261 + * (a copy is included in the LICENSE file that accompanied this code).
6262 + *
6263 + * You should have received a copy of the GNU Lesser General Public License
6264 + * version 3 along with OpenOffice.org. If not, see
6265 + * <http://www.openoffice.org/license.html>
6266 + * for a copy of the LGPLv3 License.
6267 + *
6268 + ************************************************************************/
6269 +
6270 +#ifndef LAYOUT_CORE_HELPER_HXX
6271 +#define LAYOUT_CORE_HELPER_HXX
6272 +
6273 +#include <toolkit/dllapi.h>
6274 +#include <vector>
6275 +
6276 +#include <com/sun/star/awt/XLayoutConstrains.hpp>
6277 +#include <com/sun/star/awt/XLayoutContainer.hpp>
6278 +#include <com/sun/star/awt/XVclWindowPeer.hpp>
6279 +#include <com/sun/star/xml/input/XRoot.hpp>
6280 +#include <com/sun/star/graphic/XGraphic.hpp>
6281 +#include <cppuhelper/implbase1.hxx>
6282 +#include <cppuhelper/propshlp.hxx>
6283 +#include <osl/module.h>
6284 +#include <rtl/ustring.hxx>
6285 +
6286 +class Window;
6287 +class VCLXWindow;
6288 +extern "C"
6289 +{
6290 + typedef Window* (SAL_CALL *WindowCreator) (VCLXWindow** component, rtl::OUString const& name, Window* parent, long& attributes);
6291 +}
6292 +
6293 +namespace layoutimpl
6294 +{
6295 +
6296 +namespace css = ::com::sun::star;
6297 +
6298 +/* ChildProps -- a helper to set child properties for the XLayoutContainer interface. */
6299 +
6300 +class LockHelper
6301 +{
6302 +public:
6303 + osl::Mutex maGuard;
6304 + cppu::OBroadcastHelper maBrdcstHelper;
6305 + LockHelper() : maBrdcstHelper( maGuard )
6306 + {
6307 + }
6308 +};
6309 +
6310 +class PropHelper : public LockHelper
6311 + , public cppu::OPropertySetHelper
6312 + , public cppu::OWeakObject
6313 +{
6314 + cppu::OPropertyArrayHelper *pHelper;
6315 +
6316 + struct PropDetails
6317 + {
6318 + rtl::OUString aName;
6319 + css::uno::Type aType;
6320 + void *pValue;
6321 + };
6322 + std::vector< PropDetails > maDetails;
6323 +
6324 +protected:
6325 + void addProp( char const *pName, sal_Int32 nNameLen, rtl_TextEncoding e,
6326 + css::uno::Type aType, void *pPtr );
6327 +
6328 +public:
6329 + PropHelper();
6330 +
6331 + // com::sun::star::uno::XInterface
6332 + void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
6333 + void SAL_CALL release() throw() { OWeakObject::release(); }
6334 + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
6335 +
6336 + // cppu::OPropertySetHelper
6337 + virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
6338 + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any &,
6339 + css::uno::Any &, sal_Int32 nHandle, const css::uno::Any & )
6340 + throw(css::lang::IllegalArgumentException);
6341 + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
6342 + const css::uno::Any& rValue ) throw (css::uno::Exception);
6343 + using OPropertySetHelper::getFastPropertyValue;
6344 + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue,
6345 + sal_Int32 nHandle ) const;
6346 +
6347 + // you -must- use this macro in sub-classes that define new properties.
6348 + // NB. 'static' ...
6349 + // com::sun::star::beans::XMultiPropertySet
6350 +#define PROPHELPER_SET_INFO \
6351 + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL \
6352 + getPropertySetInfo() throw(css::uno::RuntimeException) \
6353 + { \
6354 + static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( \
6355 + createPropertySetInfo( getInfoHelper() ) ); \
6356 + return xInfo; \
6357 + }
6358 + PROPHELPER_SET_INFO
6359 +
6360 + struct Listener
6361 + {
6362 + virtual void propertiesChanged() = 0;
6363 + };
6364 + void setChangeListener( Listener *pListener )
6365 + {
6366 + mpListener = pListener;
6367 + }
6368 +
6369 +protected:
6370 + Listener *mpListener;
6371 +};
6372 +
6373 +css::uno::Any anyFromString (const rtl::OUString &value, const css::uno::Type &type);
6374 +
6375 +// The native widgets wrapper hierarchy may not reflect that of the layout
6376 +// hierarchy as some containers don't have an associated native widget.
6377 +// Use this function to get the native parent of the given peer.
6378 +css::uno::Reference< css::awt::XWindowPeer >
6379 +getParent( css::uno::Reference< css::uno::XInterface > xPeer );
6380 +
6381 +class TOOLKIT_DLLPUBLIC WidgetFactory
6382 +{
6383 +public:
6384 + static oslModule mSfx2Library;
6385 + static WindowCreator mSfx2CreateWidget;
6386 +
6387 + // Should use UNO services in due course
6388 + static css::uno::Reference <css::awt::XLayoutConstrains> toolkitCreateWidget (css::uno::Reference <css::awt::XToolkit> xToolkit, css::uno::Reference <css::uno::XInterface> xParent, rtl::OUString const& name, long properties);
6389 + static css::uno::Reference< css::awt::XLayoutConstrains > createWidget( css::uno::Reference <css::awt::XToolkit > xToolkit, css::uno::Reference< css::uno::XInterface > xParent, rtl::OUString const &name, long properties);
6390 + static css::uno::Reference <css::awt::XLayoutContainer> createContainer (rtl::OUString const& name);
6391 + static css::uno::Reference <css::awt::XLayoutConstrains> implCreateWidget (css::uno::Reference <css::uno::XInterface> xParent, rtl::OUString name, long attributes);
6392 + static Window* sfx2CreateWindow (VCLXWindow** component, Window* parent, rtl::OUString const& name, long& attributes);
6393 + static Window* layoutCreateWindow (VCLXWindow** component, Window *parent, rtl::OUString const& name, long& attributes);
6394 +};
6395 +
6396 +
6397 +css::uno::Reference< css::graphic::XGraphic > loadGraphic( const char *pName );
6398 +
6399 +} // end namespace layoutimpl
6400 +
6401 +#endif /* LAYOUT_CORE_HELPER_HXX */
6402 --- toolkit/source/layout/core/import.cxx.old 1970-01-01 00:00:00.000000000 +0000
6403 +++ toolkit/source/layout/core/import.cxx 2009-04-06 16:42:13.000000000 +0000
6404 @@ -0,0 +1,340 @@
6405 +/*************************************************************************
6406 + *
6407 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6408 + *
6409 + * Copyright 2008 by Sun Microsystems, Inc.
6410 + *
6411 + * OpenOffice.org - a multi-platform office productivity suite
6412 + *
6413 + * $RCSfile$
6414 + *
6415 + * $Revision$
6416 + *
6417 + * This file is part of OpenOffice.org.
6418 + *
6419 + * OpenOffice.org is free software: you can redistribute it and/or modify
6420 + * it under the terms of the GNU Lesser General Public License version 3
6421 + * only, as published by the Free Software Foundation.
6422 + *
6423 + * OpenOffice.org is distributed in the hope that it will be useful,
6424 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
6425 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6426 + * GNU Lesser General Public License version 3 for more details
6427 + * (a copy is included in the LICENSE file that accompanied this code).
6428 + *
6429 + * You should have received a copy of the GNU Lesser General Public License
6430 + * version 3 along with OpenOffice.org. If not, see
6431 + * <http://www.openoffice.org/license.html>
6432 + * for a copy of the LGPLv3 License.
6433 + *
6434 + ************************************************************************/
6435 +
6436 +#include "import.hxx"
6437 +
6438 +#include <com/sun/star/awt/XButton.hpp>
6439 +#include <com/sun/star/awt/XDialog2.hpp>
6440 +#include <vcl/image.hxx>
6441 +#include <tools/debug.hxx>
6442 +#include <layout/layout.hxx>
6443 +
6444 +#include "root.hxx"
6445 +#include "helper.hxx"
6446 +#include "dialogbuttonhbox.hxx"
6447 +
6448 +
6449 +#define XMLNS_LAYOUT_URI "http://openoffice.org/2007/layout"
6450 +#define XMLNS_CONTAINER_URI "http://openoffice.org/2007/layout/container"
6451 +
6452 +namespace layoutimpl
6453 +{
6454 +using namespace css;
6455 +
6456 +using ::rtl::OUString;
6457 +
6458 +ElementBase::~ElementBase()
6459 +SAL_THROW( () )
6460 +{
6461 + //delete mpImport;
6462 + //mpImport = 0;
6463 +}
6464 +
6465 +//** parser
6466 +WidgetElement::WidgetElement ( sal_Int32 nUid, const OUString &rName,
6467 + uno::Reference <xml::input::XAttributes> const &attributes,
6468 + ElementBase *pParent,
6469 + ImportContext *pImport)
6470 +SAL_THROW (())
6471 +: ElementBase( nUid, rName, attributes, pParent, pImport )
6472 +{
6473 + OUString name = rName.toAsciiLowerCase();
6474 +
6475 + PropList aProps;
6476 + propsFromAttributes( attributes, aProps, pImport->XMLNS_LAYOUT_UID );
6477 +
6478 + OUString aId;
6479 + findAndRemove( "id", aProps, aId );
6480 + OUString aLang;
6481 + findAndRemove( "xml-lang", aProps, aLang );
6482 +
6483 + {
6484 +//DEBUG
6485 + uno::Reference< awt::XLayoutConstrains > xParent;
6486 + if ( pParent )
6487 + xParent = ((WidgetElement *) pParent)->mpWidget->getPeer();
6488 +
6489 +
6490 + mpWidget = pImport->mrRoot.create( aId, name,
6491 + getAttributeProps( aProps ), uno::Reference< awt::XLayoutContainer >( xParent, uno::UNO_QUERY ) );
6492 +
6493 + }
6494 +
6495 + // TODO: handle with non-existing widgets
6496 +
6497 + mpWidget->setProperties( aProps );
6498 +
6499 + uno::Reference< awt::XDialog2 > xDialog( mpWidget->getPeer(), uno::UNO_QUERY );
6500 + if ( xDialog.is() )
6501 + {
6502 + OUString aTitle;
6503 + if ( findAndRemove( "title", aProps, aTitle ) )
6504 + {
6505 + OSL_TRACE("Setting title: %s", OUSTRING_CSTR( aTitle ) );
6506 + xDialog->setTitle( aTitle );
6507 + }
6508 + OUString aHelpId;
6509 + if ( findAndRemove( "help-id", aProps, aHelpId ) )
6510 + {
6511 + OSL_TRACE("Setting help-id: %s", OUSTRING_CSTR( aHelpId ) );
6512 + xDialog->setHelpId( aHelpId.toInt32 () );
6513 + }
6514 + } // DEBUG:
6515 + else if ( pParent == NULL )
6516 + {
6517 + DBG_ERROR( "Fatal error: top node isn't a dialog" );
6518 + }
6519 +
6520 +#if 0
6521 + // Hack moved to proplist.cxx
6522 + OUString aGraphic;
6523 + if ( findAndRemove( "graphic", aProps, aGraphic ) )
6524 + //if ( layout::FixedImage *i = dynamic_cast<layout::FixedImage *> ( mpWidget->getPeer().get() ) )
6525 + // FIXME: huh? XImageProducer::complete( XImageConsumer )
6526 + //i->setImage( Image( loadGraphic( OUSTRING_CSTR( aGraphic ) ) ) );
6527 + mpWidget->setProperty( OUString::createFromAscii( "graphic" ),
6528 + loadGraphic( OUSTRING_CSTR( aGraphic ) ) );
6529 +#endif
6530 +
6531 + OUString aOrdering;
6532 + if ( findAndRemove( "ordering", aProps, aOrdering ) )
6533 + if ( DialogButtonHBox *b = dynamic_cast<DialogButtonHBox *> ( mpWidget->getPeer().get() ) )
6534 + b->setOrdering ( aOrdering );
6535 +
6536 + bool bSetRadioGroup;
6537 + OUString aRadioGroup;
6538 + bSetRadioGroup = findAndRemove( "radiogroup", aProps, aRadioGroup );
6539 +
6540 + mpWidget->setProperties( aProps );
6541 +
6542 + // we need to add radio buttons to the group after their properties are
6543 + // set, so we can check if they should be the one selected by default or not.
6544 + // And the state changed event isn't fired when changing properties.
6545 +
6546 + uno::Reference< awt::XRadioButton > xRadio( mpWidget->getPeer(), uno::UNO_QUERY );
6547 + if ( xRadio.is() )
6548 + {
6549 + if (!bSetRadioGroup)
6550 + aRadioGroup = OUString::createFromAscii ("default");
6551 + pImport->mxRadioGroups.addItem( aRadioGroup, xRadio );
6552 + }
6553 +}
6554 +
6555 +WidgetElement::~WidgetElement()
6556 +{
6557 + //delete mpWidget;
6558 + //mpWidget = 0;
6559 +}
6560 +
6561 +uno::Reference <xml::input::XElement>
6562 +WidgetElement::startChildElement ( sal_Int32 nUid, OUString const &name,
6563 + uno::Reference <xml::input::XAttributes> const &attributes )
6564 + throw( xml::sax::SAXException, uno::RuntimeException )
6565 +{
6566 + // Adding a child to the widget
6567 + WidgetElement *pChild = new WidgetElement ( nUid, name, attributes, this, mpImport );
6568 +
6569 + if ( !mpWidget->addChild( pChild->mpWidget ) )
6570 + {
6571 + DBG_ERROR2( "ERROR: cannot add %s to container %s, container full", OUSTRING_CSTR( name ), OUSTRING_CSTR( getLocalName() ) );
6572 + throw xml::sax::SAXException();
6573 + }
6574 +
6575 + PropList aProps;
6576 + propsFromAttributes( attributes, aProps, mpImport->XMLNS_CONTAINER_UID );
6577 + mpWidget->setChildProperties( pChild->mpWidget, aProps );
6578 +
6579 + return pChild;
6580 +}
6581 +
6582 +// Support Ivo Hinkelmann's move label/text/title attribute to CONTENT
6583 +// transex3 hack.
6584 +void SAL_CALL
6585 +WidgetElement::characters( OUString const& rChars )
6586 + throw (xml::sax::SAXException, uno::RuntimeException)
6587 +{
6588 + if ( mpWidget && rChars.trim().getLength() )
6589 + {
6590 + uno::Reference< awt::XDialog2 > xDialog( mpWidget->getPeer(), uno::UNO_QUERY );
6591 + uno::Reference< awt::XButton > xButton( mpWidget->getPeer(), uno::UNO_QUERY );
6592 + if ( xDialog.is() )
6593 + xDialog->setTitle( rChars );
6594 + else if ( xButton.is() )
6595 + mpWidget->setProperty( OUString::createFromAscii( "label" ), rChars );
6596 + else
6597 + mpWidget->setProperty( OUString::createFromAscii( "text" ), rChars );
6598 + }
6599 +}
6600 +// ---- ElementBase ----
6601 +
6602 +ElementBase::ElementBase( sal_Int32 nUid, OUString const & rLocalName,
6603 + uno::Reference< xml::input::XAttributes > const & xAttributes,
6604 + ElementBase* pParent,
6605 + ImportContext* pImport )
6606 +SAL_THROW(())
6607 +: mpImport( pImport )
6608 + , mpParent( pParent )
6609 + , mnUid( nUid )
6610 + , maLocalName( rLocalName )
6611 + , mxAttributes( xAttributes )
6612 +{
6613 +}
6614 +
6615 +// ---- ImportContext ----
6616 +
6617 +void ImportContext::startDocument(
6618 + uno::Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
6619 + throw (xml::sax::SAXException, uno::RuntimeException)
6620 +{
6621 + XMLNS_LAYOUT_UID = xNamespaceMapping->getUidByUri(
6622 + OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_LAYOUT_URI ) ) );
6623 + XMLNS_CONTAINER_UID = xNamespaceMapping->getUidByUri(
6624 + OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_CONTAINER_URI ) ) );
6625 +}
6626 +
6627 +ToplevelElement::ToplevelElement (OUString const &rName,
6628 + uno::Reference <xml::input::XAttributes> const &xAttributes,
6629 + ImportContext *pImport)
6630 +SAL_THROW(())
6631 +: WidgetElement( 0, rName, xAttributes, NULL, pImport )
6632 +{
6633 +}
6634 +
6635 +ToplevelElement::~ToplevelElement()
6636 +{
6637 +}
6638 +
6639 +uno::Reference< xml::input::XElement > ImportContext::startRootElement(
6640 + sal_Int32 nUid, OUString const & rLocalName,
6641 + uno::Reference< xml::input::XAttributes > const & xAttributes )
6642 + throw (xml::sax::SAXException, uno::RuntimeException)
6643 +{
6644 + if ( XMLNS_LAYOUT_UID != nUid )
6645 + throw xml::sax::SAXException(
6646 + OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid namespace!" ) ),
6647 + uno::Reference< uno::XInterface >(), uno::Any() );
6648 + return new ToplevelElement( rLocalName, xAttributes, this );
6649 +}
6650 +
6651 +RadioGroups::RadioGroups()
6652 +{
6653 +}
6654 +
6655 +void RadioGroups::addItem( rtl::OUString id, uno::Reference< awt::XRadioButton > xRadio )
6656 + throw (uno::RuntimeException)
6657 +{
6658 + if ( ! xRadio.is() )
6659 + throw uno::RuntimeException();
6660 +
6661 + uno::Reference< RadioGroup > group;
6662 + RadioGroupsMap::iterator it = mxRadioGroups.find( id );
6663 + if ( it == mxRadioGroups.end() )
6664 + {
6665 + group = uno::Reference< RadioGroup > ( new RadioGroup() );
6666 + mxRadioGroups [id] = group;
6667 + }
6668 + else
6669 + group = it->second;
6670 + group->addItem( xRadio );
6671 +}
6672 +
6673 +RadioGroups::RadioGroup::RadioGroup()
6674 +{
6675 +}
6676 +
6677 +void RadioGroups::RadioGroup::addItem( uno::Reference< awt::XRadioButton > xRadio )
6678 +{
6679 + if ( ! mxSelectedRadio.is() )
6680 + {
6681 + xRadio->setState( true );
6682 + mxSelectedRadio = xRadio;
6683 + }
6684 + else if ( xRadio->getState() )
6685 + {
6686 +#if 1
6687 + xRadio->setState( false );
6688 +#else // huh, why select last added?
6689 + mxSelectedRadio->setState( false );
6690 + mxSelectedRadio = xRadio;
6691 +#endif
6692 + }
6693 +
6694 + // TOO late: actionPerformed is called before itemStateChanged.
6695 + // If client code (wrongly?) uses actionPerformed, it will see
6696 + // the previous RadioButtons' state.
6697 + xRadio->addItemListener( this );
6698 +
6699 + uno::Reference< awt::XButton > xButton = uno::Reference< awt::XButton > ( xRadio, uno::UNO_QUERY );
6700 + xButton->addActionListener( this );
6701 +
6702 + mxRadios.push_back (xRadio);
6703 +}
6704 +
6705 +void RadioGroups::RadioGroup::handleSelected ()
6706 + throw (uno::RuntimeException)
6707 +{
6708 + for ( RadioButtonsList::iterator it = mxRadios.begin();
6709 + it != mxRadios.end(); it++ )
6710 + if ( *it != mxSelectedRadio && (*it)->getState() )
6711 + {
6712 + mxSelectedRadio->setState( false );
6713 + mxSelectedRadio = *it;
6714 + break;
6715 + }
6716 +}
6717 +
6718 +// awt::XItemListener
6719 +void RadioGroups::RadioGroup::itemStateChanged( const awt::ItemEvent& e )
6720 + throw (uno::RuntimeException)
6721 +{
6722 + // TOO late: actionPerformed is called before itemStateChanged.
6723 + // If client code (wrongly?) uses actionPerformed, it will see
6724 + // the previous RadioButtons' state.
6725 +
6726 + // Need this for initialization, though.
6727 + if ( e.Selected )
6728 + handleSelected ();
6729 +}
6730 +
6731 +// awt::XActionListener
6732 +void RadioGroups::RadioGroup::actionPerformed( const awt::ActionEvent& )
6733 + throw (uno::RuntimeException)
6734 +{
6735 + handleSelected ();
6736 +}
6737 +
6738 +// lang::XEventListener
6739 +void SAL_CALL RadioGroups::RadioGroup::disposing( const lang::EventObject& )
6740 + throw (uno::RuntimeException)
6741 +{
6742 +}
6743 +
6744 +} // namespace layoutimpl
6745 --- toolkit/source/layout/core/import.hxx.old 1970-01-01 00:00:00.000000000 +0000
6746 +++ toolkit/source/layout/core/import.hxx 2009-04-06 16:42:13.000000000 +0000
6747 @@ -0,0 +1,263 @@
6748 +/*************************************************************************
6749 + *
6750 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6751 + *
6752 + * Copyright 2008 by Sun Microsystems, Inc.
6753 + *
6754 + * OpenOffice.org - a multi-platform office productivity suite
6755 + *
6756 + * $RCSfile$
6757 + *
6758 + * $Revision$
6759 + *
6760 + * This file is part of OpenOffice.org.
6761 + *
6762 + * OpenOffice.org is free software: you can redistribute it and/or modify
6763 + * it under the terms of the GNU Lesser General Public License version 3
6764 + * only, as published by the Free Software Foundation.
6765 + *
6766 + * OpenOffice.org is distributed in the hope that it will be useful,
6767 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
6768 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6769 + * GNU Lesser General Public License version 3 for more details
6770 + * (a copy is included in the LICENSE file that accompanied this code).
6771 + *
6772 + * You should have received a copy of the GNU Lesser General Public License
6773 + * version 3 along with OpenOffice.org. If not, see
6774 + * <http://www.openoffice.org/license.html>
6775 + * for a copy of the LGPLv3 License.
6776 + *
6777 + ************************************************************************/
6778 +
6779 +#ifndef LAYOUT_CORE_IMPORT_HXX
6780 +#define LAYOUT_CORE_IMPORT_HXX
6781 +
6782 +#include <map>
6783 +#include <list>
6784 +#define _BACKWARD_BACKWARD_WARNING_H 1
6785 +#include <hash_map>
6786 +
6787 +
6788 +#include <com/sun/star/xml/input/XRoot.hpp>
6789 +#include <cppuhelper/implbase1.hxx>
6790 +#include <com/sun/star/awt/XButton.hpp>
6791 +#include <com/sun/star/awt/XRadioButton.hpp>
6792 +
6793 +namespace layoutimpl
6794 +{
6795 +class LayoutRoot;
6796 +class LayoutWidget;
6797 +namespace css = ::com::sun::star;
6798 +
6799 +class RadioGroups
6800 +{
6801 +public:
6802 + RadioGroups();
6803 +
6804 + void addItem( rtl::OUString id, css::uno::Reference< css::awt::XRadioButton > xRadio )
6805 + throw (css::uno::RuntimeException);
6806 +
6807 +private:
6808 + class RadioGroup : public ::cppu::WeakImplHelper1< css::awt::XItemListener >
6809 + , public ::cppu::WeakImplHelper1< css::awt::XActionListener >
6810 + {
6811 + public:
6812 + RadioGroup();
6813 + void addItem( css::uno::Reference< css::awt::XRadioButton > xRadio );
6814 +
6815 + private:
6816 + typedef std::list< css::uno::Reference< css::awt::XRadioButton > > RadioButtonsList;
6817 + RadioButtonsList mxRadios;
6818 + css::uno::Reference< css::awt::XRadioButton > mxSelectedRadio;
6819 +
6820 + void handleSelected ()
6821 + throw (css::uno::RuntimeException);
6822 +
6823 + // awt::XItemListener
6824 + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& e )
6825 + throw (css::uno::RuntimeException);
6826 +
6827 + // awt::XActionListener
6828 + void SAL_CALL actionPerformed( const css::awt::ActionEvent& e )
6829 + throw (css::uno::RuntimeException);
6830 +
6831 + // lang::XEventListener
6832 + void SAL_CALL disposing( const css::lang::EventObject& )
6833 + throw (css::uno::RuntimeException);
6834 + };
6835 +
6836 + // each RadioGroup will stay alive after RadioGroups die with the ImportContext
6837 + // because they are referenced by every XRadioButton through the listener
6838 + typedef std::map< rtl::OUString, css::uno::Reference< RadioGroup > > RadioGroupsMap;
6839 + RadioGroupsMap mxRadioGroups;
6840 +};
6841 +
6842 +#if 0
6843 +// generator
6844 +class Widget
6845 +{
6846 +public:
6847 + Widget( css::uno::Reference< css::awt::XToolkit > xToolkit,
6848 + css::uno::Reference< css::awt::XWindow > xToplevel,
6849 + rtl::OUString unoName, long attrbs );
6850 + virtual ~Widget();
6851 +
6852 + virtual void setProperties( const PropList &rProps );
6853 +
6854 + virtual bool addChild( Widget *pChild );
6855 + virtual void setChildProperties( Widget *pChild, const PropList &rProps );
6856 +
6857 + inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
6858 + { return mxWidget; }
6859 +
6860 + inline css::uno::Reference< css::awt::XLayoutConstrains > getContainer()
6861 + { return mxContainer; }
6862 +
6863 +protected:
6864 + css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
6865 + css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
6866 +};
6867 +
6868 +class Root
6869 +{
6870 +public:
6871 + Root( css::uno::Reference< css::awt::XToolkit > xToolkit )
6872 + : mxToolkit( xToolkit ) {}
6873 + ~Root();
6874 +
6875 + virtual Widget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs );
6876 +
6877 + css::uno::Reference< css::awt::XLayoutConstrains > getById( rtl::OUString id );
6878 + inline css::uno::Reference< css::awt::XLayoutConstrains > getToplevel();
6879 +
6880 +protected:
6881 + css::uno::Reference< css::awt::XToolkit > mxToolkit;
6882 + Widget *mpToplevel;
6883 +
6884 + typedef std::hash_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >,
6885 + rtl::OUStringHash > ItemHash;
6886 + ItemHash maItems;
6887 +};
6888 +#endif
6889 +
6890 +// parser
6891 +class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
6892 +{
6893 +public:
6894 + sal_Int32 XMLNS_LAYOUT_UID, XMLNS_CONTAINER_UID;
6895 + LayoutRoot &mrRoot; // switch to XNameContainer ref ?
6896 + RadioGroups mxRadioGroups;
6897 +
6898 + inline ImportContext( LayoutRoot &rRoot ) SAL_THROW( () )
6899 + : mrRoot( rRoot ) {}
6900 + virtual ~ImportContext() {}
6901 +
6902 + // XRoot
6903 + virtual void SAL_CALL startDocument(
6904 + css::uno::Reference< css::xml::input::XNamespaceMapping >
6905 + const & xNamespaceMapping )
6906 + throw (css::xml::sax::SAXException, css::uno::RuntimeException);
6907 + virtual void SAL_CALL endDocument()
6908 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6909 + { /* ignore */ }
6910 + virtual void SAL_CALL processingInstruction(
6911 + ::rtl::OUString const & /* rTarget */, ::rtl::OUString const & /* rData */ )
6912 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6913 + { /* ignore */ }
6914 + virtual void SAL_CALL setDocumentLocator(
6915 + css::uno::Reference< css::xml::sax::XLocator > const & /* xLocator */ )
6916 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6917 + { /* ignore */ }
6918 + virtual css::uno::Reference< css::xml::input::XElement >
6919 + SAL_CALL startRootElement(
6920 + sal_Int32 nUid, ::rtl::OUString const & rLocalName,
6921 + css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
6922 + throw (css::xml::sax::SAXException, css::uno::RuntimeException);
6923 +};
6924 +
6925 +class ElementBase : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
6926 +{
6927 +protected:
6928 + ImportContext *mpImport;
6929 +/* TODO: check if all this memebers are needed. */
6930 + ElementBase *mpParent;
6931 + sal_Int32 mnUid;
6932 +
6933 + ::rtl::OUString maLocalName;
6934 + css::uno::Reference< css::xml::input::XAttributes > mxAttributes;
6935 +public:
6936 + ElementBase(
6937 + sal_Int32 nUid, ::rtl::OUString const & rLocalName,
6938 + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
6939 + ElementBase * pParent, ImportContext * pImport )
6940 + SAL_THROW( () );
6941 + virtual ~ElementBase() SAL_THROW(());
6942 +
6943 + // XElement
6944 + virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
6945 + throw (css::uno::RuntimeException)
6946 + { return static_cast< css::xml::input::XElement * >( mpParent ); }
6947 + virtual ::rtl::OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException)
6948 + { return maLocalName; }
6949 + virtual sal_Int32 SAL_CALL getUid() throw (css::uno::RuntimeException)
6950 + { return mnUid; }
6951 + virtual css::uno::Reference< css::xml::input::XAttributes >
6952 + SAL_CALL getAttributes() throw (css::uno::RuntimeException)
6953 + { return mxAttributes; }
6954 +
6955 + virtual void SAL_CALL ignorableWhitespace(
6956 + ::rtl::OUString const & /* rWhitespaces */ )
6957 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6958 + { /* ignore */ }
6959 + virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
6960 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6961 + { /* ignore */ }
6962 + virtual void SAL_CALL processingInstruction(
6963 + ::rtl::OUString const & /* Target */, ::rtl::OUString const & /* Data */ )
6964 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6965 + { /* ignore */ }
6966 +
6967 + virtual css::uno::Reference< css::xml::input::XElement >
6968 + SAL_CALL startChildElement(
6969 + sal_Int32 nUid, ::rtl::OUString const & rLocalName,
6970 + css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
6971 + throw (css::xml::sax::SAXException, css::uno::RuntimeException) = 0;
6972 + virtual void SAL_CALL endElement()
6973 + throw (css::xml::sax::SAXException, css::uno::RuntimeException)
6974 + { /* ignore */ }
6975 +};
6976 +
6977 +class WidgetElement : public ElementBase
6978 +{
6979 +protected:
6980 + LayoutWidget *mpWidget;
6981 +
6982 +public:
6983 + WidgetElement( sal_Int32 nUid, rtl::OUString const &name,
6984 + css::uno::Reference< css::xml::input::XAttributes > const &attributes,
6985 + ElementBase *parent, ImportContext *import ) SAL_THROW (());
6986 +
6987 + ~WidgetElement();
6988 +
6989 +
6990 + virtual css::uno::Reference< css::xml::input::XElement> SAL_CALL
6991 + startChildElement (sal_Int32 id, rtl::OUString const &name,
6992 + css::uno::Reference< css::xml::input::XAttributes > const &attributes)
6993 + throw( css::xml::sax::SAXException, css::uno::RuntimeException );
6994 + virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
6995 + throw (css::xml::sax::SAXException, css::uno::RuntimeException);
6996 +};
6997 +
6998 +class ToplevelElement : public WidgetElement
6999 +{
7000 +public:
7001 + ToplevelElement( rtl::OUString const &name,
7002 + css::uno::Reference< css::xml::input::XAttributes > const &attributes,
7003 + ImportContext *import ) SAL_THROW (());
7004 + ~ToplevelElement();
7005 +};
7006 +
7007 +
7008 +} // namespace layoutimpl
7009 +
7010 +#endif /* LAYOUT_CORE_IMPORT_HXX */
7011 --- toolkit/source/layout/core/localized-string.cxx.old 1970-01-01 00:00:00.000000000 +0000
7012 +++ toolkit/source/layout/core/localized-string.cxx 2009-04-06 16:42:13.000000000 +0000
7013 @@ -0,0 +1,87 @@
7014 +/*************************************************************************
7015 + *
7016 + * OpenOffice.org - a multi-platform office productivity suite
7017 + *
7018 + * $RCSfile$
7019 + *
7020 + * $Revision$
7021 + *
7022 + * last change: $Author$ $Date$
7023 + *
7024 + * The Contents of this file are made available subject to
7025 + * the terms of GNU Lesser General Public License Version 2.1.
7026 + *
7027 + *
7028 + * GNU Lesser General Public License Version 2.1
7029 + * =============================================
7030 + * Copyright 2005 by Sun Microsystems, Inc.
7031 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
7032 + *
7033 + * This library is free software; you can redistribute it and/or
7034 + * modify it under the terms of the GNU Lesser General Public
7035 + * License version 2.1, as published by the Free Software Foundation.
7036 + *
7037 + * This library is distributed in the hope that it will be useful,
7038 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7039 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7040 + * Lesser General Public License for more details.
7041 + *
7042 + * You should have received a copy of the GNU Lesser General Public
7043 + * License along with this library; if not, write to the Free Software
7044 + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
7045 + * MA 02110-1301 USA
7046 + *
7047 + ************************************************************************/
7048 +
7049 +#include "localized-string.hxx"
7050 +
7051 +#include <toolkit/helper/property.hxx>
7052 +#include <vcl/window.hxx>
7053 +
7054 +namespace layoutimpl
7055 +{
7056 +
7057 +namespace css = ::com::sun::star;
7058 +using namespace css;
7059 +using rtl::OUString;
7060 +
7061 +LocalizedString::LocalizedString()
7062 + : VCLXWindow()
7063 +{
7064 +}
7065 +
7066 +void LocalizedString::ImplGetPropertyIds( std::list< sal_uInt16 > &ids )
7067 +{
7068 + PushPropertyIds( ids, BASEPROPERTY_TEXT, 0);
7069 + VCLXWindow::ImplGetPropertyIds( ids );
7070 +}
7071 +
7072 +// XInterface
7073 +uno::Any LocalizedString::queryInterface( uno::Type const& rType )
7074 + throw(uno::RuntimeException)
7075 +{
7076 + uno::Any aRet = ::cppu::queryInterface( rType,
7077 + SAL_STATIC_CAST( awt::XFixedText*, this ) );
7078 + return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
7079 +}
7080 +
7081 +void LocalizedString::setText( OUString const& s )
7082 + throw(uno::RuntimeException)
7083 +{
7084 + ::vos::OGuard aGuard( GetMutex() );
7085 +
7086 + if ( Window *w = GetWindow() )
7087 + return w->SetText( s );
7088 +}
7089 +
7090 +OUString LocalizedString::getText()
7091 + throw(uno::RuntimeException)
7092 +{
7093 + ::vos::OGuard aGuard( GetMutex() );
7094 +
7095 + if ( Window *w = GetWindow() )
7096 + return w->GetText();
7097 + return OUString();
7098 +}
7099 +
7100 +} // namespace layoutimpl
7101 --- toolkit/source/layout/core/localized-string.hxx.old 1970-01-01 00:00:00.000000000 +0000
7102 +++ toolkit/source/layout/core/localized-string.hxx 2009-04-06 16:42:13.000000000 +0000
7103 @@ -0,0 +1,84 @@
7104 +/*************************************************************************
7105 + *
7106 + * OpenOffice.org - a multi-platform office productivity suite
7107 + *
7108 + * $RCSfile$
7109 + *
7110 + * $Revision$
7111 + *
7112 + * last change: $Author$ $Date$
7113 + *
7114 + * The Contents of this file are made available subject to
7115 + * the terms of GNU Lesser General Public License Version 2.1.
7116 + *
7117 + *
7118 + * GNU Lesser General Public License Version 2.1
7119 + * =============================================
7120 + * Copyright 2005 by Sun Microsystems, Inc.
7121 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
7122 + *
7123 + * This library is free software; you can redistribute it and/or
7124 + * modify it under the terms of the GNU Lesser General Public
7125 + * License version 2.1, as published by the Free Software Foundation.
7126 + *
7127 + * This library is distributed in the hope that it will be useful,
7128 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7129 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7130 + * Lesser General Public License for more details.
7131 + *
7132 + * You should have received a copy of the GNU Lesser General Public
7133 + * License along with this library; if not, write to the Free Software
7134 + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
7135 + * MA 02110-1301 USA
7136 + *
7137 + ************************************************************************/
7138 +
7139 +#ifndef LAYOUT_CORE_LOCALIZED_STRING_HXX
7140 +#define LAYOUT_CORE_LOCALIZED_STRING_HXX
7141 +
7142 +#include <com/sun/star/awt/XFixedText.hpp>
7143 +#include <toolkit/awt/vclxwindow.hxx>
7144 +
7145 +namespace layoutimpl
7146 +{
7147 +namespace css = ::com::sun::star;
7148 +
7149 +// FIXME: misuse XFixedText interface for simple string
7150 +class LocalizedString : public css::awt::XFixedText
7151 + , public VCLXWindow
7152 +{
7153 +public:
7154 + LocalizedString();
7155 +
7156 + // css::uno::XInterface
7157 + css::uno::Any SAL_CALL queryInterface( css::uno::Type const& rType )
7158 + throw(css::uno::RuntimeException);
7159 + void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
7160 + void SAL_CALL release() throw() { OWeakObject::release(); }
7161 +
7162 + // css::awt::XFixedText
7163 + void SAL_CALL setText( ::rtl::OUString const& s )
7164 + throw(css::uno::RuntimeException);
7165 + ::rtl::OUString SAL_CALL getText()
7166 + throw(css::uno::RuntimeException);
7167 + void SAL_CALL setAlignment( sal_Int16 )
7168 + throw(css::uno::RuntimeException) { }
7169 + sal_Int16 SAL_CALL getAlignment()
7170 + throw(css::uno::RuntimeException) { return 0; }
7171 +
7172 + // css::awt::XLayoutConstrains
7173 + virtual css::awt::Size SAL_CALL getMinimumSize()
7174 + throw(css::uno::RuntimeException) { return css::awt::Size( 0, 0 ); }
7175 + css::awt::Size SAL_CALL getPreferredSize()
7176 + throw(css::uno::RuntimeException) { return getMinimumSize(); }
7177 + css::awt::Size SAL_CALL calcAdjustedSize( css::awt::Size const& size )
7178 + throw(css::uno::RuntimeException) { return size; }
7179 +
7180 + static void ImplGetPropertyIds( std::list< sal_uInt16 > &ids );
7181 + virtual void GetPropertyIds( std::list< sal_uInt16 > &ids )
7182 + { return ImplGetPropertyIds( ids ); }
7183 +};
7184 +
7185 +} // namespace layoutimpl
7186 +
7187 +#endif /* LAYOUT_CORE_LOCALIZED_STRING_HXX */
7188 --- toolkit/source/layout/core/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
7189 +++ toolkit/source/layout/core/makefile.mk 2009-04-06 16:42:13.000000000 +0000
7190 @@ -0,0 +1,70 @@
7191 +#*************************************************************************
7192 +#
7193 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7194 +#
7195 +# Copyright 2008 by Sun Microsystems, Inc.
7196 +#
7197 +# OpenOffice.org - a multi-platform office productivity suite
7198 +#
7199 +# $RCSfile$
7200 +#
7201 +# $Revision$
7202 +#
7203 +# This file is part of OpenOffice.org.
7204 +#
7205 +# OpenOffice.org is free software: you can redistribute it and/or modify
7206 +# it under the terms of the GNU Lesser General Public License version 3
7207 +# only, as published by the Free Software Foundation.
7208 +#
7209 +# OpenOffice.org is distributed in the hope that it will be useful,
7210 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
7211 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7212 +# GNU Lesser General Public License version 3 for more details
7213 +# (a copy is included in the LICENSE file that accompanied this code).
7214 +#
7215 +# You should have received a copy of the GNU Lesser General Public License
7216 +# version 3 along with OpenOffice.org. If not, see
7217 +# <http://www.openoffice.org/license.html>
7218 +# for a copy of the LGPLv3 License.
7219 +#
7220 +#*************************************************************************
7221 +
7222 +PRJ=../../..
7223 +PRJNAME=toolkit
7224 +TARGET=layout-core
7225 +ENABLE_EXCEPTIONS=true
7226 +
7227 +# --- Settings -----------------------------------------------------
7228 +
7229 +.INCLUDE : settings.mk
7230 +.INCLUDE : $(PRJ)$/util$/makefile.pmk
7231 +
7232 +# --- Files --------------------------------------------------------
7233 +
7234 +.IF "$(CCNUMVER)" >= "000400030000" && "$(CCNUMVER)" < "000400040000"
7235 +CFLAGS+= -O1
7236 +.ENDIF
7237 +
7238 +SLOFILES= \
7239 + $(SLO)$/bin.obj \
7240 + $(SLO)$/box-base.obj \
7241 + $(SLO)$/box.obj \
7242 + $(SLO)$/byteseq.obj \
7243 + $(SLO)$/container.obj \
7244 + $(SLO)$/dialogbuttonhbox.obj \
7245 + $(SLO)$/factory.obj \
7246 + $(SLO)$/flow.obj \
7247 + $(SLO)$/helper.obj \
7248 + $(SLO)$/import.obj \
7249 + $(SLO)$/localized-string.obj \
7250 + $(SLO)$/proplist.obj \
7251 + $(SLO)$/root.obj \
7252 + $(SLO)$/table.obj \
7253 + $(SLO)$/timer.obj \
7254 + $(SLO)$/translate.obj\
7255 + $(SLO)$/vcl.obj\
7256 +#
7257 +
7258 +# --- Targets ------------------------------------------------------
7259 +
7260 +.INCLUDE : target.mk
7261 --- toolkit/source/layout/core/precompiled_xmlscript.hxx.old 1970-01-01 00:00:00.000000000 +0000
7262 +++ toolkit/source/layout/core/precompiled_xmlscript.hxx 2009-04-06 16:42:13.000000000 +0000
7263 @@ -0,0 +1,39 @@
7264 +/*************************************************************************
7265 + *
7266 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7267 + *
7268 + * Copyright 2008 by Sun Microsystems, Inc.
7269 + *
7270 + * OpenOffice.org - a multi-platform office productivity suite
7271 + *
7272 + * $RCSfile$
7273 + *
7274 + * $Revision$
7275 + *
7276 + * This file is part of OpenOffice.org.
7277 + *
7278 + * OpenOffice.org is free software: you can redistribute it and/or modify
7279 + * it under the terms of the GNU Lesser General Public License version 3
7280 + * only, as published by the Free Software Foundation.
7281 + *
7282 + * OpenOffice.org is distributed in the hope that it will be useful,
7283 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7284 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7285 + * GNU Lesser General Public License version 3 for more details
7286 + * (a copy is included in the LICENSE file that accompanied this code).
7287 + *
7288 + * You should have received a copy of the GNU Lesser General Public License
7289 + * version 3 along with OpenOffice.org. If not, see
7290 + * <http://www.openoffice.org/license.html>
7291 + * for a copy of the LGPLv3 License.
7292 + *
7293 + ************************************************************************/
7294 +
7295 +/*
7296 + xmlscript/source/xml_helper/xml_byteseq.cxx compile helper.
7297 +
7298 + Avoid introducing a toolkit dependency on xmlscript.
7299 +
7300 + It would be nice to modify xml_byteseq.cxx making it friendlier
7301 + to include.
7302 +*/
7303 --- toolkit/source/layout/core/proplist.cxx.old 1970-01-01 00:00:00.000000000 +0000
7304 +++ toolkit/source/layout/core/proplist.cxx 2009-04-06 16:42:13.000000000 +0000
7305 @@ -0,0 +1,459 @@
7306 +/*************************************************************************
7307 + *
7308 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7309 + *
7310 + * Copyright 2008 by Sun Microsystems, Inc.
7311 + *
7312 + * OpenOffice.org - a multi-platform office productivity suite
7313 + *
7314 + * $RCSfile$
7315 + *
7316 + * $Revision$
7317 + *
7318 + * This file is part of OpenOffice.org.
7319 + *
7320 + * OpenOffice.org is free software: you can redistribute it and/or modify
7321 + * it under the terms of the GNU Lesser General Public License version 3
7322 + * only, as published by the Free Software Foundation.
7323 + *
7324 + * OpenOffice.org is distributed in the hope that it will be useful,
7325 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7326 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7327 + * GNU Lesser General Public License version 3 for more details
7328 + * (a copy is included in the LICENSE file that accompanied this code).
7329 + *
7330 + * You should have received a copy of the GNU Lesser General Public License
7331 + * version 3 along with OpenOffice.org. If not, see
7332 + * <http://www.openoffice.org/license.html>
7333 + * for a copy of the LGPLv3 License.
7334 + *
7335 + ************************************************************************/
7336 +
7337 +#include "proplist.hxx"
7338 +
7339 +#include <rtl/ustrbuf.hxx>
7340 +#include <toolkit/dllapi.h>
7341 +#include <com/sun/star/awt/WindowAttribute.hpp>
7342 +#include <com/sun/star/beans/XPropertySet.hpp>
7343 +#include <com/sun/star/awt/XVclWindowPeer.hpp>
7344 +#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
7345 +#include <tools/debug.hxx>
7346 +
7347 +#include "helper.hxx"
7348 +
7349 +#if TEST_LAYOUT && !defined( DBG_UTIL )
7350 +#include <cstdio>
7351 +#undef DBG_ERROR
7352 +#define DBG_ERROR printf
7353 +#undef DBG_ERROR1
7354 +#define DBG_ERROR1 printf
7355 +#undef DBG_ERROR2
7356 +#define DBG_ERROR2 printf
7357 +#endif /* TEST_LAYOUT && !DBG_UTIL */
7358 +
7359 +namespace layoutimpl
7360 +{
7361 +
7362 +using namespace com::sun::star;
7363 +using rtl::OString;
7364 +using rtl::OUString;
7365 +using rtl::OUStringBuffer;
7366 +
7367 +namespace prophlp
7368 +{
7369 +
7370 +bool TOOLKIT_DLLPUBLIC
7371 +canHandleProps( const uno::Reference< uno::XInterface > &xPeer )
7372 +{
7373 + uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
7374 + if ( xPropSet.is() )
7375 + return true;
7376 + uno::Reference< beans::XPropertySetInfo > xInfo( xPeer, uno::UNO_QUERY );
7377 + uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
7378 + return xInfo.is() && xVclPeer.is();
7379 +}
7380 +
7381 +uno::Reference< beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC
7382 +queryPropertyInfo(
7383 + const uno::Reference< uno::XInterface > &xPeer )
7384 +{
7385 + uno::Reference< beans::XPropertySetInfo > xInfo( xPeer, uno::UNO_QUERY );
7386 + if ( !xInfo.is() )
7387 + {
7388 + uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
7389 + if ( xPropSet.is() )
7390 + xInfo = xPropSet->getPropertySetInfo();
7391 + }
7392 + return xInfo;
7393 +}
7394 +
7395 +void TOOLKIT_DLLPUBLIC
7396 +setProperty( const uno::Reference< uno::XInterface > &xPeer,
7397 + const OUString &rName, uno::Any aValue )
7398 +{
7399 + uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
7400 + if ( xVclPeer.is() )
7401 + xVclPeer->setProperty( rName, aValue );
7402 + else
7403 + {
7404 + uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
7405 + xPropSet->setPropertyValue( rName, aValue );
7406 + }
7407 +}
7408 +
7409 +uno::Any TOOLKIT_DLLPUBLIC
7410 +getProperty( const uno::Reference< uno::XInterface > &xPeer,
7411 + const OUString &rName )
7412 +{
7413 + uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
7414 + if ( xVclPeer.is() )
7415 + return xVclPeer->getProperty( rName );
7416 +
7417 + uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
7418 + return xPropSet->getPropertyValue( rName );
7419 +}
7420 +
7421 +} // namespace prophlp
7422 +
7423 +
7424 +/* Given a string and a type, it converts the string to the type, and returns
7425 + it encapsulated in Any. */
7426 +uno::Any anyFromString( OUString const& value, uno::Type const& type )
7427 +{
7428 + sal_Int16 radix = 10;
7429 + OUString intval = value;
7430 + if ( value.getLength() > 2 && value[0] == '0' && value[1] == 'x' )
7431 + intval = value.copy( 2 ), radix = 16;
7432 + else if ( value.getLength() > 1 && value[0] == '#' )
7433 + intval = value.copy( 1 ), radix = 16;
7434 + switch ( type.getTypeClass() )
7435 + {
7436 + case uno::TypeClass_CHAR:
7437 + return uno::makeAny( value.toChar() );
7438 + case uno::TypeClass_BOOLEAN:
7439 + if ( value == OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) )
7440 + return uno::makeAny( true );
7441 + else if ( value == OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) )
7442 + return uno::makeAny( false );
7443 + break; // ends switch, throws exception
7444 + case uno::TypeClass_BYTE:
7445 + return uno::makeAny( ( sal_uInt8 ) intval.toInt32( radix ) );
7446 + case uno::TypeClass_SHORT:
7447 + return uno::makeAny( ( sal_Int16 ) intval.toInt32( radix ) );
7448 + case uno::TypeClass_UNSIGNED_SHORT:
7449 + return uno::makeAny( ( sal_uInt16 ) intval.toInt32( radix ) );
7450 + case uno::TypeClass_ENUM:
7451 + return uno::makeAny( ( sal_Int16 ) intval.toInt32( radix ) );
7452 + case uno::TypeClass_LONG:
7453 + return uno::makeAny( ( sal_Int32 ) intval.toInt32( radix ) );
7454 + case uno::TypeClass_UNSIGNED_LONG:
7455 + return uno::makeAny( ( sal_uInt32 ) intval.toInt32( radix ) );
7456 + case uno::TypeClass_HYPER:
7457 + return uno::makeAny( ( sal_Int64 ) intval.toInt64( radix ) );
7458 + case uno::TypeClass_UNSIGNED_HYPER:
7459 + return uno::makeAny( ( sal_uInt16 ) intval.toInt64( radix ) );
7460 + case uno::TypeClass_FLOAT:
7461 + return uno::makeAny( value.toFloat() );
7462 + case uno::TypeClass_DOUBLE:
7463 + return uno::makeAny( value.toDouble() );
7464 + case uno::TypeClass_STRING:
7465 + return uno::makeAny( value );
7466 + case uno::TypeClass_CONSTANT:
7467 + return uno::makeAny( intval.toInt32( radix ) );
7468 + case uno::TypeClass_INTERFACE:
7469 + return uno::makeAny( loadGraphic( OUSTRING_CSTR( value ) ) );
7470 + case uno::TypeClass_SEQUENCE:
7471 + {
7472 + sal_Int32 i = 0;
7473 + bool escaped = false, first = true;
7474 + OUString item, token;
7475 + std::list< OUString > values;
7476 + do
7477 + {
7478 + token = value.getToken( 0, ':', i );
7479 +
7480 + if ( !token.getLength() && !escaped )
7481 + {
7482 + escaped = true;
7483 + item += OUString( ':' );
7484 + }
7485 + else if ( escaped )
7486 + {
7487 + escaped = false;
7488 + item += token;
7489 + }
7490 + else
7491 + {
7492 + if ( !first )
7493 + values.push_back( item );
7494 + item = token;
7495 + }
7496 + first = false;
7497 + }
7498 + while ( i >= 0 );
7499 + if ( item.getLength() )
7500 + values.push_back( item );
7501 +
7502 + uno::Sequence< OUString > seq( values.size() );
7503 + i = 0;
7504 + for ( std::list< OUString >::const_iterator it = values.begin();
7505 + it != values.end(); it++, i++ )
7506 + seq[ i ] = *it;
7507 +
7508 + return uno::makeAny( seq );
7509 + }
7510 +
7511 + default:
7512 + DBG_ERROR1( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) );
7513 + break;
7514 + }
7515 + throw uno::RuntimeException();
7516 +}
7517 +
7518 +/* Converts the XML naming scheme to UNO's, for legacy compatibility
7519 + (so, ergo, "one-two-three-four" -> "OneTwoThreeFour"). */
7520 +static OUString toUnoNaming ( OUString const &string )
7521 +{
7522 + OUStringBuffer buffer( string.getLength() );
7523 + sal_Unicode *str = string.pData->buffer;
7524 + bool capitalize = true;
7525 +
7526 + for ( int i = 0; i < string.getLength(); i++ )
7527 + {
7528 + if ( i == 0 && str[0] == '_' )
7529 + /* Skip translate-me prefix. */
7530 + continue;
7531 + if ( str[i] == '-' )
7532 + capitalize = true;
7533 + else
7534 + {
7535 + if ( capitalize && str[i] >= 'a' && str[i] <= 'z' )
7536 + buffer.append( (sal_Unicode ) ( str[i] - 'a' + 'A' ) );
7537 + else
7538 + buffer.append( (sal_Unicode ) str[i] );
7539 + capitalize = false;
7540 + }
7541 + }
7542 +
7543 + return buffer.makeStringAndClear();
7544 +}
7545 +
7546 +/*
7547 + * convert incoming XML style property names, to AWT style property names.
7548 + * convert the values based on introspection information.
7549 + * apply to either an XPropertySet or an XPropertySetInfo | XVclWindowPeer
7550 + * aggregate.
7551 + */
7552 +void
7553 +setProperties( uno::Reference< uno::XInterface > const& xPeer,
7554 + PropList const& rProps )
7555 +{
7556 + if ( !prophlp::canHandleProps( xPeer ) )
7557 + {
7558 + DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" );
7559 + for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
7560 + it++ )
7561 + {
7562 + DBG_ERROR2( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
7563 + }
7564 + return;
7565 + }
7566 +
7567 + for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
7568 + it++ )
7569 + setProperty( xPeer, it->first, it->second );
7570 +}
7571 +
7572 +void
7573 +setProperty( uno::Reference< uno::XInterface > const& xPeer,
7574 + OUString const& attr, OUString const& value )
7575 +{
7576 + OUString unoAttr = toUnoNaming( attr );
7577 +
7578 + OSL_TRACE( "setting %s=%s", OUSTRING_CSTR( attr ), OUSTRING_CSTR( value ) );
7579 + // get a Property object
7580 + beans::Property prop;
7581 + try
7582 + {
7583 + uno::Reference< beans::XPropertySetInfo > xInfo
7584 + = prophlp::queryPropertyInfo( xPeer );
7585 + prop = xInfo->getPropertyByName( unoAttr );
7586 + }
7587 + catch( beans::UnknownPropertyException & )
7588 + {
7589 + DBG_ERROR1( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) );
7590 + return;
7591 + }
7592 +
7593 + if ( prop.Name.getLength() <= 0 )
7594 + {
7595 + DBG_ERROR1( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) );
7596 + return;
7597 + }
7598 +
7599 + // encapsulates value in an uno::Any
7600 + uno::Any any;
7601 + try
7602 + {
7603 + any = anyFromString( value, prop.Type );
7604 + }
7605 + catch( uno::RuntimeException & )
7606 + {
7607 + DBG_ERROR5( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
7608 + return;
7609 + }
7610 +
7611 + // sets value on property
7612 + try
7613 + {
7614 + prophlp::setProperty( xPeer, unoAttr, any );
7615 + }
7616 + catch( ... )
7617 + {
7618 + DBG_ERROR2( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) );
7619 + }
7620 +}
7621 +
7622 +
7623 +
7624 +
7625 +struct AttributesMap
7626 +{
7627 + const char *name;
7628 + long value;
7629 + bool windowAttr;
7630 +};
7631 +static const AttributesMap attribsMap[] =
7632 +{
7633 + { "autohscroll", awt::VclWindowPeerAttribute::AUTOHSCROLL, false },
7634 + { "autovscroll", awt::VclWindowPeerAttribute::AUTOVSCROLL, false },
7635 + { "center", awt::VclWindowPeerAttribute::CENTER, false },
7636 + { "clipchildren", awt::VclWindowPeerAttribute::CLIPCHILDREN, false },
7637 + { "closeable", awt::WindowAttribute::CLOSEABLE, true },
7638 + { "defbutton", awt::VclWindowPeerAttribute::DEFBUTTON, false },
7639 + { "dropdown", awt::VclWindowPeerAttribute::DROPDOWN, false },
7640 + { "fullsize", awt::WindowAttribute::FULLSIZE, true }, //FIXME?
7641 + { "group", awt::VclWindowPeerAttribute::GROUP, false },
7642 + { "has_border", awt::WindowAttribute::BORDER, true },
7643 + { "hscroll", awt::VclWindowPeerAttribute::HSCROLL, false },
7644 + { "left", awt::VclWindowPeerAttribute::LEFT, false },
7645 + { "moveable", awt::WindowAttribute::MOVEABLE, true },
7646 + { "noborder", awt::VclWindowPeerAttribute::NOBORDER, false },
7647 + { "nolabel", awt::VclWindowPeerAttribute::NOLABEL, false },
7648 + { "optimumsize", awt::WindowAttribute::OPTIMUMSIZE, false },
7649 + { "readonly", awt::VclWindowPeerAttribute::READONLY, false },
7650 + { "right", awt::VclWindowPeerAttribute::RIGHT, false },
7651 + { "show", awt::WindowAttribute::SHOW, true },
7652 + { "sizeable", awt::WindowAttribute::SIZEABLE, true },
7653 + { "sort", awt::VclWindowPeerAttribute::SORT, false },
7654 + { "spin", awt::VclWindowPeerAttribute::SPIN, false },
7655 + { "vscroll", awt::VclWindowPeerAttribute::VSCROLL, false },
7656 +
7657 + // cutting on OK, YES_NO_CANCEL and related obsite attributes...
7658 +};
7659 +static const int attribsMapLen = sizeof( attribsMap ) / sizeof( AttributesMap );
7660 +
7661 +#if 0
7662 +long getAttribute( const OUString &rName, bool bTopWindow )
7663 +{
7664 +
7665 + int min = 0, max = attribsMapLen - 1, mid, cmp;
7666 + do
7667 + {
7668 + mid = min +( max - min )/2;
7669 + cmp = rName.compareToAscii( attribsMap[ mid ].name );
7670 + if ( cmp > 0 )
7671 + min = mid+1;
7672 + else if ( cmp < 0 )
7673 + max = mid-1;
7674 + else
7675 + {
7676 + if ( bTopWindow || attribsMap[ mid ].value )
7677 + return attribsMap[ mid ].windowAttr;
7678 + return 0;
7679 + }
7680 + }
7681 + while ( min <= max );
7682 + return 0;
7683 +}
7684 +#endif
7685 +
7686 +void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttributes,
7687 + PropList &rProps, sal_Int32 nNamespace )
7688 +{
7689 + sal_Int32 nAttrs = xAttributes->getLength();
7690 + for ( sal_Int32 i = 0; i < nAttrs; i++ )
7691 + {
7692 + if ( nNamespace != xAttributes->getUidByIndex( i ) )
7693 + continue;
7694 +
7695 + std::pair< OUString, OUString > aElem
7696 + ( xAttributes->getLocalNameByIndex( i ),
7697 + xAttributes->getValueByIndex( i ) );
7698 +
7699 + if ( aElem.first.getLength() > 0 ) // namespace bits ..
7700 + rProps.push_back( aElem );
7701 + }
7702 +}
7703 +
7704 +bool
7705 +findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
7706 +{
7707 + PropList::iterator it;
7708 + OUString aName = OUString::createFromAscii( pAttr );
7709 +
7710 + for ( it = rProps.begin(); it != rProps.end(); it++ )
7711 + {
7712 + if ( it->first.equalsIgnoreAsciiCase( aName )
7713 + || it->first.equalsIgnoreAsciiCase( OUString::createFromAscii ("_") + aName ) )
7714 + {
7715 + rValue = it->second;
7716 + rProps.erase( it );
7717 + return true;
7718 + }
7719 + }
7720 + rValue = OUString();
7721 + return false;
7722 +}
7723 +
7724 +long
7725 +getAttributeProps( PropList &rProps )
7726 +{
7727 + long nAttrs = 0;
7728 + OUString aValue;
7729 +
7730 + OUString trueStr( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
7731 +
7732 + if ( findAndRemove( "show", rProps, aValue ) &&
7733 + aValue.equalsIgnoreAsciiCase(
7734 + OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) ) )
7735 + ;
7736 + else
7737 + nAttrs |= awt::WindowAttribute::SHOW;
7738 +
7739 + for ( int i = 0; i < attribsMapLen; i++ )
7740 + {
7741 + if ( findAndRemove( attribsMap[i].name, rProps, aValue ) )
7742 + {
7743 + if ( aValue.equalsIgnoreAsciiCase( trueStr ) )
7744 + nAttrs |= attribsMap[i].value;
7745 + }
7746 + }
7747 +
7748 + if ( findAndRemove( "align", rProps, aValue ) )
7749 + {
7750 + sal_Int32 nVal = aValue.toInt32();
7751 +
7752 + if ( nVal == 0 /* PROPERTY_ALIGN_LEFT */ )
7753 + nAttrs |= awt::VclWindowPeerAttribute::LEFT;
7754 + else if ( nVal == 1 /* PROPERTY_ALIGN_CENTER */ )
7755 + nAttrs |= awt::VclWindowPeerAttribute::CENTER;
7756 + else if ( nVal == 2 )
7757 + nAttrs |= awt::VclWindowPeerAttribute::RIGHT;
7758 + }
7759 +
7760 + return nAttrs;
7761 +}
7762 +
7763 +}
7764 +
7765 --- toolkit/source/layout/core/proplist.hxx.old 1970-01-01 00:00:00.000000000 +0000
7766 +++ toolkit/source/layout/core/proplist.hxx 2009-04-06 16:42:13.000000000 +0000
7767 @@ -0,0 +1,95 @@
7768 +/*************************************************************************
7769 + *
7770 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7771 + *
7772 + * Copyright 2008 by Sun Microsystems, Inc.
7773 + *
7774 + * OpenOffice.org - a multi-platform office productivity suite
7775 + *
7776 + * $RCSfile$
7777 + *
7778 + * $Revision$
7779 + *
7780 + * This file is part of OpenOffice.org.
7781 + *
7782 + * OpenOffice.org is free software: you can redistribute it and/or modify
7783 + * it under the terms of the GNU Lesser General Public License version 3
7784 + * only, as published by the Free Software Foundation.
7785 + *
7786 + * OpenOffice.org is distributed in the hope that it will be useful,
7787 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7788 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7789 + * GNU Lesser General Public License version 3 for more details
7790 + * (a copy is included in the LICENSE file that accompanied this code).
7791 + *
7792 + * You should have received a copy of the GNU Lesser General Public License
7793 + * version 3 along with OpenOffice.org. If not, see
7794 + * <http://www.openoffice.org/license.html>
7795 + * for a copy of the LGPLv3 License.
7796 + *
7797 + ************************************************************************/
7798 +
7799 +#ifndef LAYOUT_CORE_PROPLIST_HXX
7800 +#define LAYOUT_CORE_PROPLIST_HXX
7801 +
7802 +#include <com/sun/star/beans/XPropertySetInfo.hpp>
7803 +#include <com/sun/star/xml/input/XAttributes.hpp>
7804 +#include <list>
7805 +#include <rtl/ustring.hxx>
7806 +#include <toolkit/dllapi.h>
7807 +\
7808 +namespace layoutimpl
7809 +{
7810 +
7811 +namespace css = ::com::sun::star;
7812 +
7813 +typedef std::list< std::pair< rtl::OUString, rtl::OUString > > PropList;
7814 +
7815 +void propsFromAttributes( const css::uno::Reference<css::xml::input::XAttributes> & xAttributes,
7816 + PropList &rProps, sal_Int32 nNamespace );
7817 +
7818 +void setProperties( css::uno::Reference< css::uno::XInterface > const& xPeer,
7819 + PropList const& rProps);
7820 +
7821 +void setProperty( css::uno::Reference< css::uno::XInterface > const& xPeer,
7822 + rtl::OUString const& attr, rtl::OUString const& value );
7823 +
7824 +long getAttributeProps( PropList &rProps );
7825 +bool findAndRemove( const char *pAttr, PropList &rProps, rtl::OUString &rValue);
7826 +
7827 +// Helpers - unfortunately VCLXWindows don't implement XPropertySet
7828 +// but containers do - these helpers help us to hide this
7829 +namespace prophlp
7830 +{
7831 +
7832 +// can we set properties on this handle ?
7833 +bool TOOLKIT_DLLPUBLIC canHandleProps( const css::uno::Reference< css::uno::XInterface > &xRef );
7834 +// if so which properties ?
7835 +css::uno::Reference< css::beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC queryPropertyInfo(
7836 + const css::uno::Reference< css::uno::XInterface > &xRef );
7837 +// set / get ...
7838 +void TOOLKIT_DLLPUBLIC setProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
7839 + const rtl::OUString &rName,
7840 + css::uno::Any aValue );
7841 +css::uno::Any TOOLKIT_DLLPUBLIC getProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
7842 + const rtl::OUString &rName );
7843 +} // namespace prophlp
7844 +
7845 +} // namespace layoutimpl
7846 +
7847 +
7848 +#if !OUSTRING_CSTR_PARANOIA
7849 +#define OUSTRING_CSTR( str ) \
7850 + rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
7851 +#else
7852 +
7853 +inline char const* OUSTRING_CSTR( rtl::OUString const& str )
7854 +{
7855 + rtl::OString *leak
7856 + = new rtl::OString (rtl::OUStringToOString (str, RTL_TEXTENCODING_ASCII_US));
7857 + return leak->getStr();
7858 +}
7859 +
7860 +#endif
7861 +
7862 +#endif /* LAYOUT_CORE_PROPLIST_HXX */
7863 --- toolkit/source/layout/core/root.cxx.old 1970-01-01 00:00:00.000000000 +0000
7864 +++ toolkit/source/layout/core/root.cxx 2009-04-06 16:42:13.000000000 +0000
7865 @@ -0,0 +1,414 @@
7866 +/*************************************************************************
7867 + *
7868 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7869 + *
7870 + * Copyright 2008 by Sun Microsystems, Inc.
7871 + *
7872 + * OpenOffice.org - a multi-platform office productivity suite
7873 + *
7874 + * $RCSfile$
7875 + *
7876 + * $Revision$
7877 + *
7878 + * This file is part of OpenOffice.org.
7879 + *
7880 + * OpenOffice.org is free software: you can redistribute it and/or modify
7881 + * it under the terms of the GNU Lesser General Public License version 3
7882 + * only, as published by the Free Software Foundation.
7883 + *
7884 + * OpenOffice.org is distributed in the hope that it will be useful,
7885 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7886 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7887 + * GNU Lesser General Public License version 3 for more details
7888 + * (a copy is included in the LICENSE file that accompanied this code).
7889 + *
7890 + * You should have received a copy of the GNU Lesser General Public License
7891 + * version 3 along with OpenOffice.org. If not, see
7892 + * <http://www.openoffice.org/license.html>
7893 + * for a copy of the LGPLv3 License.
7894 + *
7895 + ************************************************************************/
7896 +
7897 +#include "root.hxx"
7898 +
7899 +#include <cassert>
7900 +#include <cstdio>
7901 +
7902 +#include <com/sun/star/awt/WindowAttribute.hpp>
7903 +#include <com/sun/star/awt/XMessageBox.hpp>
7904 +#include <com/sun/star/awt/MessageBoxButtons.hpp>
7905 +#include <com/sun/star/frame/XDesktop.hpp>
7906 +#include <com/sun/star/awt/XMessageBoxFactory.hpp>
7907 +#include <com/sun/star/xml/sax/SAXParseException.hpp>
7908 +#include <com/sun/star/xml/sax/XParser.hpp>
7909 +
7910 +#include "helper.hxx"
7911 +#include "import.hxx"
7912 +#include "timer.hxx"
7913 +#include "translate.hxx"
7914 +
7915 +namespace layoutimpl
7916 +{
7917 +
7918 +using namespace css;
7919 +using ::rtl::OUString;
7920 +
7921 +LayoutRoot::LayoutRoot( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
7922 + : mbDisposed( sal_False )
7923 + , mxFactory( xFactory )
7924 + , mpListeners( NULL )
7925 + , mpToplevel( NULL )
7926 +{
7927 + if ( !xFactory.is() )
7928 + throw uno::RuntimeException();
7929 + mxLayoutUnit = uno::Reference< awt::XLayoutUnit >( new LayoutUnit() );
7930 +}
7931 +
7932 +LayoutRoot::~LayoutRoot()
7933 +{
7934 +// TODO: we want to delete the top level LayoutWidget...
7935 + ::osl::MutexGuard aGuard( maMutex );
7936 + if ( !mbDisposed )
7937 + {
7938 + try
7939 + {
7940 + m_refCount++; // inhibit multiple destruction
7941 + dispose();
7942 + }
7943 + catch( uno::Exception& )
7944 + {
7945 + }
7946 + }
7947 +}
7948 +
7949 +void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactory, uno::Reference< awt::XToolkit > xToolkit, OUString const& aTitle, OUString const& aMessage )
7950 +{
7951 + uno::Reference< uno::XInterface > iDesktop = xFactory->createInstance
7952 + ( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
7953 + uno::Reference< frame::XDesktop > xDesktop ( iDesktop, uno::UNO_QUERY );
7954 + uno::Reference< frame::XFrame > xFrame ( xDesktop->getCurrentFrame() );
7955 + uno::Reference< awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
7956 + uno::Reference< awt::XWindowPeer > xWindowPeer( xContainerWindow, uno::UNO_QUERY_THROW );
7957 + uno::Reference< awt::XMessageBoxFactory > xMessageBoxFactory( xToolkit, uno::UNO_QUERY );
7958 +
7959 + awt::Rectangle aRectangle;
7960 + uno::Reference< awt::XMessageBox > xMessageBox
7961 + = xMessageBoxFactory->createMessageBox
7962 + ( xWindowPeer, aRectangle, OUString::createFromAscii( "errorbox" ),
7963 + awt::MessageBoxButtons::BUTTONS_OK, aTitle, aMessage );
7964 +
7965 + if ( xMessageBox.is() )
7966 + xMessageBox->execute();
7967 + //FIXME: exceptions not caught and printed at top level??
7968 + //else
7969 + //printf( "%s\n", OUSTRING_CSTR( aMessage ) );
7970 +}
7971 +
7972 +void LayoutRoot::error( OUString const& message )
7973 +{
7974 + printf( "%s\n", OUSTRING_CSTR( message ) );
7975 + ShowMessageBox( mxFactory, mxToolkit,
7976 + OUString::createFromAscii( "Fatal error" ),
7977 + message );
7978 + throw uno::RuntimeException( message, uno::Reference< uno::XInterface >() );
7979 +}
7980 +
7981 +// XInitialization
7982 +void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
7983 + throw ( uno::Exception,
7984 + uno::RuntimeException )
7985 +{
7986 + ::osl::MutexGuard aGuard( maMutex );
7987 +
7988 + if ( mbDisposed )
7989 + throw lang::DisposedException();
7990 +
7991 + if ( mxContainer.is() ) // only 1 init ...
7992 + throw uno::Exception();
7993 +
7994 + if ( !aArguments.getLength() )
7995 + throw lang::IllegalArgumentException();
7996 +
7997 + OSL_ENSURE( aArguments.getLength() == 1, "Wrong arg count\n" );
7998 +
7999 + OUString aXMLName;
8000 + if ( !( aArguments[0] >>= aXMLName ) )
8001 + throw lang::IllegalArgumentException();
8002 +
8003 + uno::Reference< xml::sax::XParser > xParser
8004 + ( mxFactory->createInstance(
8005 + OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ),
8006 + uno::UNO_QUERY );
8007 + OSL_ASSERT( xParser.is() );
8008 + if (! xParser.is())
8009 + {
8010 + throw uno::RuntimeException(
8011 + OUString::createFromAscii( "cannot create sax-parser component" ),
8012 + uno::Reference< uno::XInterface >() );
8013 + }
8014 +
8015 + // FIXME: quite possibly we want to pass this in ...
8016 + uno::Reference< awt::XToolkit > xToolkit;
8017 +
8018 + mxToolkit = uno::Reference< awt::XToolkit >(
8019 + mxFactory->createInstance(
8020 + OUString::createFromAscii( "com.sun.star.awt.Toolkit" ) ),
8021 + uno::UNO_QUERY );
8022 +
8023 + if ( !mxToolkit.is() )
8024 + throw uno::RuntimeException(
8025 + OUString::createFromAscii( "failed to create toolkit!" ),
8026 + uno::Reference< uno::XInterface >() );
8027 +
8028 + OUString aXMLFile = readRightTranslation( aXMLName );
8029 + uno::Reference< io::XInputStream > xStream = getFileAsStream( aXMLFile );
8030 + if (! xStream.is() )
8031 + error( OUString::createFromAscii( "Installation problem: cannot find XML file:" ) + aXMLName );
8032 +
8033 + // error handler, entity resolver omitted
8034 +
8035 + ImportContext *pCtx = new ImportContext( *this );
8036 +
8037 + uno::Reference< xml::input::XRoot > xRoot( pCtx );
8038 + uno::Sequence < uno::Any > aArgs( 1 );
8039 + aArgs[0] <<= xRoot;
8040 + uno::Reference< xml::sax::XDocumentHandler > xDocHandler
8041 + (mxFactory->createInstanceWithArguments
8042 + ( OUString::createFromAscii( "com.sun.star.xml.input.SaxDocumentHandler" ),
8043 + aArgs ), uno::UNO_QUERY );
8044 +
8045 + if (! xDocHandler.is() )
8046 + error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName );
8047 +
8048 + xParser->setDocumentHandler( xDocHandler );
8049 +
8050 + xml::sax::InputSource source;
8051 + source.aInputStream = xStream;
8052 + source.sSystemId = OUString::createFromAscii( "virtual file" );
8053 +
8054 + try
8055 + {
8056 + xParser->parseStream( source );
8057 + }
8058 + catch ( xml::sax::SAXParseException& e )
8059 + {
8060 + OUString c = OUString::createFromAscii( ":" );
8061 + error( aXMLName
8062 + + c + OUString::valueOf( e.LineNumber )
8063 + + c + OUString::valueOf( e.ColumnNumber )
8064 + + c + OUString::createFromAscii( "Sax parse error" ) );
8065 + }
8066 +}
8067 +
8068 +// XLayoutContainer
8069 +uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (uno::RuntimeException)
8070 +{
8071 + return uno::Reference< awt::XLayoutContainer >();
8072 +}
8073 +
8074 +// local helper ...
8075 +void LayoutRoot::addItem( const OUString &rName,
8076 + const uno::Reference< awt::XLayoutConstrains > &xRef )
8077 +{
8078 + maItems[ rName ] = xRef;
8079 +}
8080 +
8081 +// XNameAccess
8082 +uno::Any SAL_CALL LayoutRoot::getByName( const OUString &rName )
8083 + throw ( container::NoSuchElementException,
8084 + lang::WrappedTargetException,
8085 + uno::RuntimeException )
8086 +{
8087 + ::osl::MutexGuard aGuard( maMutex );
8088 + if ( mbDisposed )
8089 + throw lang::DisposedException();
8090 +
8091 + uno::Reference< awt::XLayoutConstrains > xItem;
8092 + ItemHash::iterator i = maItems.find( rName );
8093 + if ( i != maItems.end() )
8094 + xItem = i->second;
8095 + return uno::makeAny( xItem );
8096 +}
8097 +
8098 +sal_Bool SAL_CALL LayoutRoot::hasByName( const OUString &rName )
8099 + throw (uno::RuntimeException)
8100 +{
8101 + ::osl::MutexGuard aGuard( maMutex );
8102 + if ( mbDisposed ) throw lang::DisposedException();
8103 +
8104 + ItemHash::iterator i = maItems.find( rName );
8105 + return i != maItems.end();
8106 +}
8107 +
8108 +uno::Sequence< OUString > SAL_CALL LayoutRoot::getElementNames()
8109 + throw ( uno::RuntimeException )
8110 +{
8111 + ::osl::MutexGuard aGuard( maMutex );
8112 + if ( mbDisposed ) throw lang::DisposedException();
8113 +
8114 + uno::Sequence< OUString > aNames( maItems.size() );
8115 + sal_Int32 nPos = 0;
8116 +
8117 + for ( ItemHash::const_iterator it = maItems.begin();
8118 + it != maItems.end(); it++ )
8119 + aNames[ nPos++ ] = it->first;
8120 +
8121 + return aNames;
8122 +}
8123 +
8124 +uno::Type SAL_CALL LayoutRoot::getElementType()
8125 + throw ( uno::RuntimeException )
8126 +{
8127 + return getCppuType( ( const uno::Reference< awt::XLayoutConstrains >* )NULL );
8128 +}
8129 +
8130 +sal_Bool SAL_CALL LayoutRoot::hasElements()
8131 + throw ( uno::RuntimeException )
8132 +{
8133 + ::osl::MutexGuard aGuard( maMutex );
8134 +
8135 + if ( mbDisposed ) throw lang::DisposedException();
8136 +
8137 + return maItems.size() > 0;
8138 +}
8139 +
8140 +// XComponent
8141 +void SAL_CALL LayoutRoot::dispose()
8142 + throw ( uno::RuntimeException )
8143 +{
8144 + ::osl::MutexGuard aGuard( maMutex );
8145 +
8146 + if ( mbDisposed ) throw lang::DisposedException();
8147 +
8148 + if ( mpListeners )
8149 + {
8150 +
8151 + lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
8152 + mpListeners->disposeAndClear( aSource );
8153 + delete mpListeners;
8154 + mpListeners = NULL;
8155 + }
8156 +
8157 + maItems.clear();
8158 + mbDisposed = sal_True;
8159 +}
8160 +
8161 +void SAL_CALL LayoutRoot::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
8162 + throw ( uno::RuntimeException )
8163 +{
8164 + ::osl::MutexGuard aGuard( maMutex );
8165 +
8166 + if ( mbDisposed ) throw lang::DisposedException();
8167 +
8168 + if ( !mpListeners )
8169 + mpListeners = new ::cppu::OInterfaceContainerHelper( maMutex );
8170 + mpListeners->addInterface( xListener );
8171 +}
8172 +
8173 +void SAL_CALL LayoutRoot::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
8174 + throw ( uno::RuntimeException )
8175 +{
8176 + ::osl::MutexGuard aGuard( maMutex );
8177 +
8178 + if ( mbDisposed ) throw lang::DisposedException();
8179 +
8180 + if ( mpListeners )
8181 + mpListeners->removeInterface( xListener );
8182 +}
8183 +
8184 +// builder
8185 +
8186 +LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attrbs,uno::Reference< awt::XLayoutContainer > xParent )
8187 +{
8188 + LayoutWidget *pWidget = new LayoutWidget( mxToolkit, xParent, unoName, attrbs );
8189 + if ( !mpToplevel )
8190 + {
8191 + mpToplevel = pWidget;
8192 + mxWindow = uno::Reference< awt::XWindow >( pWidget->getPeer(), uno::UNO_QUERY );
8193 + mxContainer = pWidget->mxContainer;
8194 + }
8195 + if ( pWidget->mxContainer.is() )
8196 + pWidget->mxContainer->setLayoutUnit( mxLayoutUnit );
8197 + if ( id.getLength() )
8198 + maItems[ id ] = pWidget->getPeer();
8199 + return pWidget;
8200 +}
8201 +
8202 +#if 0
8203 +uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
8204 +{
8205 + if ( mpToplevel )
8206 + return mpToplevel->getPeer();
8207 + return uno::Reference< awt::XLayoutConstrains > ();
8208 +}
8209 +
8210 +uno::Reference< awt::XLayoutConstrains > LayoutRoot::getById( OUString id )
8211 +{
8212 + uno::Reference< awt::XLayoutConstrains > rRef = 0;
8213 + ItemHash::iterator it = maItems.find( id );
8214 + if ( it != maItems.end() )
8215 + rRef = it->second;
8216 + return rRef;
8217 +}
8218 +#endif
8219 +
8220 +LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
8221 + uno::Reference< awt::XLayoutContainer > xParent,
8222 + OUString unoName, long attrbs )
8223 +{
8224 + while ( xParent.is() && !uno::Reference< awt::XWindow >( xParent, uno::UNO_QUERY ).is() )
8225 + {
8226 + uno::Reference< awt::XLayoutContainer > xContainer( xParent, uno::UNO_QUERY );
8227 + assert( xContainer.is() );
8228 + xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
8229 + }
8230 +
8231 + mxWidget = WidgetFactory::createWidget( xToolkit, xParent, unoName, attrbs );
8232 + assert( mxWidget.is() );
8233 + mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
8234 +}
8235 +
8236 +LayoutWidget::~LayoutWidget()
8237 +{
8238 + /* should we dispose of the references...? */
8239 + // at least of its children... Or should root?
8240 +}
8241 +
8242 +bool LayoutWidget::addChild( LayoutWidget *pChild )
8243 +{
8244 + if ( !mxContainer.is() )
8245 + return false;
8246 +
8247 + try
8248 + {
8249 + mxContainer->addChild( pChild->mxWidget );
8250 + }
8251 + catch( awt::MaxChildrenException ex )
8252 + {
8253 + return false;
8254 + }
8255 + return true;
8256 +}
8257 +
8258 +void LayoutWidget::setProperties( PropList const& rProps )
8259 +{
8260 + ::layoutimpl::setProperties( mxWidget, rProps );
8261 +}
8262 +
8263 +void LayoutWidget::setProperty( OUString const& attr, OUString const& value )
8264 +{
8265 + ::layoutimpl::setProperty( mxWidget, attr, value );
8266 +}
8267 +
8268 +void LayoutWidget::setChildProperties( LayoutWidget *pChild,
8269 + PropList const& rProps )
8270 +{
8271 + uno::Reference< beans::XPropertySet > xChildPeer;
8272 + xChildPeer = mxContainer->getChildProperties( pChild->mxWidget );
8273 +
8274 + if ( xChildPeer.is() )
8275 + ::layoutimpl::setProperties( xChildPeer, rProps );
8276 +}
8277 +
8278 +} // namespace layoutimpl
8279 +
8280 --- toolkit/source/layout/core/root.hxx.old 1970-01-01 00:00:00.000000000 +0000
8281 +++ toolkit/source/layout/core/root.hxx 2009-04-06 16:42:13.000000000 +0000
8282 @@ -0,0 +1,160 @@
8283 +/*************************************************************************
8284 + *
8285 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8286 + *
8287 + * Copyright 2008 by Sun Microsystems, Inc.
8288 + *
8289 + * OpenOffice.org - a multi-platform office productivity suite
8290 + *
8291 + * $RCSfile$
8292 + *
8293 + * $Revision$
8294 + *
8295 + * This file is part of OpenOffice.org.
8296 + *
8297 + * OpenOffice.org is free software: you can redistribute it and/or modify
8298 + * it under the terms of the GNU Lesser General Public License version 3
8299 + * only, as published by the Free Software Foundation.
8300 + *
8301 + * OpenOffice.org is distributed in the hope that it will be useful,
8302 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8303 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8304 + * GNU Lesser General Public License version 3 for more details
8305 + * (a copy is included in the LICENSE file that accompanied this code).
8306 + *
8307 + * You should have received a copy of the GNU Lesser General Public License
8308 + * version 3 along with OpenOffice.org. If not, see
8309 + * <http://www.openoffice.org/license.html>
8310 + * for a copy of the LGPLv3 License.
8311 + *
8312 + ************************************************************************/
8313 +
8314 +#ifndef LAYOUT_CORE_ROOT_HXX
8315 +#define LAYOUT_CORE_ROOT_HXX
8316 +
8317 +#define _BACKWARD_BACKWARD_WARNING_H 1
8318 +#include <hash_map>
8319 +
8320 +#include <com/sun/star/awt/XLayoutRoot.hpp>
8321 +#include <com/sun/star/awt/XToolkit.hpp>
8322 +#include <com/sun/star/awt/XWindow.hpp>
8323 +#include <com/sun/star/io/XInputStream.hpp>
8324 +#include <com/sun/star/lang/XComponent.hpp>
8325 +#include <com/sun/star/lang/XInitialization.hpp>
8326 +#include <cppuhelper/implbase3.hxx>
8327 +#include <cppuhelper/interfacecontainer.h>
8328 +#include <toolkit/dllapi.h>
8329 +
8330 +#include <layout/core/proplist.hxx>
8331 +
8332 +namespace layoutimpl
8333 +{
8334 +
8335 +namespace css = ::com::sun::star;
8336 +
8337 +css::uno::Reference< css::io::XInputStream > getFileAsStream( const rtl::OUString &rName );
8338 +
8339 +/* Interface generation code -- to hook to a parser. */
8340 +
8341 +/*
8342 + TODO: (ricardo) I think we should cut on LayoutRoot, stripping out its widget
8343 + proxy interface (just make it return the root widget). Would even make it easier
8344 + if there was interest to support multiple toplevel widgets in the same file.
8345 +
8346 + We also need to make sure the code gets diposed well... There is no need to keep
8347 + these objects around after initialization...
8348 +*/
8349 +
8350 +
8351 +class LayoutWidget;
8352 +
8353 +class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3<
8354 + css::awt::XLayoutRoot,
8355 + css::lang::XInitialization,
8356 + css::lang::XComponent>
8357 +{
8358 +protected:
8359 + ::osl::Mutex maMutex;
8360 +
8361 + typedef std::hash_map< rtl::OUString,
8362 + css::uno::Reference< css::awt::XLayoutConstrains >,
8363 + ::rtl::OUStringHash > ItemHash;
8364 + ItemHash maItems;
8365 +
8366 + sal_Bool mbDisposed;
8367 + css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
8368 + ::cppu::OInterfaceContainerHelper *mpListeners;
8369 +
8370 + css::uno::Reference< css::awt::XWindow > mxWindow;
8371 + css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
8372 +
8373 + css::uno::Reference< css::awt::XToolkit > mxToolkit;
8374 + LayoutWidget *mpToplevel;
8375 + css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
8376 +
8377 + void error( rtl::OUString const& message );
8378 +
8379 +public:
8380 + LayoutRoot( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
8381 + virtual ~LayoutRoot();
8382 +
8383 + void addItem( const rtl::OUString &rName,
8384 + const css::uno::Reference< css::awt::XLayoutConstrains > &xRef );
8385 +
8386 + void setWindow( css::uno::Reference< css::awt::XLayoutConstrains > xPeer )
8387 + {
8388 + mxWindow = css::uno::Reference< css::awt::XWindow >( xPeer, css::uno::UNO_QUERY );
8389 + }
8390 +
8391 + // get XLayoutContainer
8392 + virtual css::uno::Reference< css::awt::XLayoutContainer > SAL_CALL getLayoutContainer() throw (css::uno::RuntimeException);
8393 +
8394 + // XInitialization
8395 + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException);
8396 +
8397 + // XNameAccess
8398 + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
8399 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException);
8400 + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
8401 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
8402 + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
8403 +
8404 + // XComponent
8405 + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
8406 + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
8407 + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
8408 +
8409 + // generator
8410 + virtual LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs, css::uno::Reference< css::awt::XLayoutContainer > xParent );
8411 +};
8412 +
8413 +class TOOLKIT_DLLPUBLIC LayoutWidget
8414 +{
8415 + friend class LayoutRoot;
8416 +
8417 +public:
8418 + LayoutWidget() {}
8419 + LayoutWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
8420 + css::uno::Reference< css::awt::XLayoutContainer > xToplevel,
8421 + rtl::OUString unoName, long attrbs );
8422 + virtual ~LayoutWidget();
8423 +
8424 + virtual void setProperties( const PropList &rProps );
8425 + virtual void setProperty( rtl::OUString const& attr, rtl::OUString const& value );
8426 +
8427 + virtual bool addChild( LayoutWidget *pChild );
8428 + virtual void setChildProperties( LayoutWidget *pChild, const PropList &rProps );
8429 +
8430 + inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
8431 + { return mxWidget; }
8432 + inline css::uno::Reference< css::awt::XLayoutContainer > getContainer()
8433 + { return mxContainer; }
8434 +
8435 +protected:
8436 + css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
8437 + css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
8438 +};
8439 +
8440 +} // namespace layoutimpl
8441 +
8442 +#endif /* LAYOUT_CORE_ROOT_HXX */
8443 --- toolkit/source/layout/core/table.cxx.old 1970-01-01 00:00:00.000000000 +0000
8444 +++ toolkit/source/layout/core/table.cxx 2009-04-06 16:42:13.000000000 +0000
8445 @@ -0,0 +1,315 @@
8446 +/*************************************************************************
8447 + *
8448 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8449 + *
8450 + * Copyright 2008 by Sun Microsystems, Inc.
8451 + *
8452 + * OpenOffice.org - a multi-platform office productivity suite
8453 + *
8454 + * $RCSfile$
8455 + *
8456 + * $Revision$
8457 + *
8458 + * This file is part of OpenOffice.org.
8459 + *
8460 + * OpenOffice.org is free software: you can redistribute it and/or modify
8461 + * it under the terms of the GNU Lesser General Public License version 3
8462 + * only, as published by the Free Software Foundation.
8463 + *
8464 + * OpenOffice.org is distributed in the hope that it will be useful,
8465 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8466 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8467 + * GNU Lesser General Public License version 3 for more details
8468 + * (a copy is included in the LICENSE file that accompanied this code).
8469 + *
8470 + * You should have received a copy of the GNU Lesser General Public License
8471 + * version 3 along with OpenOffice.org. If not, see
8472 + * <http://www.openoffice.org/license.html>
8473 + * for a copy of the LGPLv3 License.
8474 + *
8475 + ************************************************************************/
8476 +
8477 +#include <table.hxx>
8478 +
8479 +#include <sal/macros.h>
8480 +#include <osl/mutex.hxx>
8481 +#include <cppuhelper/propshlp.hxx>
8482 +#include <cppuhelper/interfacecontainer.h>
8483 +#include <com/sun/star/awt/PosSize.hpp>
8484 +#include <tools/debug.hxx>
8485 +
8486 +// fixed point precision for distributing error
8487 +#define FIXED_PT 16
8488 +
8489 +namespace layoutimpl
8490 +{
8491 +
8492 +using namespace com::sun::star;
8493 +
8494 +Table::ChildProps::ChildProps( Table::ChildData *pData )
8495 + {
8496 + addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
8497 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
8498 + &( pData->mbExpand[ 0 ] ) );
8499 + addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
8500 + ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
8501 + &( pData->mbExpand[ 1 ] ) );
8502 + addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
8503 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
8504 + &( pData->mnColSpan ) );
8505 + addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
8506 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
8507 + &( pData->mnRowSpan ) );
8508 + }
8509 +
8510 +bool Table::ChildData::isVisible()
8511 +{
8512 + return Box_Base::ChildData::isVisible()
8513 + && ( mnColSpan > 0 ) && ( mnRowSpan > 0 );
8514 +}
8515 +
8516 +Table::Table()
8517 + : Box_Base()
8518 + , mnColsLen( 1 )// another default value could be 0xffff for infinite columns( = 1 row )
8519 +{
8520 + addProp( RTL_CONSTASCII_USTRINGPARAM( "Columns" ),
8521 + ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
8522 + &mnColsLen );
8523 +}
8524 +
8525 +Table::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
8526 + : Box_Base::ChildData( xChild )
8527 +// , mbExpand( { 0, 1 } )
8528 + , mnColSpan( 1 )
8529 + , mnRowSpan( 1 )
8530 + , mnLeftCol( 0 )
8531 + , mnRightCol( 0 )
8532 + , mnTopRow( 0 )
8533 + , mnBottomRow( 0 )
8534 + {
8535 + mbExpand[ 0 ] = 0;
8536 + mbExpand[ 1 ] = 1;
8537 +}
8538 +
8539 +Table::ChildData*
8540 +Table::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
8541 + {
8542 + return new ChildData( xChild );
8543 +}
8544 +
8545 +Table::ChildProps*
8546 +Table::createChildProps( Box_Base::ChildData *pData )
8547 +{
8548 + return new ChildProps( static_cast<Table::ChildData*> ( pData ) );
8549 +}
8550 +
8551 +void SAL_CALL
8552 +Table::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
8553 + throw( uno::RuntimeException, awt::MaxChildrenException )
8554 + {
8555 + if ( xChild.is() )
8556 + {
8557 + Box_Base::addChild( xChild );
8558 + // cause of flicker
8559 + allocateChildAt( xChild, awt::Rectangle( 0,0,0,0 ) );
8560 + }
8561 +}
8562 +
8563 +awt::Size SAL_CALL
8564 +Table::getMinimumSize() throw( uno::RuntimeException )
8565 +{
8566 + int nRowsLen = 0;
8567 +
8568 + // 1. layout the table -- adjust to cope with row-spans...
8569 + {
8570 + // temporary 1D representation of the table
8571 + std::vector< ChildData *> aTable;
8572 +
8573 + int col = 0;
8574 + int row = 0;
8575 + for ( std::list<Box_Base::ChildData *>::iterator it
8576 + = maChildren.begin(); it != maChildren.end(); it++ )
8577 + {
8578 + ChildData *child = static_cast<Table::ChildData*> ( *it );
8579 + if ( !child->isVisible() )
8580 + continue;
8581 +
8582 + while ( col + SAL_MIN( child->mnColSpan, mnColsLen ) > mnColsLen )
8583 + {
8584 + col = 0;
8585 + row++;
8586 +
8587 + unsigned int i = col +( row*mnColsLen );
8588 + while ( aTable.size() > i && !aTable[ i ] )
8589 + i++;
8590 +
8591 + col = i % mnColsLen;
8592 + row = i / mnColsLen;
8593 + }
8594 +
8595 + child->mnLeftCol = col;
8596 + child->mnRightCol = SAL_MIN( col + child->mnColSpan, mnColsLen );
8597 + child->mnTopRow = row;
8598 + child->mnBottomRow = row + child->mnRowSpan;
8599 +
8600 + col += child->mnColSpan;
8601 +
8602 + unsigned int start = child->mnLeftCol +( child->mnTopRow*mnColsLen );
8603 + unsigned int end =( child->mnRightCol-1 ) +( ( child->mnBottomRow-1 )*mnColsLen );
8604 + if ( aTable.size() < end+1 )
8605 + aTable.resize( end+1, NULL );
8606 + for ( unsigned int i = start; i < end; i++ )
8607 + aTable[ i ] = child;
8608 +
8609 + nRowsLen = SAL_MAX( nRowsLen, child->mnBottomRow );
8610 + }
8611 + }
8612 +
8613 + // 2. calculate columns/rows sizes
8614 + for ( int g = 0; g < 2; g++ )
8615 + {
8616 + std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
8617 +
8618 + aGroup.clear();
8619 + aGroup.resize( g == 0 ? mnColsLen : nRowsLen );
8620 +
8621 + // 2.1 base sizes on one-column/row children
8622 + for ( std::list<Box_Base::ChildData *>::iterator it
8623 + = maChildren.begin(); it != maChildren.end(); it++ )
8624 + {
8625 + ChildData *child = static_cast<Table::ChildData*> ( *it );
8626 + if ( !child->isVisible() )
8627 + continue;
8628 + const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
8629 + const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
8630 +
8631 + if ( nFirstAttach == nLastAttach-1 )
8632 + {
8633 + child->maRequisition = child->mxChild->getMinimumSize();
8634 + int attach = nFirstAttach;
8635 + int child_size = g == 0 ? child->maRequisition.Width
8636 + : child->maRequisition.Height;
8637 + aGroup[ attach ].mnSize = SAL_MAX( aGroup[ attach ].mnSize,
8638 + child_size );
8639 + if ( child->mbExpand[ g ] )
8640 + aGroup[ attach ].mbExpand = true;
8641 + }
8642 + }
8643 +
8644 + // 2.2 make sure multiple-columns/rows children fit
8645 + for ( std::list<Box_Base::ChildData *>::iterator it
8646 + = maChildren.begin(); it != maChildren.end(); it++ )
8647 + {
8648 + ChildData *child = static_cast<Table::ChildData*> ( *it );
8649 + if ( !child->isVisible() )
8650 + continue;
8651 + const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
8652 + const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
8653 +
8654 + if ( nFirstAttach != nLastAttach-1 )
8655 + {
8656 + child->maRequisition = child->mxChild->getMinimumSize();
8657 + int size = 0;
8658 + int expandables = 0;
8659 + for ( int i = nFirstAttach; i < nLastAttach; i++ )
8660 + {
8661 + size += aGroup[ i ].mnSize;
8662 + if ( aGroup[ i ].mbExpand )
8663 + expandables++;
8664 + }
8665 +
8666 + int child_size = g == 0 ? child->maRequisition.Width
8667 + : child->maRequisition.Height;
8668 + int extra = child_size - size;
8669 + if ( extra > 0 )
8670 + {
8671 + if ( expandables )
8672 + extra /= expandables;
8673 + else
8674 + extra /= nLastAttach - nFirstAttach;
8675 +
8676 + for ( int i = nFirstAttach; i < nLastAttach; i++ )
8677 + if ( expandables == 0 || aGroup[ i ].mbExpand )
8678 + aGroup[ i ].mnSize += extra;
8679 + }
8680 + }
8681 + }
8682 + }
8683 +
8684 + // 3. Sum everything up
8685 + mnColExpandables =( mnRowExpandables = 0 );
8686 + maRequisition.Width =( maRequisition.Height = 0 );
8687 + for ( std::vector<GroupData>::iterator it = maCols.begin();
8688 + it != maCols.end(); it++ )
8689 + {
8690 + maRequisition.Width += it->mnSize;
8691 + if ( it->mbExpand )
8692 + mnColExpandables++;
8693 + }
8694 + for ( std::vector<GroupData>::iterator it = maRows.begin();
8695 + it != maRows.end(); it++ )
8696 + {
8697 + maRequisition.Height += it->mnSize;
8698 + if ( it->mbExpand )
8699 + mnRowExpandables++;
8700 + }
8701 +
8702 + return maRequisition;
8703 +}
8704 +
8705 +void SAL_CALL
8706 +Table::allocateArea( const awt::Rectangle &rArea )
8707 + throw( uno::RuntimeException )
8708 +{
8709 + maAllocation = rArea;
8710 + if ( maCols.size() == 0 || maRows.size() == 0 )
8711 + return;
8712 +
8713 + int nExtraSize[ 2 ] = { SAL_MAX( rArea.Width - maRequisition.Width, 0 ),
8714 + SAL_MAX( rArea.Height - maRequisition.Height, 0 ) };
8715 + // split it
8716 + nExtraSize[ 0 ] /= mnColExpandables ? mnColExpandables : mnColsLen;
8717 + nExtraSize[ 1 ] /= mnRowExpandables ? mnRowExpandables : maRows.size();
8718 +
8719 + for ( std::list<Box_Base::ChildData *>::const_iterator it
8720 + = maChildren.begin(); it != maChildren.end(); it++ )
8721 + {
8722 + ChildData *child = static_cast<Table::ChildData*> ( *it );
8723 + if ( !child->isVisible() )
8724 + continue;
8725 +
8726 + awt::Rectangle rChildArea( rArea.X, rArea.Y, 0, 0 );
8727 +
8728 + for ( int g = 0; g < 2; g++ )
8729 + {
8730 + std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
8731 + const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
8732 + const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
8733 +
8734 + for ( int i = 0; i < nFirstAttach; i++ )
8735 + {
8736 + int gSize = aGroup[ i ].mnSize;
8737 + if ( aGroup[ i ].mbExpand )
8738 + gSize += nExtraSize[ g ];
8739 + if ( g == 0 )
8740 + rChildArea.X += gSize;
8741 + else
8742 + rChildArea.Y += gSize;
8743 + }
8744 + for ( int i = nFirstAttach; i < nLastAttach; i++ )
8745 + {
8746 + int gSize = aGroup[ i ].mnSize;
8747 + if ( aGroup[ i ].mbExpand )
8748 + gSize += nExtraSize[ g ];
8749 + if ( g == 0 )
8750 + rChildArea.Width += gSize;
8751 + else
8752 + rChildArea.Height += gSize;
8753 + }
8754 + }
8755 +
8756 + allocateChildAt( child->mxChild, rChildArea );
8757 + }
8758 +}
8759 +
8760 +} // namespace layoutimpl
8761 --- toolkit/source/layout/core/table.hxx.old 1970-01-01 00:00:00.000000000 +0000
8762 +++ toolkit/source/layout/core/table.hxx 2009-04-06 16:42:13.000000000 +0000
8763 @@ -0,0 +1,108 @@
8764 +/*************************************************************************
8765 + *
8766 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8767 + *
8768 + * Copyright 2008 by Sun Microsystems, Inc.
8769 + *
8770 + * OpenOffice.org - a multi-platform office productivity suite
8771 + *
8772 + * $RCSfile$
8773 + *
8774 + * $Revision$
8775 + *
8776 + * This file is part of OpenOffice.org.
8777 + *
8778 + * OpenOffice.org is free software: you can redistribute it and/or modify
8779 + * it under the terms of the GNU Lesser General Public License version 3
8780 + * only, as published by the Free Software Foundation.
8781 + *
8782 + * OpenOffice.org is distributed in the hope that it will be useful,
8783 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8784 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8785 + * GNU Lesser General Public License version 3 for more details
8786 + * (a copy is included in the LICENSE file that accompanied this code).
8787 + *
8788 + * You should have received a copy of the GNU Lesser General Public License
8789 + * version 3 along with OpenOffice.org. If not, see
8790 + * <http://www.openoffice.org/license.html>
8791 + * for a copy of the LGPLv3 License.
8792 + *
8793 + ************************************************************************/
8794 +
8795 +#ifndef LAYOUT_CORE_TABLE_HXX
8796 +#define LAYOUT_CORE_TABLE_HXX
8797 +
8798 +#include <layout/core/box-base.hxx>
8799 +
8800 +namespace layoutimpl
8801 +{
8802 +
8803 +class Table : public Box_Base
8804 +{
8805 +public:
8806 + // Children properties
8807 + struct ChildData : public Box_Base::ChildData
8808 + {
8809 + sal_Bool mbExpand[ 2 ];
8810 + sal_Int32 mnColSpan;
8811 + sal_Int32 mnRowSpan;
8812 + int mnLeftCol;
8813 + int mnRightCol;
8814 + int mnTopRow;
8815 + int mnBottomRow;
8816 +
8817 + ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
8818 + bool isVisible();
8819 + };
8820 +
8821 + struct ChildProps : public Box_Base::ChildProps
8822 + {
8823 + ChildProps( ChildData *pData );
8824 + };
8825 +
8826 +protected:
8827 +
8828 + // a group of children; either a column or a row
8829 + struct GroupData
8830 + {
8831 + sal_Bool mbExpand;
8832 + int mnSize; // request size (width or height)
8833 + GroupData() : mbExpand( false ), mnSize( 0 ) {}
8834 + };
8835 +
8836 + // Table properties
8837 + sal_Int32 mnColsLen;
8838 + std::vector< GroupData > maCols;
8839 + std::vector< GroupData > maRows;
8840 + int mnColExpandables, mnRowExpandables;
8841 +
8842 + ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
8843 + ChildProps *createChildProps( Box_Base::ChildData* pData );
8844 +
8845 +public:
8846 + Table();
8847 +
8848 + // css::awt::XLayoutContainer
8849 + virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
8850 + throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
8851 +
8852 + virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
8853 + throw (css::uno::RuntimeException);
8854 +
8855 + virtual css::awt::Size SAL_CALL getMinimumSize()
8856 + throw(css::uno::RuntimeException);
8857 +
8858 + // unimplemented:
8859 + virtual sal_Bool SAL_CALL hasHeightForWidth()
8860 + throw(css::uno::RuntimeException)
8861 + { return false; }
8862 + virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 /*nWidth*/ )
8863 + throw(css::uno::RuntimeException)
8864 + { return maRequisition.Height; }
8865 +
8866 + PROPHELPER_SET_INFO
8867 +};
8868 +
8869 +} // namespace layoutimpl
8870 +
8871 +#endif /* LAYOUT_CORE_TABLE_HXX */
8872 --- toolkit/source/layout/core/timer.cxx.old 1970-01-01 00:00:00.000000000 +0000
8873 +++ toolkit/source/layout/core/timer.cxx 2009-04-06 16:42:13.000000000 +0000
8874 @@ -0,0 +1,152 @@
8875 +/*************************************************************************
8876 + *
8877 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8878 + *
8879 + * Copyright 2008 by Sun Microsystems, Inc.
8880 + *
8881 + * OpenOffice.org - a multi-platform office productivity suite
8882 + *
8883 + * $RCSfile$
8884 + *
8885 + * $Revision$
8886 + *
8887 + * This file is part of OpenOffice.org.
8888 + *
8889 + * OpenOffice.org is free software: you can redistribute it and/or modify
8890 + * it under the terms of the GNU Lesser General Public License version 3
8891 + * only, as published by the Free Software Foundation.
8892 + *
8893 + * OpenOffice.org is distributed in the hope that it will be useful,
8894 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8895 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8896 + * GNU Lesser General Public License version 3 for more details
8897 + * (a copy is included in the LICENSE file that accompanied this code).
8898 + *
8899 + * You should have received a copy of the GNU Lesser General Public License
8900 + * version 3 along with OpenOffice.org. If not, see
8901 + * <http://www.openoffice.org/license.html>
8902 + * for a copy of the LGPLv3 License.
8903 + *
8904 + ************************************************************************/
8905 +
8906 +#include "timer.hxx"
8907 +
8908 +#include <vector>
8909 +#include <list>
8910 +#include <vcl/timer.hxx>
8911 +#include <com/sun/star/awt/XLayoutContainer.hpp>
8912 +
8913 +namespace layoutimpl
8914 +{
8915 +using namespace ::com::sun::star;
8916 +
8917 +class AllocateTimer : public Timer
8918 +{
8919 + typedef std::list< uno::Reference< awt::XLayoutContainer > > ContainerList;
8920 + ContainerList mxContainers;
8921 + uno::Reference< awt::XLayoutContainer > mxLastAdded;
8922 +
8923 +public:
8924 + AllocateTimer()
8925 + {
8926 + // timer set to 0 -- just process it as soon as it gets idle
8927 + SetTimeout( 0 );
8928 + }
8929 +
8930 + static inline bool isParentOf( uno::Reference< awt::XLayoutContainer > xParent,
8931 + uno::Reference< awt::XLayoutContainer > xWidget )
8932 + {
8933 + while ( xWidget.is() )
8934 + {
8935 + if ( xWidget == xParent )
8936 + return true;
8937 + xWidget = uno::Reference< awt::XLayoutContainer >( xWidget->getParent(), uno::UNO_QUERY );
8938 + }
8939 + return false;
8940 + }
8941 +
8942 + static inline void eraseChildren( ContainerList::iterator &it, ContainerList &list )
8943 + {
8944 + ContainerList::iterator jt = list.begin();
8945 + while ( jt != list.end() )
8946 + {
8947 + if ( it != jt && isParentOf( *it, *jt ) )
8948 + jt = list.erase( jt );
8949 + else
8950 + jt++;
8951 + }
8952 + }
8953 +
8954 + static inline bool isContainerDamaged( uno::Reference< awt::XLayoutContainer > xContainer )
8955 + {
8956 + uno::Reference< awt::XLayoutConstrains > xConstrains( xContainer, uno::UNO_QUERY );
8957 + awt::Size lastReq( xContainer->getRequestedSize() );
8958 + awt::Size curReq( xConstrains->getMinimumSize() );
8959 + return lastReq.Width != curReq.Width || lastReq.Height != curReq.Height;
8960 + }
8961 +
8962 + void add( const uno::Reference< awt::XLayoutContainer > &xContainer )
8963 + {
8964 + // small optimization
8965 + if ( mxLastAdded == xContainer )
8966 + return;
8967 + mxLastAdded = xContainer;
8968 +
8969 + mxContainers.push_back( xContainer );
8970 + }
8971 +
8972 + virtual void Timeout()
8973 + {
8974 + mxLastAdded = uno::Reference< awt::XLayoutContainer >();
8975 +
8976 + // 1. remove duplications and children
8977 + for ( ContainerList::iterator it = mxContainers.begin();
8978 + it != mxContainers.end(); it++ )
8979 + eraseChildren( it, mxContainers );
8980 +
8981 + // 2. check damage extent
8982 + for ( ContainerList::iterator it = mxContainers.begin();
8983 + it != mxContainers.end(); it++ )
8984 + {
8985 + uno::Reference< awt::XLayoutContainer > xContainer = *it;
8986 + while ( xContainer->getParent().is() && isContainerDamaged( xContainer ) )
8987 + {
8988 + xContainer = uno::Reference< awt::XLayoutContainer >(
8989 + xContainer->getParent(), uno::UNO_QUERY );
8990 + }
8991 +
8992 + if ( *it != xContainer )
8993 + {
8994 + // 2.2 replace it with parent
8995 + *it = xContainer;
8996 +
8997 + // 2.3 remove children of new parent
8998 + eraseChildren( it, mxContainers );
8999 + }
9000 + }
9001 +
9002 + // 3. force re-calculations
9003 + for ( ContainerList::iterator it = mxContainers.begin();
9004 + it != mxContainers.end(); it++ )
9005 + (*it)->allocateArea( (*it)->getAllocatedArea() );
9006 + }
9007 +};
9008 +
9009 +static void AddResizeTimeout( const uno::Reference< awt::XLayoutContainer > &xCont )
9010 +{
9011 + static AllocateTimer timer;
9012 + timer.add( xCont );
9013 + timer.Start();
9014 +}
9015 +
9016 +LayoutUnit::LayoutUnit() : LayoutUnit_Base()
9017 +{
9018 +}
9019 +
9020 +void SAL_CALL LayoutUnit::queueResize( const uno::Reference< awt::XLayoutContainer > &xContainer )
9021 + throw( uno::RuntimeException )
9022 +{
9023 + AddResizeTimeout( xContainer );
9024 +}
9025 +
9026 +}
9027 --- toolkit/source/layout/core/timer.hxx.old 1970-01-01 00:00:00.000000000 +0000
9028 +++ toolkit/source/layout/core/timer.hxx 2009-04-06 16:42:13.000000000 +0000
9029 @@ -0,0 +1,53 @@
9030 +/*************************************************************************
9031 + *
9032 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9033 + *
9034 + * Copyright 2008 by Sun Microsystems, Inc.
9035 + *
9036 + * OpenOffice.org - a multi-platform office productivity suite
9037 + *
9038 + * $RCSfile$
9039 + *
9040 + * $Revision$
9041 + *
9042 + * This file is part of OpenOffice.org.
9043 + *
9044 + * OpenOffice.org is free software: you can redistribute it and/or modify
9045 + * it under the terms of the GNU Lesser General Public License version 3
9046 + * only, as published by the Free Software Foundation.
9047 + *
9048 + * OpenOffice.org is distributed in the hope that it will be useful,
9049 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9050 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9051 + * GNU Lesser General Public License version 3 for more details
9052 + * (a copy is included in the LICENSE file that accompanied this code).
9053 + *
9054 + * You should have received a copy of the GNU Lesser General Public License
9055 + * version 3 along with OpenOffice.org. If not, see
9056 + * <http://www.openoffice.org/license.html>
9057 + * for a copy of the LGPLv3 License.
9058 + *
9059 + ************************************************************************/
9060 +
9061 +#ifndef LAYOUT_CORE_TIMER_HXX
9062 +#define LAYOUT_CORE_TIMER_HXX
9063 +
9064 +#include <com/sun/star/awt/XLayoutUnit.hpp>
9065 +#include <cppuhelper/implbase1.hxx>
9066 +
9067 +namespace layoutimpl
9068 +{
9069 +
9070 +typedef ::cppu::WeakImplHelper1< com::sun::star::awt::XLayoutUnit > LayoutUnit_Base;
9071 +
9072 +class LayoutUnit : public LayoutUnit_Base
9073 +{
9074 +public:
9075 + LayoutUnit();
9076 + void SAL_CALL queueResize( const com::sun::star::uno::Reference< com::sun::star::awt::XLayoutContainer > &xContainer )
9077 + throw( com::sun::star::uno::RuntimeException );
9078 +};
9079 +
9080 +}
9081 +
9082 +#endif /* LAYOUT_CORE_TIMER_HXX */
9083 --- toolkit/source/layout/core/translate.cxx.old 1970-01-01 00:00:00.000000000 +0000
9084 +++ toolkit/source/layout/core/translate.cxx 2009-04-06 16:42:13.000000000 +0000
9085 @@ -0,0 +1,134 @@
9086 +/*************************************************************************
9087 + *
9088 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9089 + *
9090 + * Copyright 2008 by Sun Microsystems, Inc.
9091 + *
9092 + * OpenOffice.org - a multi-platform office productivity suite
9093 + *
9094 + * $RCSfile$
9095 + *
9096 + * $Revision$
9097 + *
9098 + * This file is part of OpenOffice.org.
9099 + *
9100 + * OpenOffice.org is free software: you can redistribute it and/or modify
9101 + * it under the terms of the GNU Lesser General Public License version 3
9102 + * only, as published by the Free Software Foundation.
9103 + *
9104 + * OpenOffice.org is distributed in the hope that it will be useful,
9105 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9106 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9107 + * GNU Lesser General Public License version 3 for more details
9108 + * (a copy is included in the LICENSE file that accompanied this code).
9109 + *
9110 + * You should have received a copy of the GNU Lesser General Public License
9111 + * version 3 along with OpenOffice.org. If not, see
9112 + * <http://www.openoffice.org/license.html>
9113 + * for a copy of the LGPLv3 License.
9114 + *
9115 + ************************************************************************/
9116 +
9117 +#include "translate.hxx"
9118 +
9119 +#include <list>
9120 +#if TEST_LAYOUT
9121 +#include <cstdio>
9122 +#include "tools/getprocessworkingdir.hxx"
9123 +#endif
9124 +
9125 +#include <unotools/bootstrap.hxx>
9126 +#include <unotools/localfilehelper.hxx>
9127 +#include <unotools/ucbhelper.hxx>
9128 +#include <vcl/svapp.hxx>
9129 +
9130 +#include "proplist.hxx"
9131 +
9132 +namespace layoutimpl
9133 +{
9134 +namespace css = ::com::sun::star;
9135 +using namespace css;
9136 +using ::rtl::OUString;
9137 +using ::utl::LocalFileHelper;
9138 +using ::utl::UCBContentHelper;
9139 +using ::utl::Bootstrap;
9140 +
9141 +static std::list<OUString>
9142 +getLocaleSubdirList( lang::Locale const& rLocale )
9143 +{
9144 + std::list<OUString> aSubdirs;
9145 + aSubdirs.push_front( OUString::createFromAscii( "." ) );
9146 + aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
9147 + if ( rLocale.Language.getLength() )
9148 + aSubdirs.push_front( rLocale.Language );
9149 + if ( rLocale.Country.getLength() )
9150 + {
9151 + OUString aLocaleCountry = rLocale.Language
9152 + + OUString::createFromAscii( "_" )
9153 + + rLocale.Country;
9154 + aSubdirs.push_front( aLocaleCountry );
9155 + if ( rLocale.Variant.getLength() )
9156 + aSubdirs.push_front( aLocaleCountry
9157 + + OUString::createFromAscii( "." )
9158 + + rLocale.Variant );
9159 + }
9160 + return aSubdirs;
9161 +}
9162 +
9163 +static bool
9164 +fileExists( String const& aFile )
9165 +{
9166 + String aUrl;
9167 + LocalFileHelper::ConvertPhysicalNameToURL( aFile, aUrl );
9168 + return UCBContentHelper::Exists( aUrl );
9169 +}
9170 +
9171 +static OUString
9172 +getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
9173 + OUString const& aXMLName )
9174 +{
9175 + static OUString const aSlash = OUString::createFromAscii( "/" );
9176 + String aResult;
9177 + for ( std::list<OUString>::const_iterator i = aSubDirs.begin();
9178 + i != aSubDirs.end(); i++ )
9179 + {
9180 + String aFile = aDir + aSlash + *i + aSlash + aXMLName;
9181 + OSL_TRACE( "testing: %s", OUSTRING_CSTR( aFile ) );
9182 + if ( fileExists( aFile ) )
9183 + return aFile;
9184 + }
9185 + return OUString();
9186 +}
9187 +
9188 +/* FIXME: IWBN to share code with impimagetree.cxx, also for reading
9189 + from zip files. */
9190 +OUString
9191 +readRightTranslation( OUString const& aXMLName )
9192 +{
9193 + String aXMLFile;
9194 + std::list<OUString> aSubdirs
9195 + = getLocaleSubdirList( Application::GetSettings().GetUILocale() );
9196 +#if TEST_LAYOUT // read from cwd first
9197 + OUString aCurrentWorkingUrl;
9198 + tools::getProcessWorkingDir( &aCurrentWorkingUrl );
9199 + String aCurrentWorkingDir;
9200 + LocalFileHelper::ConvertURLToPhysicalName( aCurrentWorkingUrl, aCurrentWorkingDir );
9201 + aXMLFile = getFirstExisting( aCurrentWorkingDir, aSubdirs, aXMLName );
9202 + if ( aXMLFile.Len() )
9203 + ;
9204 + else
9205 +#endif /* TEST_LAYOUT */
9206 + {
9207 + OUString aShareUrl;
9208 + Bootstrap::locateSharedData( aShareUrl );
9209 + OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" );
9210 + String aXMLDir;
9211 + LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir );
9212 + aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName );
9213 + }
9214 +
9215 + OSL_TRACE( "FOUND:%s", OUSTRING_CSTR ( OUString (aXMLFile) ) );
9216 + return aXMLFile;
9217 +}
9218 +
9219 +} // namespace layoutimpl
9220 --- toolkit/source/layout/core/translate.hxx.old 1970-01-01 00:00:00.000000000 +0000
9221 +++ toolkit/source/layout/core/translate.hxx 2009-04-06 16:42:13.000000000 +0000
9222 @@ -0,0 +1,44 @@
9223 +/*************************************************************************
9224 + *
9225 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9226 + *
9227 + * Copyright 2008 by Sun Microsystems, Inc.
9228 + *
9229 + * OpenOffice.org - a multi-platform office productivity suite
9230 + *
9231 + * $RCSfile$
9232 + *
9233 + * $Revision$
9234 + *
9235 + * This file is part of OpenOffice.org.
9236 + *
9237 + * OpenOffice.org is free software: you can redistribute it and/or modify
9238 + * it under the terms of the GNU Lesser General Public License version 3
9239 + * only, as published by the Free Software Foundation.
9240 + *
9241 + * OpenOffice.org is distributed in the hope that it will be useful,
9242 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9243 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9244 + * GNU Lesser General Public License version 3 for more details
9245 + * (a copy is included in the LICENSE file that accompanied this code).
9246 + *
9247 + * You should have received a copy of the GNU Lesser General Public License
9248 + * version 3 along with OpenOffice.org. If not, see
9249 + * <http://www.openoffice.org/license.html>
9250 + * for a copy of the LGPLv3 License.
9251 + *
9252 + ************************************************************************/
9253 +
9254 +#ifndef LAYOUT_CORE_TRANSLATE_HXX
9255 +#define LAYOUT_CORE_TRANSLATE_HXX
9256 +
9257 +namespace rtl {
9258 +class OUString;
9259 +} // namespace rtl
9260 +
9261 +namespace layoutimpl
9262 +{
9263 +::rtl::OUString readRightTranslation( ::rtl::OUString const& aXMLName );
9264 +} // namespace layoutimpl
9265 +
9266 +#endif /* LAYOUT_CORE_TRANSLATE_HXX */
9267 --- toolkit/source/layout/core/vcl.cxx.old 1970-01-01 00:00:00.000000000 +0000
9268 +++ toolkit/source/layout/core/vcl.cxx 2009-04-06 16:42:13.000000000 +0000
9269 @@ -0,0 +1,70 @@
9270 +/*************************************************************************
9271 + *
9272 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9273 + *
9274 + * Copyright 2008 by Sun Microsystems, Inc.
9275 + *
9276 + * OpenOffice.org - a multi-platform office productivity suite
9277 + *
9278 + * $RCSfile$
9279 + *
9280 + * $Revision$
9281 + *
9282 + * This file is part of OpenOffice.org.
9283 + *
9284 + * OpenOffice.org is free software: you can redistribute it and/or modify
9285 + * it under the terms of the GNU Lesser General Public License version 3
9286 + * only, as published by the Free Software Foundation.
9287 + *
9288 + * OpenOffice.org is distributed in the hope that it will be useful,
9289 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9290 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9291 + * GNU Lesser General Public License version 3 for more details
9292 + * (a copy is included in the LICENSE file that accompanied this code).
9293 + *
9294 + * You should have received a copy of the GNU Lesser General Public License
9295 + * version 3 along with OpenOffice.org. If not, see
9296 + * <http://www.openoffice.org/license.html>
9297 + * for a copy of the LGPLv3 License.
9298 + *
9299 + ************************************************************************/
9300 +
9301 +#include <vcl.hxx>
9302 +
9303 +#include <sal/types.h>
9304 +#include <vcl/button.hxx>
9305 +
9306 +static PushButton* get_button (Dialog const* dialog, sal_uInt32 type)
9307 +{
9308 + Window* child = dialog->GetWindow (WINDOW_FIRSTCHILD);
9309 + while (child)
9310 + {
9311 + if (child->GetType () == type)
9312 + return static_cast <PushButton*> (child);
9313 + child = child->GetWindow (WINDOW_NEXT);
9314 + }
9315 +
9316 + return 0;
9317 +}
9318 +
9319 +#define IMPLEMENT_CLOSING_DIALOG(cls)\
9320 + Closing##cls::Closing##cls (Window* parent, WinBits bits)\
9321 + : cls (parent, bits)\
9322 + , mClosing (false)\
9323 + {\
9324 + }\
9325 + BOOL Closing##cls::Close ()\
9326 + {\
9327 + if (mClosing)\
9328 + EndDialog (false);\
9329 + else if (PushButton *cancel = get_button (this, WINDOW_CANCELBUTTON))\
9330 + cancel->Click ();\
9331 + else if (PushButton *ok = get_button (this, WINDOW_OKBUTTON))\
9332 + ok->Click ();\
9333 + mClosing = true;\
9334 + return false;\
9335 + }
9336 +
9337 +IMPLEMENT_CLOSING_DIALOG (Dialog);
9338 +IMPLEMENT_CLOSING_DIALOG (ModelessDialog);
9339 +IMPLEMENT_CLOSING_DIALOG (ModalDialog);
9340 --- toolkit/source/layout/core/vcl.hxx.old 1970-01-01 00:00:00.000000000 +0000
9341 +++ toolkit/source/layout/core/vcl.hxx 2009-04-06 16:42:13.000000000 +0000
9342 @@ -0,0 +1,52 @@
9343 +/*************************************************************************
9344 + *
9345 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9346 + *
9347 + * Copyright 2008 by Sun Microsystems, Inc.
9348 + *
9349 + * OpenOffice.org - a multi-platform office productivity suite
9350 + *
9351 + * $RCSfile$
9352 + *
9353 + * $Revision$
9354 + *
9355 + * This file is part of OpenOffice.org.
9356 + *
9357 + * OpenOffice.org is free software: you can redistribute it and/or modify
9358 + * it under the terms of the GNU Lesser General Public License version 3
9359 + * only, as published by the Free Software Foundation.
9360 + *
9361 + * OpenOffice.org is distributed in the hope that it will be useful,
9362 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9363 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9364 + * GNU Lesser General Public License version 3 for more details
9365 + * (a copy is included in the LICENSE file that accompanied this code).
9366 + *
9367 + * You should have received a copy of the GNU Lesser General Public License
9368 + * version 3 along with OpenOffice.org. If not, see
9369 + * <http://www.openoffice.org/license.html>
9370 + * for a copy of the LGPLv3 License.
9371 + *
9372 + ************************************************************************/
9373 +
9374 +#ifndef LAYOUT_CORE_VCL_HXX
9375 +#define LAYOUT_CORE_VCL_HXX
9376 +
9377 +#include <vcl/dialog.hxx>
9378 +
9379 +#define DECLARE_CLOSING_DIALOG(cls)\
9380 + class Closing##cls : public cls\
9381 + {\
9382 + public:\
9383 + bool mClosing;\
9384 + Closing##cls (Window* parent, WinBits bits);\
9385 + virtual BOOL Close ();\
9386 + }
9387 +
9388 +DECLARE_CLOSING_DIALOG (Dialog);
9389 +DECLARE_CLOSING_DIALOG (ModalDialog);
9390 +DECLARE_CLOSING_DIALOG (ModelessDialog);
9391 +
9392 +#undef DECLARE_CLOSING_DIALOG
9393 +
9394 +#endif /* LAYOUT_CORE_VCL_HXX */
9395 --- toolkit/source/layout/dialogbuttonhbox.cxx.old 2009-04-06 16:42:11.000000000 +0000
9396 +++ toolkit/source/layout/dialogbuttonhbox.cxx 1970-01-01 00:00:00.000000000 +0000
9397 @@ -1,294 +0,0 @@
9398 -/*************************************************************************
9399 - *
9400 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9401 - *
9402 - * Copyright 2008 by Sun Microsystems, Inc.
9403 - *
9404 - * OpenOffice.org - a multi-platform office productivity suite
9405 - *
9406 - * $RCSfile: dialogbuttonhbox.cxx,v $
9407 - *
9408 - * $Revision: 1.3 $
9409 - *
9410 - * This file is part of OpenOffice.org.
9411 - *
9412 - * OpenOffice.org is free software: you can redistribute it and/or modify
9413 - * it under the terms of the GNU Lesser General Public License version 3
9414 - * only, as published by the Free Software Foundation.
9415 - *
9416 - * OpenOffice.org is distributed in the hope that it will be useful,
9417 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9418 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9419 - * GNU Lesser General Public License version 3 for more details
9420 - * (a copy is included in the LICENSE file that accompanied this code).
9421 - *
9422 - * You should have received a copy of the GNU Lesser General Public License
9423 - * version 3 along with OpenOffice.org. If not, see
9424 - * <http://www.openoffice.org/license.html>
9425 - * for a copy of the LGPLv3 License.
9426 - *
9427 - ************************************************************************/
9428 -
9429 -#include <awt/vclxbutton.hxx>
9430 -#include <tools/debug.hxx>
9431 -#include <toolkit/awt/vclxwindows.hxx>
9432 -#include <vcl/button.hxx>
9433 -
9434 -#include "dialogbuttonhbox.hxx"
9435 -#include "flow.hxx"
9436 -#include "proplist.hxx"
9437 -
9438 -#if TEST_LAYOUT && !defined( DBG_UTIL )
9439 -#include <cstdio>
9440 -#undef DBG_ERROR
9441 -#define DBG_ERROR printf
9442 -#undef DBG_ERROR1
9443 -#define DBG_ERROR1 printf
9444 -#undef DBG_ERROR2
9445 -#define DBG_ERROR2 printf
9446 -#endif /* TEST_LAYOUT && !DBG_UTIL */
9447 -
9448 -namespace layoutimpl
9449 -{
9450 -
9451 -using namespace css;
9452 -
9453 -//FIXME: how to set platform-dependant variables?
9454 -DialogButtonHBox::Ordering const DialogButtonHBox::DEFAULT_ORDERING =
9455 -#if defined( MACOSX )
9456 - DialogButtonHBox::MACOS;
9457 -#elif defined( SAL_W32 )
9458 -DialogButtonHBox::WINDOWS;
9459 -#elif defined( ENABLE_KDE )
9460 -DialogButtonHBox::KDE;
9461 -#else /* !MACOSX && !SAL_W32 && !ENABLE_KDE */
9462 -DialogButtonHBox::GNOME;
9463 -#endif /* !MACOSX && !SAL_W32 && !ENABLE_KDE */
9464 -
9465 -DialogButtonHBox::DialogButtonHBox()
9466 - : HBox()
9467 - , mnOrdering( DEFAULT_ORDERING )
9468 - , mFlow()
9469 - , mpAction( 0 )
9470 - , mpAffirmative( 0 )
9471 - , mpAlternate( 0 )
9472 - , mpApply( 0 )
9473 - , mpCancel( 0 )
9474 - , mpFlow( createChild( uno::Reference< awt::XLayoutConstrains > ( &mFlow ) ) )
9475 - , mpHelp( 0 )
9476 - , mpReset( 0 )
9477 -{
9478 - mbHomogeneous = true;
9479 -}
9480 -
9481 -void
9482 -DialogButtonHBox::setOrdering( rtl::OUString const& ordering )
9483 -{
9484 - if ( ordering.equalsIgnoreAsciiCaseAscii( "GNOME" ) )
9485 - mnOrdering = GNOME;
9486 - else if ( ordering.equalsIgnoreAsciiCaseAscii( "KDE" ) )
9487 - mnOrdering = KDE;
9488 - else if ( ordering.equalsIgnoreAsciiCaseAscii( "MacOS" ) )
9489 - mnOrdering = MACOS;
9490 - else if ( ordering.equalsIgnoreAsciiCaseAscii( "Windows" ) )
9491 - mnOrdering = WINDOWS;
9492 - else
9493 - {
9494 - DBG_ERROR1( "DialogButtonHBox: no such ordering: %s", OUSTRING_CSTR( ordering ) );
9495 - }
9496 -}
9497 -
9498 -void
9499 -DialogButtonHBox::addChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
9500 - throw ( uno::RuntimeException, awt::MaxChildrenException )
9501 -{
9502 - if ( !xChild.is() )
9503 - return;
9504 -
9505 - ChildData *p = createChild( xChild );
9506 -
9507 -#define IS_BUTTON(t) dynamic_cast<VCLX##t##Button *>( xChild.get () )
9508 -
9509 - /* Sort Retry as Action */
9510 - if ( !mpAction && IS_BUTTON( Retry ) )
9511 - mpAction = p;
9512 - else if ( !mpAffirmative && IS_BUTTON( OK ) )
9513 - mpAffirmative = p;
9514 - else if ( !mpAffirmative && IS_BUTTON( Yes ) )
9515 - mpAffirmative = p;
9516 - else if ( !mpAlternate && IS_BUTTON( No ) )
9517 - mpAlternate = p;
9518 - /* Sort Ignore as Alternate */
9519 - else if ( !mpAlternate && IS_BUTTON( Ignore ) )
9520 - mpAlternate = p;
9521 - else if ( !mpApply && IS_BUTTON( Apply ) )
9522 - mpApply = p;
9523 - else if ( !mpCancel && IS_BUTTON( Cancel ) )
9524 - mpCancel = p;
9525 - /* Let the user overwrite Flow */
9526 - else if ( /* !mpFlow && */ dynamic_cast<Flow *>( xChild.get () ) )
9527 - mpFlow = p;
9528 - else if ( !mpHelp && IS_BUTTON( Help ) )
9529 - mpHelp = p;
9530 - else if ( !mpReset && IS_BUTTON( Reset ) )
9531 - mpReset = p;
9532 - else
9533 - maOther.push_back( p );
9534 - orderChildren();
9535 - setChildParent( xChild );
9536 - queueResize();
9537 -}
9538 -
9539 -void
9540 -DialogButtonHBox::orderChildren()
9541 -{
9542 - if ( mnOrdering == WINDOWS )
9543 - windowsOrdering();
9544 - else if ( mnOrdering == MACOS )
9545 - macosOrdering();
9546 - else if ( mnOrdering == KDE )
9547 - kdeOrdering();
9548 - else if ( 1 || mnOrdering == GNOME )
9549 - gnomeOrdering();
9550 -}
9551 -
9552 -void SAL_CALL
9553 -DialogButtonHBox::removeChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
9554 - throw ( uno::RuntimeException)
9555 -{
9556 - if ( !xChild.is ())
9557 - return;
9558 -
9559 - Box_Base::ChildData *p = 0;
9560 -
9561 - if ( mpAction && mpAction->mxChild == xChild )
9562 - p = mpAction;
9563 - else if ( mpAffirmative && mpAffirmative->mxChild == xChild )
9564 - p = mpAffirmative;
9565 - else if ( mpAlternate && mpAlternate->mxChild == xChild )
9566 - p = mpAlternate;
9567 - else if ( mpApply && mpApply->mxChild == xChild )
9568 - p = mpApply;
9569 - else if ( mpCancel && mpCancel->mxChild == xChild )
9570 - p = mpCancel;
9571 - else if ( mpFlow && mpFlow->mxChild == xChild )
9572 - p = mpFlow;
9573 - else if ( mpReset && mpReset->mxChild == xChild )
9574 - p = mpReset;
9575 - else if ( mpHelp && mpHelp->mxChild == xChild )
9576 - p = mpHelp;
9577 - else
9578 - p = removeChildData( maOther, xChild );
9579 -
9580 - if ( p )
9581 - {
9582 - delete p;
9583 - unsetChildParent( xChild );
9584 - orderChildren();
9585 - queueResize();
9586 - }
9587 - else
9588 - {
9589 - DBG_ERROR( "DialogButtonHBox: removeChild: no such child" );
9590 - }
9591 -}
9592 -
9593 -void
9594 -DialogButtonHBox::gnomeOrdering()
9595 -{
9596 - std::list< Box_Base::ChildData * > ordered;
9597 - if ( mpHelp )
9598 - ordered.push_back( mpHelp );
9599 - if ( mpReset )
9600 - ordered.push_back( mpReset );
9601 - if ( mpFlow && ( mpHelp || mpReset ) )
9602 - ordered.push_back( mpFlow );
9603 - ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
9604 - if ( mpAction )
9605 - ordered.push_back( mpAction );
9606 - if ( mpApply )
9607 - ordered.push_back( mpApply );
9608 - if ( mpAlternate )
9609 - ordered.push_back( mpAlternate );
9610 - if ( mpCancel )
9611 - ordered.push_back( mpCancel );
9612 - if ( mpAffirmative )
9613 - ordered.push_back( mpAffirmative );
9614 - maChildren = ordered;
9615 -}
9616 -
9617 -void
9618 -DialogButtonHBox::kdeOrdering()
9619 -{
9620 - std::list< Box_Base::ChildData * > ordered;
9621 - if ( mpHelp )
9622 - ordered.push_back( mpHelp );
9623 - if ( mpReset )
9624 - ordered.push_back( mpReset );
9625 - if ( mpFlow && ( mpHelp || mpReset ) )
9626 - ordered.push_back( mpFlow );
9627 - ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
9628 - if ( mpAction )
9629 - ordered.push_back( mpAction );
9630 - if ( mpAffirmative )
9631 - ordered.push_back( mpAffirmative );
9632 - if ( mpApply )
9633 - ordered.push_back( mpApply );
9634 - if ( mpAlternate )
9635 - ordered.push_back( mpAlternate );
9636 - if ( mpCancel )
9637 - ordered.push_back( mpCancel );
9638 - maChildren = ordered;
9639 -}
9640 -
9641 -void
9642 -DialogButtonHBox::macosOrdering()
9643 -{
9644 - std::list< Box_Base::ChildData * > ordered;
9645 - if ( mpHelp )
9646 - ordered.push_back( mpHelp );
9647 - if ( mpReset )
9648 - ordered.push_back( mpReset );
9649 - if ( mpApply )
9650 - ordered.push_back( mpApply );
9651 - if ( mpAction )
9652 - ordered.push_back( mpAction );
9653 - ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
9654 - if ( mpFlow ) // Always flow? && ( maOther.size () || mpHelp || mpReset || mpAction ) )
9655 - ordered.push_back( mpFlow );
9656 - if ( mpAlternate )
9657 - ordered.push_back( mpAlternate );
9658 - if ( mpFlow && mpAlternate )
9659 - ordered.push_back( mpFlow );
9660 - if ( mpCancel )
9661 - ordered.push_back( mpCancel );
9662 - if ( mpAffirmative )
9663 - ordered.push_back( mpAffirmative );
9664 - maChildren = ordered;
9665 -}
9666 -
9667 -void
9668 -DialogButtonHBox::windowsOrdering()
9669 -{
9670 - std::list< Box_Base::ChildData * > ordered;
9671 - if ( mpReset )
9672 - ordered.push_back( mpReset );
9673 - if ( mpReset && mpFlow )
9674 - ordered.push_back( mpFlow );
9675 - if ( mpAffirmative )
9676 - ordered.push_back( mpAffirmative );
9677 - if ( mpAlternate )
9678 - ordered.push_back( mpAlternate );
9679 - if ( mpAction )
9680 - ordered.push_back( mpAction );
9681 - if ( mpCancel )
9682 - ordered.push_back( mpCancel );
9683 - if ( mpApply )
9684 - ordered.push_back( mpApply );
9685 - ordered.insert( ordered.end(), maOther.begin(), maOther.end() );
9686 - if ( mpHelp )
9687 - ordered.push_back( mpHelp );
9688 - maChildren = ordered;
9689 -}
9690 -
9691 -} // namespace layoutimpl
9692 --- toolkit/source/layout/dialogbuttonhbox.hxx.old 2009-04-02 10:49:36.000000000 +0000
9693 +++ toolkit/source/layout/dialogbuttonhbox.hxx 1970-01-01 00:00:00.000000000 +0000
9694 @@ -1,77 +0,0 @@
9695 -/*************************************************************************
9696 - *
9697 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9698 - *
9699 - * Copyright 2008 by Sun Microsystems, Inc.
9700 - *
9701 - * OpenOffice.org - a multi-platform office productivity suite
9702 - *
9703 - * $RCSfile: dialogbuttonhbox.hxx,v $
9704 - *
9705 - * $Revision: 1.3 $
9706 - *
9707 - * This file is part of OpenOffice.org.
9708 - *
9709 - * OpenOffice.org is free software: you can redistribute it and/or modify
9710 - * it under the terms of the GNU Lesser General Public License version 3
9711 - * only, as published by the Free Software Foundation.
9712 - *
9713 - * OpenOffice.org is distributed in the hope that it will be useful,
9714 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9715 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9716 - * GNU Lesser General Public License version 3 for more details
9717 - * (a copy is included in the LICENSE file that accompanied this code).
9718 - *
9719 - * You should have received a copy of the GNU Lesser General Public License
9720 - * version 3 along with OpenOffice.org. If not, see
9721 - * <http://www.openoffice.org/license.html>
9722 - * for a copy of the LGPLv3 License.
9723 - *
9724 - ************************************************************************/
9725 -
9726 -#ifndef CORE_DIALOGBUTTONHBOX_HXX
9727 -#define CORE_DIALOGBUTTONHBOX_HXX
9728 -
9729 -#include "box.hxx"
9730 -#include "flow.hxx"
9731 -
9732 -namespace layoutimpl
9733 -{
9734 -
9735 -class DialogButtonHBox : public HBox
9736 -{
9737 -public:
9738 - DialogButtonHBox();
9739 -
9740 - void setOrdering( rtl::OUString const& ordering );
9741 - void SAL_CALL addChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) throw ( css::uno::RuntimeException, css::awt::MaxChildrenException );
9742 - void SAL_CALL removeChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild ) throw ( css::uno::RuntimeException );
9743 -
9744 -private:
9745 - enum Ordering { PLATFORM, GNOME, KDE, MACOS, WINDOWS };
9746 -
9747 - void orderChildren();
9748 - void gnomeOrdering();
9749 - void kdeOrdering();
9750 - void macosOrdering();
9751 - void windowsOrdering();
9752 -
9753 - static Ordering const DEFAULT_ORDERING;
9754 - Ordering mnOrdering;
9755 - Flow mFlow;
9756 -
9757 - ChildData *mpAction; /* [..]?, [Retry?] */
9758 - ChildData *mpAffirmative; /* OK, Yes, Save */
9759 - ChildData *mpAlternate; /* NO, [Ignore?], Don't save, Quit without saving */
9760 - ChildData *mpApply; /* Deprecated? */
9761 - ChildData *mpCancel; /* Cancel, Close */
9762 - ChildData *mpFlow;
9763 - ChildData *mpHelp;
9764 - ChildData *mpReset;
9765 -
9766 - std::list< Box_Base::ChildData *> maOther;
9767 -};
9768 -
9769 -} // namespace layoutimpl
9770 -
9771 -#endif /* CORE_DIALOGBUTTONHBOX_HXX */
9772 --- toolkit/source/layout/factory.cxx.old 2009-04-02 10:49:36.000000000 +0000
9773 +++ toolkit/source/layout/factory.cxx 1970-01-01 00:00:00.000000000 +0000
9774 @@ -1,154 +0,0 @@
9775 -/*************************************************************************
9776 - *
9777 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9778 - *
9779 - * Copyright 2008 by Sun Microsystems, Inc.
9780 - *
9781 - * OpenOffice.org - a multi-platform office productivity suite
9782 - *
9783 - * $RCSfile: factory.cxx,v $
9784 - *
9785 - * $Revision: 1.3 $
9786 - *
9787 - * This file is part of OpenOffice.org.
9788 - *
9789 - * OpenOffice.org is free software: you can redistribute it and/or modify
9790 - * it under the terms of the GNU Lesser General Public License version 3
9791 - * only, as published by the Free Software Foundation.
9792 - *
9793 - * OpenOffice.org is distributed in the hope that it will be useful,
9794 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9795 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9796 - * GNU Lesser General Public License version 3 for more details
9797 - * (a copy is included in the LICENSE file that accompanied this code).
9798 - *
9799 - * You should have received a copy of the GNU Lesser General Public License
9800 - * version 3 along with OpenOffice.org. If not, see
9801 - * <http://www.openoffice.org/license.html>
9802 - * for a copy of the LGPLv3 License.
9803 - *
9804 - ************************************************************************/
9805 -
9806 -#include "factory.hxx"
9807 -
9808 -#include <com/sun/star/registry/XRegistryKey.hpp>
9809 -#include <com/sun/star/registry/InvalidRegistryException.hpp>
9810 -#include <cppuhelper/factory.hxx>
9811 -
9812 -#include "root.hxx"
9813 -
9814 -using namespace ::com::sun::star;
9815 -using namespace layoutimpl;
9816 -
9817 -void * SAL_CALL comp_Layout_component_getFactory( const char * pImplName, void * pServiceManager, void * /*registryKey*/ )
9818 -{
9819 - void * pRet = 0;
9820 -
9821 - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
9822 - uno::Reference< lang::XSingleServiceFactory > xFactory;
9823 -
9824 - if ( pServiceManager && aImplName.equals( LayoutFactory::impl_staticGetImplementationName() ) )
9825 - xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory*>( pServiceManager ),
9826 - LayoutFactory::impl_staticGetImplementationName(),
9827 - LayoutFactory::impl_staticCreateSelfInstance,
9828 - LayoutFactory::impl_staticGetSupportedServiceNames() );
9829 - if ( xFactory.is() )
9830 - {
9831 - xFactory->acquire();
9832 - pRet = xFactory.get();
9833 - }
9834 -
9835 - return pRet;
9836 -}
9837 -
9838 -sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, void * pRegistryKey )
9839 -{
9840 - if ( pRegistryKey )
9841 - {
9842 - try
9843 - {
9844 - uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
9845 - uno::Reference< registry::XRegistryKey > xNewKey;
9846 -
9847 - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
9848 - LayoutFactory::impl_staticGetImplementationName() +
9849 - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
9850 -
9851 - const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
9852 - for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
9853 - xNewKey->createKey( aServices.getConstArray()[i] );
9854 -
9855 - return sal_True;
9856 - }
9857 - catch (registry::InvalidRegistryException &)
9858 - {
9859 - OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
9860 - }
9861 - }
9862 - return sal_False;
9863 -}
9864 -
9865 -// Component registration
9866 -::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
9867 -{
9868 - return ::rtl::OUString::createFromAscii( "com.sun.star.comp.awt.Layout" );
9869 -}
9870 -
9871 -uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::impl_staticGetSupportedServiceNames()
9872 -{
9873 - uno::Sequence< ::rtl::OUString > aRet(2);
9874 - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.awt.Layout");
9875 - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.awt.Layout");
9876 - return aRet;
9877 -}
9878 -
9879 -uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::impl_staticCreateSelfInstance(
9880 - const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
9881 -{
9882 - return uno::Reference< uno::XInterface >( *new LayoutFactory( xServiceManager ) );
9883 -}
9884 -
9885 -// XServiceInfo
9886 -::rtl::OUString SAL_CALL LayoutFactory::getImplementationName()
9887 - throw ( uno::RuntimeException )
9888 -{
9889 - return impl_staticGetImplementationName();
9890 -}
9891 -
9892 -uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::getSupportedServiceNames()
9893 - throw ( uno::RuntimeException )
9894 -{
9895 - return impl_staticGetSupportedServiceNames();
9896 -}
9897 -
9898 -sal_Bool SAL_CALL LayoutFactory::supportsService( const ::rtl::OUString& ServiceName )
9899 - throw ( uno::RuntimeException )
9900 -{
9901 - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
9902 - for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
9903 - if ( ServiceName.compareTo( aSeq[i] ) == 0 )
9904 - return sal_True;
9905 -
9906 - return sal_False;
9907 -}
9908 -
9909 -// XSingleServiceFactory
9910 -uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::createInstance()
9911 - throw ( uno::Exception,
9912 - uno::RuntimeException )
9913 -{
9914 - return uno::Reference< uno::XInterface >(
9915 - static_cast< OWeakObject* >( new LayoutRoot( m_xFactory ) ),
9916 - uno::UNO_QUERY );
9917 -}
9918 -
9919 -uno::Reference< uno::XInterface > SAL_CALL LayoutFactory::createInstanceWithArguments(
9920 - const uno::Sequence< uno::Any >& aArguments )
9921 - throw ( uno::Exception,
9922 - uno::RuntimeException )
9923 -{
9924 - uno::Reference< uno::XInterface > layout = createInstance();
9925 - uno::Reference< lang::XInitialization > xInit( layout, uno::UNO_QUERY );
9926 - xInit->initialize( aArguments );
9927 - return layout;
9928 -}
9929 --- toolkit/source/layout/factory.hxx.old 2009-04-02 10:49:36.000000000 +0000
9930 +++ toolkit/source/layout/factory.hxx 1970-01-01 00:00:00.000000000 +0000
9931 @@ -1,78 +0,0 @@
9932 -/*************************************************************************
9933 - *
9934 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9935 - *
9936 - * Copyright 2008 by Sun Microsystems, Inc.
9937 - *
9938 - * OpenOffice.org - a multi-platform office productivity suite
9939 - *
9940 - * $RCSfile: factory.hxx,v $
9941 - *
9942 - * $Revision: 1.3 $
9943 - *
9944 - * This file is part of OpenOffice.org.
9945 - *
9946 - * OpenOffice.org is free software: you can redistribute it and/or modify
9947 - * it under the terms of the GNU Lesser General Public License version 3
9948 - * only, as published by the Free Software Foundation.
9949 - *
9950 - * OpenOffice.org is distributed in the hope that it will be useful,
9951 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9952 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9953 - * GNU Lesser General Public License version 3 for more details
9954 - * (a copy is included in the LICENSE file that accompanied this code).
9955 - *
9956 - * You should have received a copy of the GNU Lesser General Public License
9957 - * version 3 along with OpenOffice.org. If not, see
9958 - * <http://www.openoffice.org/license.html>
9959 - * for a copy of the LGPLv3 License.
9960 - *
9961 - ************************************************************************/
9962 -
9963 -#ifndef FACTORY_HXX_
9964 -#define FACTORY_HXX_
9965 -
9966 -#include <com/sun/star/lang/XSingleServiceFactory.hpp>
9967 -#include <com/sun/star/lang/XServiceInfo.hpp>
9968 -#include <cppuhelper/implbase2.hxx>
9969 -#include <toolkit/dllapi.h>
9970 -
9971 -namespace layoutimpl
9972 -{
9973 -class Layout;
9974 -}
9975 -
9976 -class TOOLKIT_DLLPUBLIC LayoutFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
9977 - ::com::sun::star::lang::XServiceInfo >
9978 -{
9979 - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
9980 -
9981 -public:
9982 - LayoutFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
9983 - : m_xFactory( xFactory )
9984 - {
9985 - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" );
9986 - }
9987 -
9988 - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
9989 - impl_staticGetSupportedServiceNames();
9990 -
9991 - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
9992 -
9993 - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
9994 - impl_staticCreateSelfInstance(
9995 - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
9996 -
9997 -
9998 - // XSingleServiceFactory
9999 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
10000 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
10001 -
10002 - // XServiceInfo
10003 - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
10004 - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
10005 - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
10006 -
10007 -};
10008 -
10009 -#endif /* FACTORY_HXX */
10010 --- toolkit/source/layout/flow.cxx.old 2009-04-02 10:49:36.000000000 +0000
10011 +++ toolkit/source/layout/flow.cxx 1970-01-01 00:00:00.000000000 +0000
10012 @@ -1,207 +0,0 @@
10013 -/*************************************************************************
10014 - *
10015 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10016 - *
10017 - * Copyright 2008 by Sun Microsystems, Inc.
10018 - *
10019 - * OpenOffice.org - a multi-platform office productivity suite
10020 - *
10021 - * $RCSfile: flow.cxx,v $
10022 - *
10023 - * $Revision: 1.3 $
10024 - *
10025 - * This file is part of OpenOffice.org.
10026 - *
10027 - * OpenOffice.org is free software: you can redistribute it and/or modify
10028 - * it under the terms of the GNU Lesser General Public License version 3
10029 - * only, as published by the Free Software Foundation.
10030 - *
10031 - * OpenOffice.org is distributed in the hope that it will be useful,
10032 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10033 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10034 - * GNU Lesser General Public License version 3 for more details
10035 - * (a copy is included in the LICENSE file that accompanied this code).
10036 - *
10037 - * You should have received a copy of the GNU Lesser General Public License
10038 - * version 3 along with OpenOffice.org. If not, see
10039 - * <http://www.openoffice.org/license.html>
10040 - * for a copy of the LGPLv3 License.
10041 - *
10042 - ************************************************************************/
10043 -
10044 -#include "flow.hxx"
10045 -
10046 -#include <sal/macros.h>
10047 -
10048 -namespace layoutimpl
10049 -{
10050 -
10051 -using namespace css;
10052 -
10053 -bool Flow::ChildData::isVisible()
10054 -{
10055 - return xChild.is();
10056 -}
10057 -
10058 -Flow::Flow()
10059 - : Container()
10060 - , mnSpacing( 0 )
10061 - , mbHomogeneous( false )
10062 -{
10063 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ),
10064 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
10065 - &mbHomogeneous );
10066 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Spacing" ),
10067 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
10068 - &mnSpacing );
10069 -}
10070 -
10071 -void SAL_CALL
10072 -Flow::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
10073 - throw (uno::RuntimeException, css::awt::MaxChildrenException)
10074 -{
10075 - if ( xChild.is() )
10076 - {
10077 - ChildData *pData = new ChildData();
10078 - pData->xChild = xChild;
10079 - maChildren.push_back( pData );
10080 -
10081 - setChildParent( xChild );
10082 - queueResize();
10083 - }
10084 -}
10085 -
10086 -void SAL_CALL
10087 -Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild )
10088 - throw (css::uno::RuntimeException)
10089 -{
10090 - for ( std::list< ChildData * >::iterator it = maChildren.begin();
10091 - it != maChildren.end(); it++ )
10092 - {
10093 - if ( (*it)->xChild == xChild )
10094 - {
10095 - delete *it;
10096 - maChildren.erase( it );
10097 -
10098 - unsetChildParent( xChild );
10099 - queueResize();
10100 - break;
10101 - }
10102 - }
10103 -}
10104 -
10105 -css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > SAL_CALL
10106 -Flow::getChildren()
10107 - throw (css::uno::RuntimeException)
10108 -{
10109 - uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
10110 - unsigned int i = 0;
10111 - for ( std::list< ChildData * >::iterator it = maChildren.begin();
10112 - it != maChildren.end(); it++, i++ )
10113 - children[i] = (*it)->xChild;
10114 -
10115 - return children;
10116 -}
10117 -
10118 -uno::Reference< beans::XPropertySet > SAL_CALL
10119 -Flow::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& /*xChild*/ )
10120 - throw (uno::RuntimeException)
10121 -{
10122 - return uno::Reference< beans::XPropertySet >();
10123 -}
10124 -
10125 -css::awt::Size
10126 -Flow::calculateSize( long nMaxWidth )
10127 -{
10128 - long nNeedHeight = 0;
10129 -
10130 - std::list<ChildData *>::const_iterator it;
10131 - mnEachWidth = 0;
10132 - // first pass, for homogeneous property
10133 - for (it = maChildren.begin(); it != maChildren.end(); it++)
10134 - {
10135 - if ( !(*it)->isVisible() )
10136 - continue;
10137 - (*it)->aRequisition = (*it)->xChild->getMinimumSize();
10138 - if ( mbHomogeneous )
10139 - mnEachWidth = SAL_MAX( mnEachWidth, (*it)->aRequisition.Width );
10140 - }
10141 -
10142 - long nRowWidth = 0, nRowHeight = 0;
10143 - for (it = maChildren.begin(); it != maChildren.end(); it++)
10144 - {
10145 - if ( !(*it)->isVisible() )
10146 - continue;
10147 -
10148 - awt::Size aChildSize = (*it)->aRequisition;
10149 - if ( mbHomogeneous )
10150 - aChildSize.Width = mnEachWidth;
10151 -
10152 - if ( nMaxWidth && nRowWidth > 0 && nRowWidth + aChildSize.Width > nMaxWidth )
10153 - {
10154 - nRowWidth = 0;
10155 - nNeedHeight += nRowHeight;
10156 - nRowHeight = 0;
10157 - }
10158 - nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
10159 - nRowWidth += aChildSize.Width;
10160 - }
10161 - nNeedHeight += nRowHeight;
10162 -
10163 - return awt::Size( nRowWidth, nNeedHeight );
10164 -}
10165 -
10166 -awt::Size SAL_CALL
10167 -Flow::getMinimumSize() throw(uno::RuntimeException)
10168 -{
10169 - return maRequisition = calculateSize( 0 );
10170 -}
10171 -
10172 -sal_Bool SAL_CALL
10173 -Flow::hasHeightForWidth()
10174 - throw(css::uno::RuntimeException)
10175 -{
10176 - return true;
10177 -}
10178 -
10179 -sal_Int32 SAL_CALL
10180 -Flow::getHeightForWidth( sal_Int32 nWidth )
10181 - throw(css::uno::RuntimeException)
10182 -{
10183 - return calculateSize( nWidth ).Height;
10184 -}
10185 -
10186 -void SAL_CALL
10187 -Flow::allocateArea( const css::awt::Rectangle &rArea )
10188 - throw (css::uno::RuntimeException)
10189 -{
10190 - maAllocation = rArea;
10191 -
10192 - std::list<ChildData *>::const_iterator it;
10193 - long nX = 0, nY = 0, nRowHeight = 0;
10194 - for (it = maChildren.begin(); it != maChildren.end(); it++)
10195 - {
10196 - ChildData *child = *it;
10197 - if ( !child->isVisible() )
10198 - continue;
10199 -
10200 - awt::Size aChildSize( child->aRequisition );
10201 - if ( mbHomogeneous )
10202 - aChildSize.Width = mnEachWidth;
10203 -
10204 - if ( nX > 0 && nX + aChildSize.Width > rArea.Width )
10205 - {
10206 - nX = 0;
10207 - nY += nRowHeight;
10208 - nRowHeight = 0;
10209 - }
10210 - nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
10211 -
10212 - allocateChildAt( child->xChild,
10213 - awt::Rectangle( rArea.X + nX, rArea.Y + nY, aChildSize.Width, aChildSize.Height ) );
10214 -
10215 - nX += aChildSize.Width;
10216 - }
10217 -}
10218 -
10219 -} // namespace layoutimpl
10220 --- toolkit/source/layout/flow.hxx.old 2009-04-02 10:49:36.000000000 +0000
10221 +++ toolkit/source/layout/flow.hxx 1970-01-01 00:00:00.000000000 +0000
10222 @@ -1,99 +0,0 @@
10223 -/*************************************************************************
10224 - *
10225 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10226 - *
10227 - * Copyright 2008 by Sun Microsystems, Inc.
10228 - *
10229 - * OpenOffice.org - a multi-platform office productivity suite
10230 - *
10231 - * $RCSfile: flow.hxx,v $
10232 - *
10233 - * $Revision: 1.3 $
10234 - *
10235 - * This file is part of OpenOffice.org.
10236 - *
10237 - * OpenOffice.org is free software: you can redistribute it and/or modify
10238 - * it under the terms of the GNU Lesser General Public License version 3
10239 - * only, as published by the Free Software Foundation.
10240 - *
10241 - * OpenOffice.org is distributed in the hope that it will be useful,
10242 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10243 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10244 - * GNU Lesser General Public License version 3 for more details
10245 - * (a copy is included in the LICENSE file that accompanied this code).
10246 - *
10247 - * You should have received a copy of the GNU Lesser General Public License
10248 - * version 3 along with OpenOffice.org. If not, see
10249 - * <http://www.openoffice.org/license.html>
10250 - * for a copy of the LGPLv3 License.
10251 - *
10252 - ************************************************************************/
10253 -
10254 -#ifndef CORE_FLOW_HXX
10255 -#define CORE_FLOW_HXX
10256 -
10257 -#include "container.hxx"
10258 -
10259 -#include <list>
10260 -
10261 -namespace layoutimpl
10262 -{
10263 -
10264 -class Flow : public Container
10265 -{
10266 -protected:
10267 - // Box properties (i.e. affect all children)
10268 - sal_Int32 mnSpacing;
10269 - sal_Bool mbHomogeneous;
10270 -
10271 -public:
10272 - // Children properties
10273 - struct ChildData
10274 - {
10275 - css::awt::Size aRequisition;
10276 - css::uno::Reference< css::awt::XLayoutConstrains > xChild;
10277 - css::uno::Reference< css::beans::XPropertySet > xProps;
10278 - bool isVisible();
10279 - };
10280 -
10281 -protected:
10282 - std::list< ChildData * > maChildren;
10283 - long mnEachWidth; // on homogeneous, the width of every child
10284 -
10285 -public:
10286 - Flow();
10287 -
10288 - // css::awt::XLayoutContainer
10289 - virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
10290 - throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
10291 - virtual void SAL_CALL removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
10292 - throw (css::uno::RuntimeException);
10293 -
10294 - virtual css::uno::Sequence< css::uno::Reference
10295 - < css::awt::XLayoutConstrains > > SAL_CALL getChildren()
10296 - throw (css::uno::RuntimeException);
10297 -
10298 - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getChildProperties(
10299 - const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
10300 - throw (css::uno::RuntimeException);
10301 -
10302 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
10303 - throw (css::uno::RuntimeException);
10304 -
10305 - virtual css::awt::Size SAL_CALL getMinimumSize()
10306 - throw(css::uno::RuntimeException);
10307 - virtual sal_Bool SAL_CALL hasHeightForWidth()
10308 - throw(css::uno::RuntimeException);
10309 - virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
10310 - throw(css::uno::RuntimeException);
10311 -
10312 -PROPHELPER_SET_INFO
10313 -
10314 -private:
10315 - // shared between getMinimumSize() and getHeightForWidth()
10316 - css::awt::Size calculateSize( long nMaxWidth );
10317 -};
10318 -
10319 -} // namespace layoutimpl
10320 -
10321 -#endif /*FLOW_CORE_HXX*/
10322 --- toolkit/source/layout/helper.cxx.old 2009-04-06 16:42:11.000000000 +0000
10323 +++ toolkit/source/layout/helper.cxx 1970-01-01 00:00:00.000000000 +0000
10324 @@ -1,573 +0,0 @@
10325 -/*************************************************************************
10326 - *
10327 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10328 - *
10329 - * Copyright 2008 by Sun Microsystems, Inc.
10330 - *
10331 - * OpenOffice.org - a multi-platform office productivity suite
10332 - *
10333 - * $RCSfile: helper.cxx,v $
10334 - *
10335 - * $Revision: 1.3 $
10336 - *
10337 - * This file is part of OpenOffice.org.
10338 - *
10339 - * OpenOffice.org is free software: you can redistribute it and/or modify
10340 - * it under the terms of the GNU Lesser General Public License version 3
10341 - * only, as published by the Free Software Foundation.
10342 - *
10343 - * OpenOffice.org is distributed in the hope that it will be useful,
10344 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10345 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10346 - * GNU Lesser General Public License version 3 for more details
10347 - * (a copy is included in the LICENSE file that accompanied this code).
10348 - *
10349 - * You should have received a copy of the GNU Lesser General Public License
10350 - * version 3 along with OpenOffice.org. If not, see
10351 - * <http://www.openoffice.org/license.html>
10352 - * for a copy of the LGPLv3 License.
10353 - *
10354 - ************************************************************************/
10355 -
10356 -#include "helper.hxx"
10357 -
10358 -#include <assert.h>
10359 -#include <list>
10360 -#include <com/sun/star/awt/WindowAttribute.hpp>
10361 -#include <com/sun/star/awt/XWindow.hpp>
10362 -#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
10363 -#include <toolkit/awt/vclxwindow.hxx>
10364 -#include <tools/debug.hxx>
10365 -
10366 -#include "proplist.hxx"
10367 -#include "layout/layoutcore.hxx"
10368 -
10369 -#if TEST_LAYOUT && !defined( DBG_UTIL )
10370 -#include <cstdio>
10371 -#undef DBG_ERROR
10372 -#define DBG_ERROR printf
10373 -#undef DBG_ERROR1
10374 -#define DBG_ERROR1 printf
10375 -#undef DBG_ERROR2
10376 -#define DBG_ERROR2 printf
10377 -#endif /* TEST_LAYOUT && !DBG_UTIL */
10378 -
10379 -namespace layoutimpl
10380 -{
10381 -using namespace com::sun::star;
10382 -using rtl::OUString;
10383 -
10384 -uno::Reference< awt::XWindowPeer >
10385 -getParent( uno::Reference< uno::XInterface > xRef )
10386 -{
10387 - do
10388 - {
10389 - uno::Reference< awt::XWindowPeer > xPeer( xRef, uno::UNO_QUERY );
10390 - if ( xPeer.is() )
10391 - return xPeer;
10392 -
10393 - uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
10394 - if ( xCont.is() )
10395 - xRef = xCont->getParent();
10396 - }
10397 - while ( xRef.is() );
10398 -
10399 - return uno::Reference< awt::XWindowPeer >();
10400 -}
10401 -
10402 -#if 0
10403 -static uno::Reference< awt::XWindowPeer >
10404 -getToplevel( uno::Reference< uno::XInterface > xRef )
10405 -{
10406 - uno::Reference< awt::XWindowPeer > xTop, i;
10407 - while ( ( i = uno::Reference< awt::XWindowPeer >( xRef, uno::UNO_QUERY ) ).is() )
10408 - {
10409 - xTop = i;
10410 -
10411 - uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
10412 - if ( xCont.is() )
10413 - xRef = xCont->getParent();
10414 - else
10415 - xRef = uno::Reference< awt::XWindowPeer >();
10416 - }
10417 -
10418 - return xTop;
10419 -}
10420 -#endif
10421 -
10422 -}
10423 -
10424 -#include "bin.hxx"
10425 -#include "box.hxx"
10426 -#include "dialogbuttonhbox.hxx"
10427 -#include "flow.hxx"
10428 -#include "localized-string.hxx"
10429 -#include "table.hxx"
10430 -
10431 -namespace layoutimpl
10432 -{
10433 -
10434 -static uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
10435 - uno::Reference< uno::XInterface > xParent,
10436 - OUString aName, long WindowAttributes );
10437 -
10438 -uno::Reference< awt::XLayoutContainer >
10439 -createContainer( const OUString &rName )
10440 -{
10441 - uno::Reference< awt::XLayoutContainer > xPeer;
10442 -
10443 - if ( rName.equalsAscii( "hbox" ) )
10444 - xPeer = uno::Reference< awt::XLayoutContainer >( new HBox() );
10445 - else if ( rName.equalsAscii( "vbox" ) )
10446 - xPeer = uno::Reference< awt::XLayoutContainer >( new VBox() );
10447 - else if ( rName.equalsAscii( "table" ) )
10448 - xPeer = uno::Reference< awt::XLayoutContainer >( new Table() );
10449 - else if ( rName.equalsAscii( "flow" ) )
10450 - xPeer = uno::Reference< awt::XLayoutContainer >( new Flow() );
10451 - else if ( rName.equalsAscii( "bin" ) )
10452 - xPeer = uno::Reference< awt::XLayoutContainer >( new Bin() );
10453 - else if ( rName.equalsAscii( "min-size" ) )
10454 - xPeer = uno::Reference< awt::XLayoutContainer >( new MinSize() );
10455 - else if ( rName.equalsAscii( "align" ) )
10456 - xPeer = uno::Reference< awt::XLayoutContainer >( new Align() );
10457 - else if ( rName.equalsAscii( "dialogbuttonhbox" ) )
10458 - xPeer = uno::Reference< awt::XLayoutContainer >( new DialogButtonHBox() );
10459 -
10460 - return xPeer;
10461 -}
10462 -
10463 -static uno::Reference< awt::XLayoutConstrains >
10464 -createToolkitWidget( uno::Reference< awt::XToolkit > xToolkit,
10465 - uno::Reference< uno::XInterface > xParent,
10466 - const OUString &rName, long nProps )
10467 -{
10468 - uno::Reference< awt::XLayoutConstrains > xPeer;
10469 - bool bToplevel = !xParent.is();
10470 -
10471 - // UNO Control Widget
10472 - awt::WindowDescriptor desc;
10473 - if ( bToplevel )
10474 - desc.Type = awt::WindowClass_TOP;
10475 - else
10476 - {
10477 - desc.Type = awt::WindowClass_SIMPLE;
10478 -
10479 -#if 0
10480 - // top container -- a wrapper for framewindow -- is de-coupled
10481 - // from awt::XWindowPeer. So, getParent() fails at it.
10482 - uno::Reference< awt::XWindowPeer > xWinParent = getParent( xParent );
10483 -#else
10484 - uno::Reference< awt::XWindowPeer > xWinParent( xParent, uno::UNO_QUERY );
10485 -#endif
10486 - assert( xParent.is() );
10487 - assert( xWinParent.is() );
10488 - /*
10489 - With the new three layer instarr/rpath feature, when
10490 - prepending toolkit/unxlngx6.pro/lib or $SOLARVER/lib to
10491 - LD_LIBRARY_PATH, VCLXWindow::GetImplementation returns 0x0
10492 - vclxtoolkit::ImplCreateWindow failing to create any widget;
10493 - although it succeeds here.
10494 -
10495 - While developing, one now must copy libtlx.so to
10496 - $OOO_INSTALL_PREFIX/openoffice.org/basis3.0/program/libtklx.so
10497 - each time.
10498 - */
10499 - VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xWinParent );
10500 - if ( !pParentComponent )
10501 - throw uno::RuntimeException(
10502 - OUString::createFromAscii( "parent has no implementation" ),
10503 - uno::Reference< uno::XInterface >() );
10504 - desc.Parent = xWinParent;
10505 - }
10506 -
10507 - desc.ParentIndex = 0;
10508 - // debugging help ...
10509 - desc.Bounds.X = 0;
10510 - desc.Bounds.Y = 0;
10511 - desc.Bounds.Width = 300;
10512 - desc.Bounds.Height = 200;
10513 -
10514 - desc.WindowAttributes = nProps;
10515 - desc.WindowServiceName = rName;
10516 -
10517 - uno::Reference< awt::XWindowPeer > xWinPeer;
10518 - try
10519 - {
10520 - OSL_TRACE("Asking toolkit: %s", OUSTRING_CSTR( desc.WindowServiceName ) );
10521 - xWinPeer = xToolkit->createWindow( desc );
10522 - if ( !xWinPeer.is() )
10523 - throw uno::RuntimeException(
10524 - OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot create peer" ) ),
10525 - uno::Reference< uno::XInterface >() );
10526 - xPeer = uno::Reference< awt::XLayoutConstrains >( xWinPeer, uno::UNO_QUERY );
10527 - }
10528 - catch( uno::Exception & )
10529 - {
10530 - DBG_ERROR1( "Warning: %s is not a recognized type\n", OUSTRING_CSTR( rName ) );
10531 - return uno::Reference< awt::XLayoutConstrains >();
10532 - }
10533 -
10534 - // default to visible, let then people change it on properties
10535 - if ( ! bToplevel )
10536 - {
10537 - uno::Reference< awt::XWindow> xWindow( xPeer, uno::UNO_QUERY );
10538 - if ( xWindow.is() )
10539 - xWindow->setVisible( true );
10540 - }
10541 - return xPeer;
10542 -}
10543 -
10544 -uno::Reference< awt::XLayoutConstrains >
10545 -createWidget( uno::Reference< awt::XToolkit > xToolkit,
10546 - uno::Reference< uno::XInterface > xParent,
10547 - const OUString &rName, long nProps )
10548 -{
10549 - uno::Reference< awt::XLayoutConstrains > xPeer;
10550 -
10551 - xPeer = uno::Reference< awt::XLayoutConstrains >(
10552 - createContainer( rName ), uno::UNO_QUERY );
10553 - if ( xPeer.is() )
10554 - return xPeer;
10555 -
10556 - xPeer = ImplCreateWindow( xParent, rName, nProps );
10557 - if ( xPeer.is() )
10558 - return xPeer;
10559 -
10560 -#if FIXED_INFO
10561 - OUString tName = rName;
10562 - // FIXME
10563 - if ( rName.equalsAscii( "fixedinfo" ) )
10564 - tName = OUString::createFromAscii( "fixedtext" );
10565 - xPeer = createToolkitWidget( xToolkit, xParent, tName, nProps );
10566 -#else
10567 - xPeer = createToolkitWidget( xToolkit, xParent, rName, nProps );
10568 -#endif
10569 -
10570 - return xPeer;
10571 -}
10572 -
10573 -PropHelper::PropHelper() : LockHelper()
10574 - , cppu::OPropertySetHelper( maBrdcstHelper )
10575 - , pHelper( NULL )
10576 -{
10577 -}
10578 -
10579 -void
10580 -PropHelper::addProp (const char *pName, sal_Int32 nNameLen, rtl_TextEncoding e,
10581 - uno::Type aType, void *pPtr)
10582 -{
10583 - // this sucks rocks for effiency ...
10584 - PropDetails aDetails;
10585 - aDetails.aName = rtl::OUString::intern( pName, nNameLen, e );
10586 - aDetails.aType = aType;
10587 - aDetails.pValue = pPtr;
10588 - maDetails.push_back( aDetails );
10589 -}
10590 -
10591 -cppu::IPropertyArrayHelper & SAL_CALL
10592 -PropHelper::getInfoHelper()
10593 -{
10594 - if ( ! pHelper )
10595 - {
10596 - uno::Sequence< beans::Property > aProps( maDetails.size() );
10597 - for ( unsigned int i = 0; i < maDetails.size(); i++)
10598 - {
10599 - aProps[i].Name = maDetails[i].aName;
10600 - aProps[i].Type = maDetails[i].aType;
10601 - aProps[i].Handle = i;
10602 - aProps[i].Attributes = 0;
10603 - }
10604 - pHelper = new cppu::OPropertyArrayHelper( aProps, false /* fixme: faster ? */ );
10605 -
10606 - }
10607 - return *pHelper;
10608 -}
10609 -
10610 -sal_Bool SAL_CALL
10611 -PropHelper::convertFastPropertyValue(
10612 - uno::Any & rConvertedValue,
10613 - uno::Any & rOldValue,
10614 - sal_Int32 nHandle,
10615 - const uno::Any& rValue )
10616 - throw (lang::IllegalArgumentException)
10617 -{
10618 - OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
10619 -
10620 - // FIXME: no Any::getValue ...
10621 - getFastPropertyValue( rOldValue, nHandle );
10622 - if ( rOldValue != rValue )
10623 - {
10624 - rConvertedValue = rValue;
10625 - return sal_True; // changed
10626 - }
10627 - else
10628 - {
10629 - rConvertedValue.clear();
10630 - rOldValue.clear();
10631 - }
10632 - return sal_False;
10633 -}
10634 -
10635 -
10636 -void SAL_CALL
10637 -PropHelper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
10638 - const uno::Any& rValue )
10639 - throw (uno::Exception)
10640 -{
10641 - OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
10642 -
10643 - const PropDetails &rInfo = maDetails[ nHandle ];
10644 -
10645 - uno_type_assignData( rInfo.pValue, rInfo.aType.getTypeLibType(),
10646 - rValue.pData, rValue.pType,
10647 - 0, 0, 0 );
10648 -
10649 - if ( mpListener )
10650 - mpListener->propertiesChanged();
10651 -}
10652 -
10653 -void SAL_CALL
10654 -PropHelper::getFastPropertyValue( uno::Any& rValue,
10655 - sal_Int32 nHandle ) const
10656 -{
10657 - OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
10658 - const PropDetails &rInfo = maDetails[ nHandle ];
10659 -#if 0
10660 - switch ( rInfo.aType.getTypeClass() )
10661 - {
10662 -#define MAP(classtype,ctype) \
10663 - case uno::TypeClass_##classtype: \
10664 - rValue <<= *(ctype *)(rInfo.pValue); \
10665 - break
10666 - MAP( DOUBLE, double );
10667 - MAP( SHORT, sal_Int16 );
10668 - MAP( LONG, sal_Int32 );
10669 - MAP( UNSIGNED_SHORT, sal_uInt16 );
10670 - MAP( UNSIGNED_LONG, sal_uInt32 );
10671 - MAP( STRING, ::rtl::OUString );
10672 - default:
10673 - DBG_ERROR( "ERROR: unknown type to map!" );
10674 - break;
10675 - }
10676 -#undef MAP
10677 -#endif
10678 - rValue.setValue( rInfo.pValue, rInfo.aType );
10679 -}
10680 -
10681 -::com::sun::star::uno::Any
10682 -PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
10683 -{
10684 - return OPropertySetHelper::queryInterface( rType );
10685 -}
10686 -
10687 -} // namespace layoutimpl
10688 -
10689 -#include <awt/vclxbutton.hxx>
10690 -#include <awt/vclxdialog.hxx>
10691 -#include <awt/vclxfixedline.hxx>
10692 -#include <awt/vclxplugin.hxx>
10693 -#include <awt/vclxscroller.hxx>
10694 -#include <awt/vclxsplitter.hxx>
10695 -#include <awt/vclxtabcontrol.hxx>
10696 -#include <awt/vclxtabpage.hxx>
10697 -#include <toolkit/awt/vclxtoolkit.hxx>
10698 -#include <toolkit/awt/vclxwindow.hxx>
10699 -#include <vcl/button.hxx>
10700 -#include <vcl/dialog.hxx>
10701 -#include <vcl/fixed.hxx>
10702 -#include <vcl/tabctrl.hxx>
10703 -#include <vcl/tabpage.hxx>
10704 -
10705 -#include <typeinfo>
10706 -
10707 -namespace layoutimpl
10708 -{
10709 -
10710 -TOOLKIT_DLLPUBLIC Window* global_parent;
10711 -
10712 -uno::Reference< awt::XLayoutConstrains > ImplCreateWindow(
10713 - uno::Reference< uno::XInterface > xParent,
10714 - OUString aName, long WindowAttributes )
10715 -{
10716 - VCLXWindow *pNewComp = NULL;
10717 - Window *pNewWindow = NULL;
10718 - Window *pParent = NULL;
10719 - uno::Reference< awt::XLayoutConstrains > xRef;
10720 -
10721 - VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent );
10722 - if ( pParentComponent )
10723 - pParent = pParentComponent->GetWindow();
10724 -
10725 - if ( aName.equalsAscii( "dialog" ) )
10726 - {
10727 - if ( pParent == NULL )
10728 - pParent = DIALOG_NO_PARENT;
10729 - pNewWindow = new Dialog( pParent,
10730 - ImplGetWinBits( WindowAttributes, 0 ) );
10731 - pNewComp = new layoutimpl::VCLXDialog();
10732 -
10733 - WindowAttributes ^= awt::WindowAttribute::SHOW;
10734 - }
10735 - else if ( aName.equalsAscii( "modaldialog" ) )
10736 - {
10737 - if ( pParent == NULL )
10738 - pParent = DIALOG_NO_PARENT;
10739 - pNewWindow = new ModalDialog( pParent,
10740 - ImplGetWinBits( WindowAttributes, 0 ) );
10741 - pNewComp = new layoutimpl::VCLXDialog();
10742 -
10743 - WindowAttributes ^= awt::WindowAttribute::SHOW;
10744 - }
10745 - else if ( aName.equalsAscii( "tabcontrol" ) )
10746 - {
10747 - pNewWindow = new TabControl( pParent,
10748 - ImplGetWinBits( WindowAttributes, WINDOW_TABCONTROL ) );
10749 - pNewComp = new layoutimpl::VCLXTabControl();
10750 - }
10751 - else if ( aName.equalsAscii( "scroller" ) )
10752 - {
10753 - // used FixedImage because I just want some empty non-intrusive widget
10754 - pNewWindow = new FixedImage( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10755 - pNewComp = new layoutimpl::VCLXScroller();
10756 - }
10757 - else if ( aName.equalsAscii( "hsplitter" ) || aName.equalsAscii( "vsplitter" ) )
10758 - {
10759 - pNewWindow = new FixedImage( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10760 - pNewComp = new layoutimpl::VCLXSplitter( aName.equalsAscii( "hsplitter" ) );
10761 - }
10762 - else if ( aName.equalsAscii( "hfixedline" ) || aName.equalsAscii( "vfixedline" ) )
10763 - {
10764 - WinBits nStyle = ImplGetWinBits( WindowAttributes, 0 );
10765 - nStyle ^= WB_HORZ;
10766 - if ( aName.equalsAscii( "hfixedline" ) )
10767 - nStyle |= WB_HORZ;
10768 - else
10769 - nStyle |= WB_VERT;
10770 - pNewWindow = new FixedLine( pParent, nStyle );
10771 - pNewComp = new layoutimpl::VCLXFixedLine();
10772 - }
10773 - else if ( aName.equalsAscii( "okbutton" ) )
10774 - {
10775 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10776 - pNewComp = new layoutimpl::VCLXOKButton( pNewWindow );
10777 - }
10778 - else if ( aName.equalsAscii( "cancelbutton" ) )
10779 - {
10780 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10781 - pNewComp = new layoutimpl::VCLXCancelButton( pNewWindow );
10782 - }
10783 - else if ( aName.equalsAscii( "yesbutton" ) )
10784 - {
10785 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10786 - pNewComp = new layoutimpl::VCLXYesButton( pNewWindow );
10787 - }
10788 - else if ( aName.equalsAscii( "nobutton" ) )
10789 - {
10790 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10791 - pNewComp = new layoutimpl::VCLXNoButton( pNewWindow );
10792 - }
10793 - else if ( aName.equalsAscii( "retrybutton" ) )
10794 - {
10795 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10796 - pNewComp = new layoutimpl::VCLXRetryButton( pNewWindow );
10797 - }
10798 - else if ( aName.equalsAscii( "ignorebutton" ) )
10799 - {
10800 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10801 - pNewComp = new layoutimpl::VCLXIgnoreButton( pNewWindow );
10802 - }
10803 - else if ( aName.equalsAscii( "resetbutton" ) )
10804 - {
10805 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10806 - pNewComp = new layoutimpl::VCLXResetButton( pNewWindow );
10807 - }
10808 - else if ( aName.equalsAscii( "applybutton" ) )
10809 - {
10810 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10811 - pNewComp = new layoutimpl::VCLXApplyButton( pNewWindow );
10812 - }
10813 - else if ( aName.equalsAscii( "helpbutton" ) )
10814 - {
10815 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10816 - pNewComp = new layoutimpl::VCLXHelpButton( pNewWindow );
10817 - }
10818 - else if ( aName.equalsAscii( "morebutton" ) )
10819 - {
10820 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10821 - pNewComp = new layoutimpl::VCLXMoreButton( pNewWindow );
10822 - }
10823 - else if ( aName.equalsAscii( "advancedbutton" ) )
10824 - {
10825 - pNewWindow = new PushButton( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10826 - pNewComp = new layoutimpl::VCLXAdvancedButton( pNewWindow );
10827 - }
10828 - else if ( aName.equalsAscii( "plugin" ) )
10829 - {
10830 - pNewWindow = new Control( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10831 - OSL_TRACE( "%s: parent=%p (%s)\n", __FUNCTION__, pParent, typeid( *pParent ).name() );
10832 - pNewComp = new layoutimpl::VCLXPlugin( pNewWindow, ImplGetWinBits( WindowAttributes, 0 ) );
10833 - }
10834 - else if ( aName.equalsAscii( "tabpage" ) )
10835 - {
10836 - if ( !pParent )
10837 - pParent = layout::TabPage::global_parent;
10838 -
10839 - //pNewWindow = new TabPage( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10840 - WindowAttributes ^= awt::WindowAttribute::SHOW;
10841 - WinBits nStyle = ImplGetWinBits( WindowAttributes, 0 );
10842 - nStyle |= WB_HIDE;
10843 - //nStyle |= WB_NODIALOGCONTROL;
10844 - //nStyle |= WB_DIALOGCONTROL;
10845 - //nStyle = 2147483714L;
10846 - OSL_TRACE( "in bits=%lu", nStyle );
10847 - pNewWindow = new TabPage( pParent, nStyle );
10848 - pNewComp = new VCLXTabPage( pNewWindow );
10849 - }
10850 - else if ( aName.equalsAscii( "string" ) )
10851 - {
10852 - // FIXME: move <string>s.text to simple map<string> in root?
10853 - WindowAttributes &= ~awt::WindowAttribute::SHOW;
10854 - pNewWindow = new Window( pParent, ImplGetWinBits( WindowAttributes, 0 ) );
10855 - pNewComp = new layoutimpl::LocalizedString();
10856 - }
10857 -
10858 - if ( !pNewWindow )
10859 - return xRef;
10860 -
10861 - pNewWindow->SetCreatedWithToolkit( sal_True );
10862 - if ( pNewComp )
10863 - pNewComp->SetCreatedWithToolkit( TRUE );
10864 - xRef = pNewComp;
10865 - pNewWindow->SetComponentInterface( pNewComp );
10866 - if ( WindowAttributes & awt::WindowAttribute::SHOW )
10867 - pNewWindow->Show();
10868 -
10869 - return xRef;
10870 -}
10871 -
10872 -} // namespace layoutimpl
10873 -
10874 -// Avoid polluting the rest of the code with vcl linkage pieces ...
10875 -
10876 -#include <vcl/imagerepository.hxx>
10877 -#include <vcl/bitmapex.hxx>
10878 -#include <vcl/graph.hxx>
10879 -
10880 -namespace layoutimpl
10881 -{
10882 -
10883 -uno::Reference< graphic::XGraphic > loadGraphic( const char *pName )
10884 -{
10885 - BitmapEx aBmp;
10886 -
10887 - OUString aStr( pName, strlen( pName ), RTL_TEXTENCODING_ASCII_US );
10888 - if ( aStr.compareToAscii( ".uno:" ) == 0 )
10889 - aStr = aStr.copy( 5 ).toAsciiLowerCase();
10890 -
10891 - if ( !vcl::ImageRepository::loadImage( OUString::createFromAscii( pName ), aBmp, true ) )
10892 - return uno::Reference< graphic::XGraphic >();
10893 -
10894 - return Graphic( aBmp ).GetXGraphic();
10895 -}
10896 -
10897 -} // namespace layoutimpl
10898 --- toolkit/source/layout/helper.hxx.old 2009-04-02 10:49:36.000000000 +0000
10899 +++ toolkit/source/layout/helper.hxx 1970-01-01 00:00:00.000000000 +0000
10900 @@ -1,155 +0,0 @@
10901 -/*************************************************************************
10902 - *
10903 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10904 - *
10905 - * Copyright 2008 by Sun Microsystems, Inc.
10906 - *
10907 - * OpenOffice.org - a multi-platform office productivity suite
10908 - *
10909 - * $RCSfile: helper.hxx,v $
10910 - *
10911 - * $Revision: 1.3 $
10912 - *
10913 - * This file is part of OpenOffice.org.
10914 - *
10915 - * OpenOffice.org is free software: you can redistribute it and/or modify
10916 - * it under the terms of the GNU Lesser General Public License version 3
10917 - * only, as published by the Free Software Foundation.
10918 - *
10919 - * OpenOffice.org is distributed in the hope that it will be useful,
10920 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10921 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10922 - * GNU Lesser General Public License version 3 for more details
10923 - * (a copy is included in the LICENSE file that accompanied this code).
10924 - *
10925 - * You should have received a copy of the GNU Lesser General Public License
10926 - * version 3 along with OpenOffice.org. If not, see
10927 - * <http://www.openoffice.org/license.html>
10928 - * for a copy of the LGPLv3 License.
10929 - *
10930 - ************************************************************************/
10931 -
10932 -#ifndef HELPER_HXX
10933 -#define HELPER_HXX
10934 -
10935 -#include <toolkit/dllapi.h>
10936 -#include <vector>
10937 -
10938 -#include <com/sun/star/awt/XLayoutConstrains.hpp>
10939 -#include <com/sun/star/awt/XLayoutContainer.hpp>
10940 -#include <com/sun/star/awt/XVclWindowPeer.hpp>
10941 -#include <com/sun/star/xml/input/XRoot.hpp>
10942 -#include <cppuhelper/implbase1.hxx>
10943 -#include <cppuhelper/propshlp.hxx>
10944 -#include <rtl/ustring.hxx>
10945 -
10946 -namespace layoutimpl
10947 -{
10948 -
10949 -namespace css = ::com::sun::star;
10950 -
10951 -/* ChildProps -- a helper to set child properties for the XLayoutContainer interface. */
10952 -
10953 -class LockHelper
10954 -{
10955 -public:
10956 - osl::Mutex maGuard;
10957 - cppu::OBroadcastHelper maBrdcstHelper;
10958 - LockHelper() : maBrdcstHelper( maGuard )
10959 - {
10960 - }
10961 -};
10962 -
10963 -class PropHelper : public LockHelper
10964 - , public cppu::OPropertySetHelper
10965 - , public cppu::OWeakObject
10966 -{
10967 - cppu::OPropertyArrayHelper *pHelper;
10968 -
10969 - struct PropDetails
10970 - {
10971 - rtl::OUString aName;
10972 - css::uno::Type aType;
10973 - void *pValue;
10974 - };
10975 - std::vector< PropDetails > maDetails;
10976 -
10977 -protected:
10978 - void addProp( char const *pName, sal_Int32 nNameLen, rtl_TextEncoding e,
10979 - css::uno::Type aType, void *pPtr );
10980 -
10981 -public:
10982 - PropHelper();
10983 -
10984 - // com::sun::star::uno::XInterface
10985 - void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
10986 - void SAL_CALL release() throw() { OWeakObject::release(); }
10987 - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
10988 -
10989 - // cppu::OPropertySetHelper
10990 - virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
10991 - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any &,
10992 - css::uno::Any &, sal_Int32 nHandle, const css::uno::Any & )
10993 - throw(css::lang::IllegalArgumentException);
10994 - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
10995 - const css::uno::Any& rValue ) throw (css::uno::Exception);
10996 - using OPropertySetHelper::getFastPropertyValue;
10997 - virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue,
10998 - sal_Int32 nHandle ) const;
10999 -
11000 - // you -must- use this macro in sub-classes that define new properties.
11001 - // NB. 'static' ...
11002 - // com::sun::star::beans::XMultiPropertySet
11003 -#define PROPHELPER_SET_INFO \
11004 - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL \
11005 - getPropertySetInfo() throw(css::uno::RuntimeException) \
11006 - { \
11007 - static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( \
11008 - createPropertySetInfo( getInfoHelper() ) ); \
11009 - return xInfo; \
11010 - }
11011 - PROPHELPER_SET_INFO
11012 -
11013 - struct Listener
11014 - {
11015 - virtual void propertiesChanged() = 0;
11016 - };
11017 - void setChangeListener( Listener *pListener )
11018 - {
11019 - mpListener = pListener;
11020 - }
11021 -
11022 -protected:
11023 - Listener *mpListener;
11024 -};
11025 -
11026 -css::uno::Any anyFromString (const rtl::OUString &value, const css::uno::Type &type);
11027 -
11028 -// The native widgets wrapper hierarchy may not reflect that of the layout
11029 -// hierarchy as some containers don't have an associated native widget.
11030 -// Use this function to get the native parent of the given peer.
11031 -css::uno::Reference< css::awt::XWindowPeer >
11032 -getParent( css::uno::Reference< css::uno::XInterface > xPeer );
11033 -
11034 -
11035 -struct WidgetFactory
11036 -{
11037 - virtual css::uno::Reference< css::awt::XLayoutConstrains >
11038 - createWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
11039 - css::uno::Reference< css::uno::XInterface > xParent,
11040 - const rtl::OUString &rName, long nProps );
11041 -};
11042 -
11043 -// A local factory method - should use UNO services in due course
11044 -css::uno::Reference< css::awt::XLayoutConstrains > TOOLKIT_DLLPUBLIC
11045 -createWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
11046 - css::uno::Reference< css::uno::XInterface > xParent,
11047 - const rtl::OUString &rName, long nProps );
11048 -
11049 -// Factory for containers (not visible ones)
11050 -css::uno::Reference< css::awt::XLayoutContainer >
11051 -createContainer( const rtl::OUString &rName );
11052 -
11053 -} // namespace layoutimpl
11054 -
11055 -#endif /* HELPER_HXX */
11056 --- toolkit/source/layout/import.cxx.old 2009-04-06 16:42:11.000000000 +0000
11057 +++ toolkit/source/layout/import.cxx 1970-01-01 00:00:00.000000000 +0000
11058 @@ -1,249 +0,0 @@
11059 -/*************************************************************************
11060 - *
11061 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11062 - *
11063 - * Copyright 2008 by Sun Microsystems, Inc.
11064 - *
11065 - * OpenOffice.org - a multi-platform office productivity suite
11066 - *
11067 - * $RCSfile: import.cxx,v $
11068 - *
11069 - * $Revision: 1.3 $
11070 - *
11071 - * This file is part of OpenOffice.org.
11072 - *
11073 - * OpenOffice.org is free software: you can redistribute it and/or modify
11074 - * it under the terms of the GNU Lesser General Public License version 3
11075 - * only, as published by the Free Software Foundation.
11076 - *
11077 - * OpenOffice.org is distributed in the hope that it will be useful,
11078 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11079 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11080 - * GNU Lesser General Public License version 3 for more details
11081 - * (a copy is included in the LICENSE file that accompanied this code).
11082 - *
11083 - * You should have received a copy of the GNU Lesser General Public License
11084 - * version 3 along with OpenOffice.org. If not, see
11085 - * <http://www.openoffice.org/license.html>
11086 - * for a copy of the LGPLv3 License.
11087 - *
11088 - ************************************************************************/
11089 -
11090 -#include "import.hxx"
11091 -
11092 -#include <com/sun/star/awt/XButton.hpp>
11093 -#include <com/sun/star/awt/XDialog2.hpp>
11094 -#include <vcl/image.hxx>
11095 -#include <tools/debug.hxx>
11096 -
11097 -#include "root.hxx"
11098 -#include "helper.hxx"
11099 -#include "dialogbuttonhbox.hxx"
11100 -
11101 -// Hmm...
11102 -#include "layout/layout.hxx"
11103 -#include "layout/layoutcore.hxx"
11104 -
11105 -#define XMLNS_LAYOUT_URI "http://openoffice.org/2007/layout"
11106 -#define XMLNS_CONTAINER_URI "http://openoffice.org/2007/layout/container"
11107 -
11108 -namespace layoutimpl
11109 -{
11110 -using namespace css;
11111 -
11112 -using ::rtl::OUString;
11113 -
11114 -ElementBase::~ElementBase()
11115 -SAL_THROW( () )
11116 -{
11117 - //delete mpImport;
11118 - //mpImport = 0;
11119 -}
11120 -
11121 -//** parser
11122 -WidgetElement::WidgetElement ( sal_Int32 nUid, const OUString &rName,
11123 - uno::Reference <xml::input::XAttributes> const &attributes,
11124 - ElementBase *pParent,
11125 - ImportContext *pImport)
11126 -SAL_THROW (())
11127 -: ElementBase( nUid, rName, attributes, pParent, pImport )
11128 -{
11129 - OUString name = rName.toAsciiLowerCase();
11130 -
11131 - PropList aProps;
11132 - propsFromAttributes( attributes, aProps, pImport->XMLNS_LAYOUT_UID );
11133 -
11134 - OUString aId;
11135 - findAndRemove( "id", aProps, aId );
11136 - OUString aLang;
11137 - findAndRemove( "xml-lang", aProps, aLang );
11138 -
11139 - {
11140 -//DEBUG
11141 - uno::Reference< awt::XLayoutConstrains > xParent;
11142 - if ( pParent )
11143 - xParent = ((WidgetElement *) pParent)->mpWidget->getPeer();
11144 -
11145 -
11146 - mpWidget = pImport->mrRoot.create( aId, name,
11147 - getAttributeProps( aProps ), uno::Reference< awt::XLayoutContainer >( xParent, uno::UNO_QUERY ) );
11148 -
11149 - }
11150 -
11151 - // TODO: handle with non-existing widgets
11152 -
11153 - mpWidget->setProperties( aProps );
11154 -
11155 - uno::Reference< awt::XDialog2 > xDialog( mpWidget->getPeer(), uno::UNO_QUERY );
11156 - if ( xDialog.is() )
11157 - {
11158 - OUString aTitle;
11159 - if ( findAndRemove( "title", aProps, aTitle ) )
11160 - xDialog->setTitle( aTitle );
11161 - } // DEBUG:
11162 - else if ( pParent == NULL )
11163 - {
11164 - DBG_ERROR( "Fatal error: top node isn't a dialog" );
11165 - }
11166 -
11167 -#if 0
11168 - // Hack moved to proplist.cxx
11169 - OUString aGraphic;
11170 - if ( findAndRemove( "graphic", aProps, aGraphic ) )
11171 - //if ( layout::FixedImage *i = dynamic_cast<layout::FixedImage *> ( mpWidget->getPeer().get() ) )
11172 - // FIXME: huh? XImageProducer::complete( XImageConsumer )
11173 - //i->setImage( Image( loadGraphic( OUSTRING_CSTR( aGraphic ) ) ) );
11174 - mpWidget->setProperty( OUString::createFromAscii( "graphic" ),
11175 - loadGraphic( OUSTRING_CSTR( aGraphic ) ) );
11176 -#endif
11177 -
11178 - OUString aOrdering;
11179 - if ( findAndRemove( "ordering", aProps, aOrdering ) )
11180 - if ( DialogButtonHBox *b = dynamic_cast<DialogButtonHBox *> ( mpWidget->getPeer().get() ) )
11181 - b->setOrdering ( aOrdering );
11182 -
11183 -#ifdef IMPORT_RADIOGROUP
11184 - bool bSetRadioGroup, bSetTitle;
11185 - OUString aRadioGroup, aTitle;
11186 - bSetRadioGroup = findAndRemove( "radiogroup", aProps, aRadioGroup );
11187 - bSetTitle = findAndRemove( "title", aProps, aTitle );
11188 -
11189 - setProperties( mxPeer, aProps );
11190 -
11191 - // we need to add radio buttons to the group after their properties are
11192 - // set, so we can check if they should be the one selected by default or not.
11193 - // And the state changed event isn't fired when changing properties.
11194 - if ( bSetRadioGroup )
11195 - {
11196 - static int i = 0;
11197 - i++;
11198 - uno::Reference< awt::XRadioButton > xRadio( mxPeer, uno::UNO_QUERY );
11199 - if ( xRadio.is() )
11200 - pImport->mxRadioGroups.addItem( aRadioGroup, xRadio );
11201 - }
11202 - if ( bSetTitle )
11203 - {
11204 - uno::Reference< awt::XDialog2 > xDialog( mxPeer, uno::UNO_QUERY );
11205 - if ( xDialog.is() )
11206 - xDialog->setTitle( aTitle );
11207 - }
11208 -#endif
11209 -}
11210 -
11211 -WidgetElement::~WidgetElement()
11212 -{
11213 - //delete mpWidget;
11214 - //mpWidget = 0;
11215 -}
11216 -
11217 -uno::Reference <xml::input::XElement>
11218 -WidgetElement::startChildElement ( sal_Int32 nUid, OUString const &name,
11219 - uno::Reference <xml::input::XAttributes> const &attributes )
11220 - throw( xml::sax::SAXException, uno::RuntimeException )
11221 -{
11222 - // Adding a child to the widget
11223 - WidgetElement *pChild = new WidgetElement ( nUid, name, attributes, this, mpImport );
11224 -
11225 - if ( !mpWidget->addChild( pChild->mpWidget ) )
11226 - {
11227 - DBG_ERROR2( "ERROR: cannot add %s to container %s, container full", OUSTRING_CSTR( name ), OUSTRING_CSTR( getLocalName() ) );
11228 - throw xml::sax::SAXException();
11229 - }
11230 -
11231 - PropList aProps;
11232 - propsFromAttributes( attributes, aProps, mpImport->XMLNS_CONTAINER_UID );
11233 - mpWidget->setChildProperties( pChild->mpWidget, aProps );
11234 -
11235 - return pChild;
11236 -}
11237 -
11238 -// Support Ivo Hinkelmann's move label/text/title attribute to CONTENT
11239 -// transex3 hack.
11240 -void SAL_CALL
11241 -WidgetElement::characters( OUString const& rChars )
11242 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11243 -{
11244 - if ( mpWidget && rChars.trim().getLength() )
11245 - {
11246 - uno::Reference< awt::XDialog2 > xDialog( mpWidget->getPeer(), uno::UNO_QUERY );
11247 - uno::Reference< awt::XButton > xButton( mpWidget->getPeer(), uno::UNO_QUERY );
11248 - if ( xDialog.is() )
11249 - xDialog->setTitle( rChars );
11250 - else if ( xButton.is() )
11251 - mpWidget->setProperty( OUString::createFromAscii( "label" ), rChars );
11252 - else
11253 - mpWidget->setProperty( OUString::createFromAscii( "text" ), rChars );
11254 - }
11255 -}
11256 -// ---- ElementBase ----
11257 -
11258 -ElementBase::ElementBase( sal_Int32 nUid, OUString const & rLocalName,
11259 - uno::Reference< xml::input::XAttributes > const & xAttributes,
11260 - ElementBase* pParent,
11261 - ImportContext* pImport )
11262 -SAL_THROW(())
11263 -: mpImport( pImport )
11264 - , mpParent( pParent )
11265 - , mnUid( nUid )
11266 - , maLocalName( rLocalName )
11267 - , mxAttributes( xAttributes )
11268 -{
11269 -}
11270 -
11271 -// ---- ImportContext ----
11272 -
11273 -void ImportContext::startDocument(
11274 - uno::Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
11275 - throw (xml::sax::SAXException, uno::RuntimeException)
11276 -{
11277 - XMLNS_LAYOUT_UID = xNamespaceMapping->getUidByUri(
11278 - OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_LAYOUT_URI ) ) );
11279 - XMLNS_CONTAINER_UID = xNamespaceMapping->getUidByUri(
11280 - OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_CONTAINER_URI ) ) );
11281 -}
11282 -
11283 -ToplevelElement::ToplevelElement (OUString const &rName,
11284 - uno::Reference <xml::input::XAttributes> const &xAttributes,
11285 - ImportContext *pImport)
11286 -SAL_THROW(())
11287 -: WidgetElement( 0, rName, xAttributes, NULL, pImport )
11288 -{
11289 -}
11290 -
11291 -ToplevelElement::~ToplevelElement()
11292 -{
11293 -}
11294 -
11295 -uno::Reference< xml::input::XElement > ImportContext::startRootElement(
11296 - sal_Int32 nUid, OUString const & rLocalName,
11297 - uno::Reference< xml::input::XAttributes > const & xAttributes )
11298 - throw (xml::sax::SAXException, uno::RuntimeException)
11299 -{
11300 - if ( XMLNS_LAYOUT_UID != nUid )
11301 - throw xml::sax::SAXException(
11302 - OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid namespace!" ) ),
11303 - uno::Reference< uno::XInterface >(), uno::Any() );
11304 - return new ToplevelElement( rLocalName, xAttributes, this );
11305 -}
11306 -
11307 -} // namespace layoutimpl
11308 --- toolkit/source/layout/import.hxx.old 2009-04-06 16:42:11.000000000 +0000
11309 +++ toolkit/source/layout/import.hxx 1970-01-01 00:00:00.000000000 +0000
11310 @@ -1,316 +0,0 @@
11311 -/*************************************************************************
11312 - *
11313 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11314 - *
11315 - * Copyright 2008 by Sun Microsystems, Inc.
11316 - *
11317 - * OpenOffice.org - a multi-platform office productivity suite
11318 - *
11319 - * $RCSfile: import.hxx,v $
11320 - *
11321 - * $Revision: 1.3 $
11322 - *
11323 - * This file is part of OpenOffice.org.
11324 - *
11325 - * OpenOffice.org is free software: you can redistribute it and/or modify
11326 - * it under the terms of the GNU Lesser General Public License version 3
11327 - * only, as published by the Free Software Foundation.
11328 - *
11329 - * OpenOffice.org is distributed in the hope that it will be useful,
11330 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11331 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11332 - * GNU Lesser General Public License version 3 for more details
11333 - * (a copy is included in the LICENSE file that accompanied this code).
11334 - *
11335 - * You should have received a copy of the GNU Lesser General Public License
11336 - * version 3 along with OpenOffice.org. If not, see
11337 - * <http://www.openoffice.org/license.html>
11338 - * for a copy of the LGPLv3 License.
11339 - *
11340 - ************************************************************************/
11341 -
11342 -#ifndef IMPORT_HXX
11343 -#define IMPORT_HXX
11344 -
11345 -#include <map>
11346 -#include <list>
11347 -#define _BACKWARD_BACKWARD_WARNING_H 1
11348 -#include <hash_map>
11349 -
11350 -#include <com/sun/star/xml/input/XRoot.hpp>
11351 -#include <cppuhelper/implbase1.hxx>
11352 -
11353 -namespace layoutimpl
11354 -{
11355 -class LayoutRoot;
11356 -class LayoutWidget;
11357 -namespace css = ::com::sun::star;
11358 -
11359 -/* blocks under IMPORT_RADIOGROUP are marked for deletion.
11360 - The use of it is to synchronize radio buttons into groups.
11361 - But toolkit doesn't fire toggle events when toggled from the code.
11362 - Another approach is to implement our own XRadioButton from our
11363 - internal toolkit. We could have some singleton where they would
11364 - register... We would need to add another attribute...
11365 -*/
11366 -
11367 -#ifdef IMPORT_RADIOGROUP
11368 -#include <com/sun/star/awt/XRadioButton.hpp>
11369 -class RadioGroups
11370 -{
11371 -public:
11372 - RadioGroups()
11373 - {
11374 - }
11375 -
11376 - void addItem( rtl::OUString id, css::uno::Reference< css::awt::XRadioButton > xRadio )
11377 - throw (css::uno::RuntimeException)
11378 - {
11379 - if ( ! xRadio.is() )
11380 - throw css::uno::RuntimeException();
11381 -
11382 - css::uno::Reference< RadioGroup > group;
11383 - RadioGroupsMap::iterator it = mxRadioGroups.find( id );
11384 - if ( it == mxRadioGroups.end() )
11385 - {
11386 - group = css::uno::Reference< RadioGroup > ( new RadioGroup() );
11387 - mxRadioGroups [id] = group;
11388 - }
11389 - else
11390 - group = it->second;
11391 - group->addItem( xRadio );
11392 - }
11393 -
11394 -private:
11395 - class RadioGroup : public ::cppu::WeakImplHelper1< css::awt::XItemListener >
11396 - {
11397 - public:
11398 - RadioGroup()
11399 - {
11400 - }
11401 -
11402 - void addItem( css::uno::Reference< css::awt::XRadioButton > xRadio )
11403 - {
11404 - if ( ! mxSelectedRadio.is() )
11405 - {
11406 - xRadio->setState( true );
11407 - mxSelectedRadio = xRadio;
11408 - }
11409 - else if ( xRadio->getState() )
11410 - {
11411 - mxSelectedRadio->setState( false );
11412 - mxSelectedRadio = xRadio;
11413 - }
11414 -
11415 - xRadio->addItemListener( this );
11416 - mxRadios.push_back (xRadio);
11417 - }
11418 -
11419 - private:
11420 - typedef std::list< css::uno::Reference< css::awt::XRadioButton > > RadioButtonsList;
11421 - RadioButtonsList mxRadios;
11422 - css::uno::Reference< css::awt::XRadioButton > mxSelectedRadio;
11423 -
11424 - // awt::XItemListener
11425 - void itemStateChanged( const com::sun::star::awt::ItemEvent& e)
11426 - throw (css::uno::RuntimeException)
11427 - {
11428 - if ( e.Selected )
11429 - {
11430 - mxSelectedRadio->setState( false );
11431 - // the only radio button selected would be the one that fired the event
11432 - for ( RadioButtonsList::iterator it = mxRadios.begin();
11433 - it != mxRadios.end(); it++ )
11434 - if ( (*it)->getState() )
11435 - {
11436 - mxSelectedRadio = *it;
11437 - break;
11438 - }
11439 - }
11440 - }
11441 -
11442 - // lang::XEventListener
11443 - void SAL_CALL disposing( const css::lang::EventObject& )
11444 - throw (css::uno::RuntimeException)
11445 - {
11446 - }
11447 - };
11448 -
11449 - // each RadioGroup will stay alive after RadioGroups die with the ImportContext
11450 - // because they are referenced by every XRadioButton through the listener
11451 - typedef std::map< rtl::OUString, css::uno::Reference< RadioGroup > > RadioGroupsMap;
11452 - RadioGroupsMap mxRadioGroups;
11453 -};
11454 -#endif
11455 -
11456 -#if 0
11457 -// generator
11458 -class Widget
11459 -{
11460 -public:
11461 - Widget( css::uno::Reference< css::awt::XToolkit > xToolkit,
11462 - css::uno::Reference< css::awt::XWindow > xToplevel,
11463 - rtl::OUString unoName, long attrbs );
11464 - virtual ~Widget();
11465 -
11466 - virtual void setProperties( const PropList &rProps );
11467 -
11468 - virtual bool addChild( Widget *pChild );
11469 - virtual void setChildProperties( Widget *pChild, const PropList &rProps );
11470 -
11471 - inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
11472 - { return mxWidget; }
11473 -
11474 - inline css::uno::Reference< css::awt::XLayoutConstrains > getContainer()
11475 - { return mxContainer; }
11476 -
11477 -protected:
11478 - css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
11479 - css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
11480 -};
11481 -
11482 -class Root
11483 -{
11484 -public:
11485 - Root( css::uno::Reference< css::awt::XToolkit > xToolkit )
11486 - : mxToolkit( xToolkit ) {}
11487 - ~Root();
11488 -
11489 - virtual Widget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs );
11490 -
11491 - css::uno::Reference< css::awt::XLayoutConstrains > getById( rtl::OUString id );
11492 - inline css::uno::Reference< css::awt::XLayoutConstrains > getToplevel();
11493 -
11494 -protected:
11495 - css::uno::Reference< css::awt::XToolkit > mxToolkit;
11496 - Widget *mpToplevel;
11497 -
11498 - typedef std::hash_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >,
11499 - rtl::OUStringHash > ItemHash;
11500 - ItemHash maItems;
11501 -};
11502 -#endif
11503 -
11504 -// parser
11505 -class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
11506 -{
11507 -public:
11508 - sal_Int32 XMLNS_LAYOUT_UID, XMLNS_CONTAINER_UID;
11509 - LayoutRoot &mrRoot; // switch to XNameContainer ref ?
11510 -#ifdef IMPORT_RADIOGROUP
11511 - RadioGroups mxRadioGroups;
11512 -#endif
11513 -
11514 - inline ImportContext( LayoutRoot &rRoot ) SAL_THROW( () )
11515 - : mrRoot( rRoot ) {}
11516 - virtual ~ImportContext() {}
11517 -
11518 - // XRoot
11519 - virtual void SAL_CALL startDocument(
11520 - css::uno::Reference< css::xml::input::XNamespaceMapping >
11521 - const & xNamespaceMapping )
11522 - throw (css::xml::sax::SAXException, css::uno::RuntimeException);
11523 - virtual void SAL_CALL endDocument()
11524 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11525 - { /* ignore */ }
11526 - virtual void SAL_CALL processingInstruction(
11527 - ::rtl::OUString const & /* rTarget */, ::rtl::OUString const & /* rData */ )
11528 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11529 - { /* ignore */ }
11530 - virtual void SAL_CALL setDocumentLocator(
11531 - css::uno::Reference< css::xml::sax::XLocator > const & /* xLocator */ )
11532 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11533 - { /* ignore */ }
11534 - virtual css::uno::Reference< css::xml::input::XElement >
11535 - SAL_CALL startRootElement(
11536 - sal_Int32 nUid, ::rtl::OUString const & rLocalName,
11537 - css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
11538 - throw (css::xml::sax::SAXException, css::uno::RuntimeException);
11539 -};
11540 -
11541 -class ElementBase : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
11542 -{
11543 -protected:
11544 - ImportContext *mpImport;
11545 -/* TODO: check if all this memebers are needed. */
11546 - ElementBase *mpParent;
11547 - sal_Int32 mnUid;
11548 -
11549 - ::rtl::OUString maLocalName;
11550 - css::uno::Reference< css::xml::input::XAttributes > mxAttributes;
11551 -public:
11552 - ElementBase(
11553 - sal_Int32 nUid, ::rtl::OUString const & rLocalName,
11554 - css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
11555 - ElementBase * pParent, ImportContext * pImport )
11556 - SAL_THROW( () );
11557 - virtual ~ElementBase() SAL_THROW(());
11558 -
11559 - // XElement
11560 - virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
11561 - throw (css::uno::RuntimeException)
11562 - { return static_cast< css::xml::input::XElement * >( mpParent ); }
11563 - virtual ::rtl::OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException)
11564 - { return maLocalName; }
11565 - virtual sal_Int32 SAL_CALL getUid() throw (css::uno::RuntimeException)
11566 - { return mnUid; }
11567 - virtual css::uno::Reference< css::xml::input::XAttributes >
11568 - SAL_CALL getAttributes() throw (css::uno::RuntimeException)
11569 - { return mxAttributes; }
11570 -
11571 - virtual void SAL_CALL ignorableWhitespace(
11572 - ::rtl::OUString const & /* rWhitespaces */ )
11573 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11574 - { /* ignore */ }
11575 - virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
11576 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11577 - { /* ignore */ }
11578 - virtual void SAL_CALL processingInstruction(
11579 - ::rtl::OUString const & /* Target */, ::rtl::OUString const & /* Data */ )
11580 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11581 - { /* ignore */ }
11582 -
11583 - virtual css::uno::Reference< css::xml::input::XElement >
11584 - SAL_CALL startChildElement(
11585 - sal_Int32 nUid, ::rtl::OUString const & rLocalName,
11586 - css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
11587 - throw (css::xml::sax::SAXException, css::uno::RuntimeException) = 0;
11588 - virtual void SAL_CALL endElement()
11589 - throw (css::xml::sax::SAXException, css::uno::RuntimeException)
11590 - { /* ignore */ }
11591 -};
11592 -
11593 -class WidgetElement : public ElementBase
11594 -{
11595 -protected:
11596 - LayoutWidget *mpWidget;
11597 -
11598 -public:
11599 - WidgetElement( sal_Int32 nUid, rtl::OUString const &name,
11600 - css::uno::Reference< css::xml::input::XAttributes > const &attributes,
11601 - ElementBase *parent, ImportContext *import ) SAL_THROW (());
11602 -
11603 - ~WidgetElement();
11604 -
11605 -
11606 - virtual css::uno::Reference< css::xml::input::XElement> SAL_CALL
11607 - startChildElement (sal_Int32 id, rtl::OUString const &name,
11608 - css::uno::Reference< css::xml::input::XAttributes > const &attributes)
11609 - throw( css::xml::sax::SAXException, css::uno::RuntimeException );
11610 - virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
11611 - throw (css::xml::sax::SAXException, css::uno::RuntimeException);
11612 -};
11613 -
11614 -class ToplevelElement : public WidgetElement
11615 -{
11616 -public:
11617 - ToplevelElement( rtl::OUString const &name,
11618 - css::uno::Reference< css::xml::input::XAttributes > const &attributes,
11619 - ImportContext *import ) SAL_THROW (());
11620 - ~ToplevelElement();
11621 -};
11622 -
11623 -
11624 -} // namespace layoutimpl
11625 -
11626 -#endif /* IMPORT_HXX */
11627 --- toolkit/source/layout/localized-string.cxx.old 2009-04-06 16:42:11.000000000 +0000
11628 +++ toolkit/source/layout/localized-string.cxx 1970-01-01 00:00:00.000000000 +0000
11629 @@ -1,87 +0,0 @@
11630 -/*************************************************************************
11631 - *
11632 - * OpenOffice.org - a multi-platform office productivity suite
11633 - *
11634 - * $RCSfile$
11635 - *
11636 - * $Revision$
11637 - *
11638 - * last change: $Author$ $Date$
11639 - *
11640 - * The Contents of this file are made available subject to
11641 - * the terms of GNU Lesser General Public License Version 2.1.
11642 - *
11643 - *
11644 - * GNU Lesser General Public License Version 2.1
11645 - * =============================================
11646 - * Copyright 2005 by Sun Microsystems, Inc.
11647 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11648 - *
11649 - * This library is free software; you can redistribute it and/or
11650 - * modify it under the terms of the GNU Lesser General Public
11651 - * License version 2.1, as published by the Free Software Foundation.
11652 - *
11653 - * This library is distributed in the hope that it will be useful,
11654 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11655 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11656 - * Lesser General Public License for more details.
11657 - *
11658 - * You should have received a copy of the GNU Lesser General Public
11659 - * License along with this library; if not, write to the Free Software
11660 - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
11661 - * MA 02110-1301 USA
11662 - *
11663 - ************************************************************************/
11664 -
11665 -#include "localized-string.hxx"
11666 -
11667 -#include <toolkit/helper/property.hxx>
11668 -#include <vcl/window.hxx>
11669 -
11670 -namespace layoutimpl
11671 -{
11672 -
11673 -namespace css = ::com::sun::star;
11674 -using namespace css;
11675 -using rtl::OUString;
11676 -
11677 -LocalizedString::LocalizedString()
11678 - : VCLXWindow()
11679 -{
11680 -}
11681 -
11682 -void LocalizedString::ImplGetPropertyIds( std::list< sal_uInt16 > &ids )
11683 -{
11684 - PushPropertyIds( ids, BASEPROPERTY_TEXT, 0);
11685 - VCLXWindow::ImplGetPropertyIds( ids );
11686 -}
11687 -
11688 -// XInterface
11689 -uno::Any LocalizedString::queryInterface( uno::Type const& rType )
11690 - throw(uno::RuntimeException)
11691 -{
11692 - uno::Any aRet = ::cppu::queryInterface( rType,
11693 - SAL_STATIC_CAST( awt::XFixedText*, this ) );
11694 - return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
11695 -}
11696 -
11697 -void LocalizedString::setText( OUString const& s )
11698 - throw(uno::RuntimeException)
11699 -{
11700 - ::vos::OGuard aGuard( GetMutex() );
11701 -
11702 - if ( Window *w = GetWindow() )
11703 - return w->SetText( s );
11704 -}
11705 -
11706 -OUString LocalizedString::getText()
11707 - throw(uno::RuntimeException)
11708 -{
11709 - ::vos::OGuard aGuard( GetMutex() );
11710 -
11711 - if ( Window *w = GetWindow() )
11712 - return w->GetText();
11713 - return OUString();
11714 -}
11715 -
11716 -} // namespace layoutimpl
11717 --- toolkit/source/layout/localized-string.hxx.old 2009-04-06 16:42:11.000000000 +0000
11718 +++ toolkit/source/layout/localized-string.hxx 1970-01-01 00:00:00.000000000 +0000
11719 @@ -1,84 +0,0 @@
11720 -/*************************************************************************
11721 - *
11722 - * OpenOffice.org - a multi-platform office productivity suite
11723 - *
11724 - * $RCSfile$
11725 - *
11726 - * $Revision$
11727 - *
11728 - * last change: $Author$ $Date$
11729 - *
11730 - * The Contents of this file are made available subject to
11731 - * the terms of GNU Lesser General Public License Version 2.1.
11732 - *
11733 - *
11734 - * GNU Lesser General Public License Version 2.1
11735 - * =============================================
11736 - * Copyright 2005 by Sun Microsystems, Inc.
11737 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11738 - *
11739 - * This library is free software; you can redistribute it and/or
11740 - * modify it under the terms of the GNU Lesser General Public
11741 - * License version 2.1, as published by the Free Software Foundation.
11742 - *
11743 - * This library is distributed in the hope that it will be useful,
11744 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11745 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11746 - * Lesser General Public License for more details.
11747 - *
11748 - * You should have received a copy of the GNU Lesser General Public
11749 - * License along with this library; if not, write to the Free Software
11750 - * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
11751 - * MA 02110-1301 USA
11752 - *
11753 - ************************************************************************/
11754 -
11755 -#ifndef CORE_LOCALIZED_STRING_HXX
11756 -#define CORE_LOCALIZED_STRING_HXX
11757 -
11758 -#include <com/sun/star/awt/XFixedText.hpp>
11759 -#include <toolkit/awt/vclxwindow.hxx>
11760 -
11761 -namespace layoutimpl
11762 -{
11763 -namespace css = ::com::sun::star;
11764 -
11765 -// FIXME: misuse XFixedText interface for simple string
11766 -class LocalizedString : public css::awt::XFixedText
11767 - , public VCLXWindow
11768 -{
11769 -public:
11770 - LocalizedString();
11771 -
11772 - // css::uno::XInterface
11773 - css::uno::Any SAL_CALL queryInterface( css::uno::Type const& rType )
11774 - throw(css::uno::RuntimeException);
11775 - void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
11776 - void SAL_CALL release() throw() { OWeakObject::release(); }
11777 -
11778 - // css::awt::XFixedText
11779 - void SAL_CALL setText( ::rtl::OUString const& s )
11780 - throw(css::uno::RuntimeException);
11781 - ::rtl::OUString SAL_CALL getText()
11782 - throw(css::uno::RuntimeException);
11783 - void SAL_CALL setAlignment( sal_Int16 )
11784 - throw(css::uno::RuntimeException) { }
11785 - sal_Int16 SAL_CALL getAlignment()
11786 - throw(css::uno::RuntimeException) { return 0; }
11787 -
11788 - // css::awt::XLayoutConstrains
11789 - virtual css::awt::Size SAL_CALL getMinimumSize()
11790 - throw(css::uno::RuntimeException) { return css::awt::Size( 0, 0 ); }
11791 - css::awt::Size SAL_CALL getPreferredSize()
11792 - throw(css::uno::RuntimeException) { return getMinimumSize(); }
11793 - css::awt::Size SAL_CALL calcAdjustedSize( css::awt::Size const& size )
11794 - throw(css::uno::RuntimeException) { return size; }
11795 -
11796 - static void ImplGetPropertyIds( std::list< sal_uInt16 > &ids );
11797 - virtual void GetPropertyIds( std::list< sal_uInt16 > &ids )
11798 - { return ImplGetPropertyIds( ids ); }
11799 -};
11800 -
11801 -} // namespace layoutimpl
11802 -
11803 -#endif /* CORE_LOCALIZED_STRING_HXX */
11804 --- toolkit/source/layout/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
11805 +++ toolkit/source/layout/makefile.mk 1970-01-01 00:00:00.000000000 +0000
11806 @@ -1,67 +0,0 @@
11807 -#*************************************************************************
11808 -#
11809 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11810 -#
11811 -# Copyright 2008 by Sun Microsystems, Inc.
11812 -#
11813 -# OpenOffice.org - a multi-platform office productivity suite
11814 -#
11815 -# $RCSfile: makefile.mk,v $
11816 -#
11817 -# $Revision: 1.3 $
11818 -#
11819 -# This file is part of OpenOffice.org.
11820 -#
11821 -# OpenOffice.org is free software: you can redistribute it and/or modify
11822 -# it under the terms of the GNU Lesser General Public License version 3
11823 -# only, as published by the Free Software Foundation.
11824 -#
11825 -# OpenOffice.org is distributed in the hope that it will be useful,
11826 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
11827 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11828 -# GNU Lesser General Public License version 3 for more details
11829 -# (a copy is included in the LICENSE file that accompanied this code).
11830 -#
11831 -# You should have received a copy of the GNU Lesser General Public License
11832 -# version 3 along with OpenOffice.org. If not, see
11833 -# <http://www.openoffice.org/license.html>
11834 -# for a copy of the LGPLv3 License.
11835 -#
11836 -#*************************************************************************
11837 -
11838 -PRJ=..$/..
11839 -PRJNAME=toolkit
11840 -TARGET=layoutcore
11841 -ENABLE_EXCEPTIONS=true
11842 -
11843 -# --- Settings -----------------------------------------------------
11844 -
11845 -.INCLUDE : settings.mk
11846 -.INCLUDE : $(PRJ)$/util$/makefile.pmk
11847 -
11848 -# --- Files --------------------------------------------------------
11849 -
11850 -# FIXME: This is bad, hmkay
11851 -CFLAGS+= -I$(PRJ)/source
11852 -
11853 -SLOFILES= \
11854 - $(SLO)$/bin.obj \
11855 - $(SLO)$/box-base.obj \
11856 - $(SLO)$/box.obj \
11857 - $(SLO)$/byteseq.obj \
11858 - $(SLO)$/container.obj \
11859 - $(SLO)$/dialogbuttonhbox.obj \
11860 - $(SLO)$/factory.obj \
11861 - $(SLO)$/flow.obj \
11862 - $(SLO)$/helper.obj \
11863 - $(SLO)$/import.obj \
11864 - $(SLO)$/localized-string.obj \
11865 - $(SLO)$/proplist.obj \
11866 - $(SLO)$/root.obj \
11867 - $(SLO)$/table.obj \
11868 - $(SLO)$/timer.obj \
11869 - $(SLO)$/translate.obj
11870 -
11871 -# --- Targets ------------------------------------------------------
11872 -
11873 -.INCLUDE : target.mk
11874 --- toolkit/source/layout/precompiled_xmlscript.hxx.old 2009-04-02 10:49:36.000000000 +0000
11875 +++ toolkit/source/layout/precompiled_xmlscript.hxx 1970-01-01 00:00:00.000000000 +0000
11876 @@ -1,39 +0,0 @@
11877 -/*************************************************************************
11878 - *
11879 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11880 - *
11881 - * Copyright 2008 by Sun Microsystems, Inc.
11882 - *
11883 - * OpenOffice.org - a multi-platform office productivity suite
11884 - *
11885 - * $RCSfile: precompiled_xmlscript.hxx,v $
11886 - *
11887 - * $Revision: 1.3 $
11888 - *
11889 - * This file is part of OpenOffice.org.
11890 - *
11891 - * OpenOffice.org is free software: you can redistribute it and/or modify
11892 - * it under the terms of the GNU Lesser General Public License version 3
11893 - * only, as published by the Free Software Foundation.
11894 - *
11895 - * OpenOffice.org is distributed in the hope that it will be useful,
11896 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11897 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11898 - * GNU Lesser General Public License version 3 for more details
11899 - * (a copy is included in the LICENSE file that accompanied this code).
11900 - *
11901 - * You should have received a copy of the GNU Lesser General Public License
11902 - * version 3 along with OpenOffice.org. If not, see
11903 - * <http://www.openoffice.org/license.html>
11904 - * for a copy of the LGPLv3 License.
11905 - *
11906 - ************************************************************************/
11907 -
11908 -/*
11909 - xmlscript/source/xml_helper/xml_byteseq.cxx compile helper.
11910 -
11911 - Avoid introducing a toolkit dependency on xmlscript.
11912 -
11913 - It would be nice to modify xml_byteseq.cxx making it friendlier
11914 - to include.
11915 -*/
11916 --- toolkit/source/layout/proplist.cxx.old 2009-04-06 16:42:11.000000000 +0000
11917 +++ toolkit/source/layout/proplist.cxx 1970-01-01 00:00:00.000000000 +0000
11918 @@ -1,458 +0,0 @@
11919 -/*************************************************************************
11920 - *
11921 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11922 - *
11923 - * Copyright 2008 by Sun Microsystems, Inc.
11924 - *
11925 - * OpenOffice.org - a multi-platform office productivity suite
11926 - *
11927 - * $RCSfile: proplist.cxx,v $
11928 - *
11929 - * $Revision: 1.3 $
11930 - *
11931 - * This file is part of OpenOffice.org.
11932 - *
11933 - * OpenOffice.org is free software: you can redistribute it and/or modify
11934 - * it under the terms of the GNU Lesser General Public License version 3
11935 - * only, as published by the Free Software Foundation.
11936 - *
11937 - * OpenOffice.org is distributed in the hope that it will be useful,
11938 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11939 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11940 - * GNU Lesser General Public License version 3 for more details
11941 - * (a copy is included in the LICENSE file that accompanied this code).
11942 - *
11943 - * You should have received a copy of the GNU Lesser General Public License
11944 - * version 3 along with OpenOffice.org. If not, see
11945 - * <http://www.openoffice.org/license.html>
11946 - * for a copy of the LGPLv3 License.
11947 - *
11948 - ************************************************************************/
11949 -
11950 -#include "proplist.hxx"
11951 -
11952 -#include <rtl/ustrbuf.hxx>
11953 -#include <toolkit/dllapi.h>
11954 -#include <com/sun/star/awt/WindowAttribute.hpp>
11955 -#include <com/sun/star/beans/XPropertySet.hpp>
11956 -#include <com/sun/star/awt/XVclWindowPeer.hpp>
11957 -#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
11958 -#include <tools/debug.hxx>
11959 -
11960 -#include "layout/layoutcore.hxx"
11961 -
11962 -#if TEST_LAYOUT && !defined( DBG_UTIL )
11963 -#include <cstdio>
11964 -#undef DBG_ERROR
11965 -#define DBG_ERROR printf
11966 -#undef DBG_ERROR1
11967 -#define DBG_ERROR1 printf
11968 -#undef DBG_ERROR2
11969 -#define DBG_ERROR2 printf
11970 -#endif /* TEST_LAYOUT && !DBG_UTIL */
11971 -
11972 -namespace layoutimpl
11973 -{
11974 -
11975 -using namespace com::sun::star;
11976 -using rtl::OString;
11977 -using rtl::OUString;
11978 -using rtl::OUStringBuffer;
11979 -
11980 -namespace prophlp
11981 -{
11982 -
11983 -bool TOOLKIT_DLLPUBLIC
11984 -canHandleProps( const uno::Reference< uno::XInterface > &xPeer )
11985 -{
11986 - uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
11987 - if ( xPropSet.is() )
11988 - return true;
11989 - uno::Reference< beans::XPropertySetInfo > xInfo( xPeer, uno::UNO_QUERY );
11990 - uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
11991 - return xInfo.is() && xVclPeer.is();
11992 -}
11993 -
11994 -uno::Reference< beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC
11995 -queryPropertyInfo(
11996 - const uno::Reference< uno::XInterface > &xPeer )
11997 -{
11998 - uno::Reference< beans::XPropertySetInfo > xInfo( xPeer, uno::UNO_QUERY );
11999 - if ( !xInfo.is() )
12000 - {
12001 - uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
12002 - if ( xPropSet.is() )
12003 - xInfo = xPropSet->getPropertySetInfo();
12004 - }
12005 - return xInfo;
12006 -}
12007 -
12008 -void TOOLKIT_DLLPUBLIC
12009 -setProperty( const uno::Reference< uno::XInterface > &xPeer,
12010 - const OUString &rName, uno::Any aValue )
12011 -{
12012 - uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
12013 - if ( xVclPeer.is() )
12014 - xVclPeer->setProperty( rName, aValue );
12015 - else
12016 - {
12017 - uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
12018 - xPropSet->setPropertyValue( rName, aValue );
12019 - }
12020 -}
12021 -
12022 -uno::Any TOOLKIT_DLLPUBLIC
12023 -getProperty( const uno::Reference< uno::XInterface > &xPeer,
12024 - const OUString &rName )
12025 -{
12026 - uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
12027 - if ( xVclPeer.is() )
12028 - return xVclPeer->getProperty( rName );
12029 -
12030 - uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
12031 - return xPropSet->getPropertyValue( rName );
12032 -}
12033 -
12034 -} // namespace prophlp
12035 -
12036 -
12037 -/* Given a string and a type, it converts the string to the type, and returns
12038 - it encapsulated in Any. */
12039 -uno::Any anyFromString( OUString const& value, uno::Type const& type )
12040 -{
12041 - sal_Int16 radix = 10;
12042 - OUString intval = value;
12043 - if ( value.getLength() > 2 && value[0] == '0' && value[1] == 'x' )
12044 - intval = value.copy( 2 ), radix = 16;
12045 - else if ( value.getLength() > 1 && value[0] == '#' )
12046 - intval = value.copy( 1 ), radix = 16;
12047 - switch ( type.getTypeClass() )
12048 - {
12049 - case uno::TypeClass_CHAR:
12050 - return uno::makeAny( value.toChar() );
12051 - case uno::TypeClass_BOOLEAN:
12052 - if ( value == OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) )
12053 - return uno::makeAny( true );
12054 - else if ( value == OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) )
12055 - return uno::makeAny( false );
12056 - break; // ends switch, throws exception
12057 - case uno::TypeClass_BYTE:
12058 - return uno::makeAny( ( sal_uInt8 ) intval.toInt32( radix ) );
12059 - case uno::TypeClass_SHORT:
12060 - return uno::makeAny( ( sal_Int16 ) intval.toInt32( radix ) );
12061 - case uno::TypeClass_UNSIGNED_SHORT:
12062 - return uno::makeAny( ( sal_uInt16 ) intval.toInt32( radix ) );
12063 - case uno::TypeClass_ENUM:
12064 - return uno::makeAny( ( sal_Int16 ) intval.toInt32( radix ) );
12065 - case uno::TypeClass_LONG:
12066 - return uno::makeAny( ( sal_Int32 ) intval.toInt32( radix ) );
12067 - case uno::TypeClass_UNSIGNED_LONG:
12068 - return uno::makeAny( ( sal_uInt32 ) intval.toInt32( radix ) );
12069 - case uno::TypeClass_HYPER:
12070 - return uno::makeAny( ( sal_Int64 ) intval.toInt64( radix ) );
12071 - case uno::TypeClass_UNSIGNED_HYPER:
12072 - return uno::makeAny( ( sal_uInt16 ) intval.toInt64( radix ) );
12073 - case uno::TypeClass_FLOAT:
12074 - return uno::makeAny( value.toFloat() );
12075 - case uno::TypeClass_DOUBLE:
12076 - return uno::makeAny( value.toDouble() );
12077 - case uno::TypeClass_STRING:
12078 - return uno::makeAny( value );
12079 - case uno::TypeClass_CONSTANT:
12080 - return uno::makeAny( intval.toInt32( radix ) );
12081 - case uno::TypeClass_INTERFACE:
12082 - return uno::makeAny( loadGraphic( OUSTRING_CSTR( value ) ) );
12083 - case uno::TypeClass_SEQUENCE:
12084 - {
12085 - sal_Int32 i = 0;
12086 - bool escaped = false, first = true;
12087 - OUString item, token;
12088 - std::list< OUString > values;
12089 - do
12090 - {
12091 - token = value.getToken( 0, ':', i );
12092 -
12093 - if ( !token.getLength() && !escaped )
12094 - {
12095 - escaped = true;
12096 - item += OUString( ':' );
12097 - }
12098 - else if ( escaped )
12099 - {
12100 - escaped = false;
12101 - item += token;
12102 - }
12103 - else
12104 - {
12105 - if ( !first )
12106 - values.push_back( item );
12107 - item = token;
12108 - }
12109 - first = false;
12110 - }
12111 - while ( i >= 0 );
12112 - if ( item.getLength() )
12113 - values.push_back( item );
12114 -
12115 - uno::Sequence< OUString > seq( values.size() );
12116 - i = 0;
12117 - for ( std::list< OUString >::const_iterator it = values.begin();
12118 - it != values.end(); it++, i++ )
12119 - seq[ i ] = *it;
12120 -
12121 - return uno::makeAny( seq );
12122 - }
12123 -
12124 - default:
12125 - DBG_ERROR1( "ERROR: unknown property type of value: `%s'\n", OUSTRING_CSTR( value ) );
12126 - break;
12127 - }
12128 - throw uno::RuntimeException();
12129 -}
12130 -
12131 -/* Converts the XML naming scheme to UNO's, for legacy compatibility
12132 - (so, ergo, "one-two-three-four" -> "OneTwoThreeFour"). */
12133 -static OUString toUnoNaming ( OUString const &string )
12134 -{
12135 - OUStringBuffer buffer( string.getLength() );
12136 - sal_Unicode *str = string.pData->buffer;
12137 - bool capitalize = true;
12138 -
12139 - for ( int i = 0; i < string.getLength(); i++ )
12140 - {
12141 - if ( i == 0 && str[0] == '_' )
12142 - /* Skip translate-me prefix. */
12143 - continue;
12144 - if ( str[i] == '-' )
12145 - capitalize = true;
12146 - else
12147 - {
12148 - if ( capitalize && str[i] >= 'a' && str[i] <= 'z' )
12149 - buffer.append( (sal_Unicode ) ( str[i] - 'a' + 'A' ) );
12150 - else
12151 - buffer.append( (sal_Unicode ) str[i] );
12152 - capitalize = false;
12153 - }
12154 - }
12155 -
12156 - return buffer.makeStringAndClear();
12157 -}
12158 -
12159 -/*
12160 - * convert incoming XML style property names, to AWT style property names.
12161 - * convert the values based on introspection information.
12162 - * apply to either an XPropertySet or an XPropertySetInfo | XVclWindowPeer
12163 - * aggregate.
12164 - */
12165 -void
12166 -setProperties( uno::Reference< uno::XInterface > const& xPeer,
12167 - PropList const& rProps )
12168 -{
12169 - if ( !prophlp::canHandleProps( xPeer ) )
12170 - {
12171 - DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" );
12172 - for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
12173 - it++ )
12174 - {
12175 - DBG_ERROR2( "%s=%s\n", OUSTRING_CSTR( it->first ), OUSTRING_CSTR( it->second ) );
12176 - }
12177 - return;
12178 - }
12179 -
12180 - for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
12181 - it++ )
12182 - setProperty( xPeer, it->first, it->second );
12183 -}
12184 -
12185 -void
12186 -setProperty( uno::Reference< uno::XInterface > const& xPeer,
12187 - OUString const& attr, OUString const& value )
12188 -{
12189 - OUString unoAttr = toUnoNaming( attr );
12190 -
12191 - OSL_TRACE( "setting %s=%s", OUSTRING_CSTR( attr ), OUSTRING_CSTR( value ) );
12192 - // get a Property object
12193 - beans::Property prop;
12194 - try
12195 - {
12196 - uno::Reference< beans::XPropertySetInfo > xInfo
12197 - = prophlp::queryPropertyInfo( xPeer );
12198 - prop = xInfo->getPropertyByName( unoAttr );
12199 - }
12200 - catch( beans::UnknownPropertyException & )
12201 - {
12202 - DBG_ERROR1( "Warning: unknown attribute: `%s'\n", OUSTRING_CSTR( unoAttr ) );
12203 - return;
12204 - }
12205 -
12206 - if ( prop.Name.getLength() <= 0 )
12207 - {
12208 - DBG_ERROR1( "Warning: missing prop: `%s'\n", OUSTRING_CSTR( unoAttr ) );
12209 - return;
12210 - }
12211 -
12212 - // encapsulates value in an uno::Any
12213 - uno::Any any;
12214 - try
12215 - {
12216 - any = anyFromString( value, prop.Type );
12217 - }
12218 - catch( uno::RuntimeException & )
12219 - {
12220 - DBG_ERROR5( "Warning: %s( %s )( %s ) attribute is of type %s( rejected: %s )\n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ), OUSTRING_CSTR( prop.Name ), OUSTRING_CSTR( prop.Type.getTypeName() ), OUSTRING_CSTR( value ) );
12221 - return;
12222 - }
12223 -
12224 - // sets value on property
12225 - try
12226 - {
12227 - prophlp::setProperty( xPeer, unoAttr, any );
12228 - }
12229 - catch( ... )
12230 - {
12231 - DBG_ERROR2( "Warning: cannot set attribute %s to %s \n", OUSTRING_CSTR( unoAttr ), OUSTRING_CSTR( value ) );
12232 - }
12233 -}
12234 -
12235 -
12236 -
12237 -
12238 -struct AttributesMap
12239 -{
12240 - const char *name;
12241 - long value;
12242 - bool windowAttr;
12243 -};
12244 -static const AttributesMap attribsMap[] =
12245 -{
12246 - { "autohscroll", awt::VclWindowPeerAttribute::AUTOHSCROLL, false },
12247 - { "autovscroll", awt::VclWindowPeerAttribute::AUTOVSCROLL, false },
12248 - { "center", awt::VclWindowPeerAttribute::CENTER, false },
12249 - { "clipchildren", awt::VclWindowPeerAttribute::CLIPCHILDREN, false },
12250 - { "closeable", awt::WindowAttribute::CLOSEABLE, true },
12251 - { "defbutton", awt::VclWindowPeerAttribute::DEFBUTTON, false },
12252 - { "dropdown", awt::VclWindowPeerAttribute::DROPDOWN, false },
12253 - { "fullsize", awt::WindowAttribute::FULLSIZE, true }, //FIXME?
12254 - { "group", awt::VclWindowPeerAttribute::GROUP, false },
12255 - { "has_border", awt::WindowAttribute::BORDER, true },
12256 - { "hscroll", awt::VclWindowPeerAttribute::HSCROLL, false },
12257 - { "left", awt::VclWindowPeerAttribute::LEFT, false },
12258 - { "moveable", awt::WindowAttribute::MOVEABLE, true },
12259 - { "noborder", awt::VclWindowPeerAttribute::NOBORDER, false },
12260 - { "nolabel", awt::VclWindowPeerAttribute::NOLABEL, false },
12261 - { "optimumsize", awt::WindowAttribute::OPTIMUMSIZE, false },
12262 - { "readonly", awt::VclWindowPeerAttribute::READONLY, false },
12263 - { "right", awt::VclWindowPeerAttribute::RIGHT, false },
12264 - { "show", awt::WindowAttribute::SHOW, true },
12265 - { "sizeable", awt::WindowAttribute::SIZEABLE, true },
12266 - { "sort", awt::VclWindowPeerAttribute::SORT, false },
12267 - { "spin", awt::VclWindowPeerAttribute::SPIN, false },
12268 - { "vscroll", awt::VclWindowPeerAttribute::VSCROLL, false },
12269 -
12270 - // cutting on OK, YES_NO_CANCEL and related obsite attributes...
12271 -};
12272 -static const int attribsMapLen = sizeof( attribsMap ) / sizeof( AttributesMap );
12273 -
12274 -#if 0
12275 -long getAttribute( const OUString &rName, bool bTopWindow )
12276 -{
12277 -
12278 - int min = 0, max = attribsMapLen - 1, mid, cmp;
12279 - do
12280 - {
12281 - mid = min +( max - min )/2;
12282 - cmp = rName.compareToAscii( attribsMap[ mid ].name );
12283 - if ( cmp > 0 )
12284 - min = mid+1;
12285 - else if ( cmp < 0 )
12286 - max = mid-1;
12287 - else
12288 - {
12289 - if ( bTopWindow || attribsMap[ mid ].value )
12290 - return attribsMap[ mid ].windowAttr;
12291 - return 0;
12292 - }
12293 - }
12294 - while ( min <= max );
12295 - return 0;
12296 -}
12297 -#endif
12298 -
12299 -void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttributes,
12300 - PropList &rProps, sal_Int32 nNamespace )
12301 -{
12302 - sal_Int32 nAttrs = xAttributes->getLength();
12303 - for ( sal_Int32 i = 0; i < nAttrs; i++ )
12304 - {
12305 - if ( nNamespace != xAttributes->getUidByIndex( i ) )
12306 - continue;
12307 -
12308 - std::pair< OUString, OUString > aElem
12309 - ( xAttributes->getLocalNameByIndex( i ),
12310 - xAttributes->getValueByIndex( i ) );
12311 -
12312 - if ( aElem.first.getLength() > 0 ) // namespace bits ..
12313 - rProps.push_back( aElem );
12314 - }
12315 -}
12316 -
12317 -bool
12318 -findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
12319 -{
12320 - PropList::iterator it;
12321 - OUString aName = OUString::createFromAscii( pAttr );
12322 -
12323 - for ( it = rProps.begin(); it != rProps.end(); it++ )
12324 - {
12325 - if ( it->first.equalsIgnoreAsciiCase( aName ) )
12326 - {
12327 - rValue = it->second;
12328 - rProps.erase( it );
12329 - return true;
12330 - }
12331 - }
12332 - rValue = OUString();
12333 - return false;
12334 -}
12335 -
12336 -long
12337 -getAttributeProps( PropList &rProps )
12338 -{
12339 - long nAttrs = 0;
12340 - OUString aValue;
12341 -
12342 - OUString trueStr( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
12343 -
12344 - if ( findAndRemove( "show", rProps, aValue ) &&
12345 - aValue.equalsIgnoreAsciiCase(
12346 - OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) ) )
12347 - ;
12348 - else
12349 - nAttrs |= awt::WindowAttribute::SHOW;
12350 -
12351 - for ( int i = 0; i < attribsMapLen; i++ )
12352 - {
12353 - if ( findAndRemove( attribsMap[i].name, rProps, aValue ) )
12354 - {
12355 - if ( aValue.equalsIgnoreAsciiCase( trueStr ) )
12356 - nAttrs |= attribsMap[i].value;
12357 - }
12358 - }
12359 -
12360 - if ( findAndRemove( "align", rProps, aValue ) )
12361 - {
12362 - sal_Int32 nVal = aValue.toInt32();
12363 -
12364 - if ( nVal == 0 /* PROPERTY_ALIGN_LEFT */ )
12365 - nAttrs |= awt::VclWindowPeerAttribute::LEFT;
12366 - else if ( nVal == 1 /* PROPERTY_ALIGN_CENTER */ )
12367 - nAttrs |= awt::VclWindowPeerAttribute::CENTER;
12368 - else if ( nVal == 2 )
12369 - nAttrs |= awt::VclWindowPeerAttribute::RIGHT;
12370 - }
12371 -
12372 - return nAttrs;
12373 -}
12374 -
12375 -}
12376 -
12377 --- toolkit/source/layout/proplist.hxx.old 2009-04-06 16:42:11.000000000 +0000
12378 +++ toolkit/source/layout/proplist.hxx 1970-01-01 00:00:00.000000000 +0000
12379 @@ -1,75 +0,0 @@
12380 -/*************************************************************************
12381 - *
12382 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
12383 - *
12384 - * Copyright 2008 by Sun Microsystems, Inc.
12385 - *
12386 - * OpenOffice.org - a multi-platform office productivity suite
12387 - *
12388 - * $RCSfile: proplist.hxx,v $
12389 - *
12390 - * $Revision: 1.3 $
12391 - *
12392 - * This file is part of OpenOffice.org.
12393 - *
12394 - * OpenOffice.org is free software: you can redistribute it and/or modify
12395 - * it under the terms of the GNU Lesser General Public License version 3
12396 - * only, as published by the Free Software Foundation.
12397 - *
12398 - * OpenOffice.org is distributed in the hope that it will be useful,
12399 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12400 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12401 - * GNU Lesser General Public License version 3 for more details
12402 - * (a copy is included in the LICENSE file that accompanied this code).
12403 - *
12404 - * You should have received a copy of the GNU Lesser General Public License
12405 - * version 3 along with OpenOffice.org. If not, see
12406 - * <http://www.openoffice.org/license.html>
12407 - * for a copy of the LGPLv3 License.
12408 - *
12409 - ************************************************************************/
12410 -
12411 -#ifndef CORE_PROPLIST_HXX
12412 -#define CORE_PROPLIST_HXX
12413 -
12414 -#include <list>
12415 -#include <com/sun/star/xml/input/XAttributes.hpp>
12416 -
12417 -#include <rtl/ustring.hxx>
12418 -
12419 -namespace layoutimpl
12420 -{
12421 -
12422 -namespace css = ::com::sun::star;
12423 -
12424 -typedef std::list< std::pair< rtl::OUString, rtl::OUString > > PropList;
12425 -
12426 -void propsFromAttributes( const css::uno::Reference<css::xml::input::XAttributes> & xAttributes,
12427 - PropList &rProps, sal_Int32 nNamespace );
12428 -
12429 -void setProperties( css::uno::Reference< css::uno::XInterface > const& xPeer,
12430 - PropList const& rProps);
12431 -
12432 -void setProperty( css::uno::Reference< css::uno::XInterface > const& xPeer,
12433 - rtl::OUString const& attr, rtl::OUString const& value );
12434 -
12435 -long getAttributeProps( PropList &rProps );
12436 -bool findAndRemove( const char *pAttr, PropList &rProps, rtl::OUString &rValue);
12437 -
12438 -}
12439 -
12440 -#if !OUSTRING_CSTR_PARANOIA
12441 -#define OUSTRING_CSTR( str ) \
12442 - rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
12443 -#else
12444 -
12445 -inline char const* OUSTRING_CSTR( rtl::OUString const& str )
12446 -{
12447 - rtl::OString *leak
12448 - = new rtl::OString (rtl::OUStringToOString (str, RTL_TEXTENCODING_ASCII_US));
12449 - return leak->getStr();
12450 -}
12451 -
12452 -#endif
12453 -
12454 -#endif // CORE_PROPLIST_HXX
12455 --- toolkit/source/layout/root.cxx.old 2009-04-06 16:42:11.000000000 +0000
12456 +++ toolkit/source/layout/root.cxx 1970-01-01 00:00:00.000000000 +0000
12457 @@ -1,415 +0,0 @@
12458 -/*************************************************************************
12459 - *
12460 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
12461 - *
12462 - * Copyright 2008 by Sun Microsystems, Inc.
12463 - *
12464 - * OpenOffice.org - a multi-platform office productivity suite
12465 - *
12466 - * $RCSfile: root.cxx,v $
12467 - *
12468 - * $Revision: 1.3 $
12469 - *
12470 - * This file is part of OpenOffice.org.
12471 - *
12472 - * OpenOffice.org is free software: you can redistribute it and/or modify
12473 - * it under the terms of the GNU Lesser General Public License version 3
12474 - * only, as published by the Free Software Foundation.
12475 - *
12476 - * OpenOffice.org is distributed in the hope that it will be useful,
12477 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12478 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12479 - * GNU Lesser General Public License version 3 for more details
12480 - * (a copy is included in the LICENSE file that accompanied this code).
12481 - *
12482 - * You should have received a copy of the GNU Lesser General Public License
12483 - * version 3 along with OpenOffice.org. If not, see
12484 - * <http://www.openoffice.org/license.html>
12485 - * for a copy of the LGPLv3 License.
12486 - *
12487 - ************************************************************************/
12488 -
12489 -#include "root.hxx"
12490 -
12491 -#include <cassert>
12492 -#include <cstdio>
12493 -
12494 -#include <com/sun/star/awt/WindowAttribute.hpp>
12495 -#include <com/sun/star/awt/XMessageBox.hpp>
12496 -#include <com/sun/star/awt/MessageBoxButtons.hpp>
12497 -#include <com/sun/star/frame/XDesktop.hpp>
12498 -#include <com/sun/star/awt/XMessageBoxFactory.hpp>
12499 -#include <com/sun/star/xml/sax/SAXParseException.hpp>
12500 -#include <com/sun/star/xml/sax/XParser.hpp>
12501 -
12502 -#include "helper.hxx"
12503 -#include "import.hxx"
12504 -#include "timer.hxx"
12505 -#include "translate.hxx"
12506 -
12507 -
12508 -namespace layoutimpl
12509 -{
12510 -
12511 -using namespace css;
12512 -using ::rtl::OUString;
12513 -
12514 -LayoutRoot::LayoutRoot( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
12515 - : mbDisposed( sal_False )
12516 - , mxFactory( xFactory )
12517 - , mpListeners( NULL )
12518 - , mpToplevel( NULL )
12519 -{
12520 - if ( !xFactory.is() )
12521 - throw uno::RuntimeException();
12522 - mxLayoutUnit = uno::Reference< awt::XLayoutUnit >( new LayoutUnit() );
12523 -}
12524 -
12525 -LayoutRoot::~LayoutRoot()
12526 -{
12527 -// TODO: we want to delete the top level LayoutWidget...
12528 - ::osl::MutexGuard aGuard( maMutex );
12529 - if ( !mbDisposed )
12530 - {
12531 - try
12532 - {
12533 - m_refCount++; // inhibit multiple destruction
12534 - dispose();
12535 - }
12536 - catch( uno::Exception& )
12537 - {
12538 - }
12539 - }
12540 -}
12541 -
12542 -void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactory, uno::Reference< awt::XToolkit > xToolkit, OUString const& aTitle, OUString const& aMessage )
12543 -{
12544 - uno::Reference< uno::XInterface > iDesktop = xFactory->createInstance
12545 - ( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
12546 - uno::Reference< frame::XDesktop > xDesktop ( iDesktop, uno::UNO_QUERY );
12547 - uno::Reference< frame::XFrame > xFrame ( xDesktop->getCurrentFrame() );
12548 - uno::Reference< awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
12549 - uno::Reference< awt::XWindowPeer > xWindowPeer( xContainerWindow, uno::UNO_QUERY_THROW );
12550 - uno::Reference< awt::XMessageBoxFactory > xMessageBoxFactory( xToolkit, uno::UNO_QUERY );
12551 -
12552 - awt::Rectangle aRectangle;
12553 - uno::Reference< awt::XMessageBox > xMessageBox
12554 - = xMessageBoxFactory->createMessageBox
12555 - ( xWindowPeer, aRectangle, OUString::createFromAscii( "errorbox" ),
12556 - awt::MessageBoxButtons::BUTTONS_OK, aTitle, aMessage );
12557 -
12558 - if ( xMessageBox.is() )
12559 - xMessageBox->execute();
12560 - //FIXME: exceptions not caught and printed at top level??
12561 - //else
12562 - //printf( "%s\n", OUSTRING_CSTR( aMessage ) );
12563 -}
12564 -
12565 -void LayoutRoot::error( OUString const& message )
12566 -{
12567 - printf( "%s\n", OUSTRING_CSTR( message ) );
12568 - ShowMessageBox( mxFactory, mxToolkit,
12569 - OUString::createFromAscii( "Fatal error" ),
12570 - message );
12571 - throw uno::RuntimeException( message, uno::Reference< uno::XInterface >() );
12572 -}
12573 -
12574 -// XInitialization
12575 -void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArguments )
12576 - throw ( uno::Exception,
12577 - uno::RuntimeException )
12578 -{
12579 - ::osl::MutexGuard aGuard( maMutex );
12580 -
12581 - if ( mbDisposed )
12582 - throw lang::DisposedException();
12583 -
12584 - if ( mxContainer.is() ) // only 1 init ...
12585 - throw uno::Exception();
12586 -
12587 - if ( !aArguments.getLength() )
12588 - throw lang::IllegalArgumentException();
12589 -
12590 - OSL_ENSURE( aArguments.getLength() == 1, "Wrong arg count\n" );
12591 -
12592 - OUString aXMLName;
12593 - if ( !( aArguments[0] >>= aXMLName ) )
12594 - throw lang::IllegalArgumentException();
12595 -
12596 - uno::Reference< xml::sax::XParser > xParser
12597 - ( mxFactory->createInstance(
12598 - OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ),
12599 - uno::UNO_QUERY );
12600 - OSL_ASSERT( xParser.is() );
12601 - if (! xParser.is() )
12602 - {
12603 - throw uno::RuntimeException(
12604 - OUString::createFromAscii( "cannot create sax-parser component" ),
12605 - uno::Reference< uno::XInterface >() );
12606 - }
12607 -
12608 - // FIXME: quite possibly we want to pass this in ...
12609 - uno::Reference< awt::XToolkit > xToolkit;
12610 -
12611 - mxToolkit = uno::Reference< awt::XToolkit >(
12612 - mxFactory->createInstance(
12613 - OUString::createFromAscii( "com.sun.star.awt.Toolkit" ) ),
12614 - uno::UNO_QUERY );
12615 -
12616 - if ( !mxToolkit.is() )
12617 - throw uno::RuntimeException(
12618 - OUString::createFromAscii( "failed to create toolkit!" ),
12619 - uno::Reference< uno::XInterface >() );
12620 -
12621 - OUString aXMLFile = readRightTranslation( aXMLName );
12622 - uno::Reference< io::XInputStream > xStream = getFileAsStream( aXMLFile );
12623 - if (! xStream.is() )
12624 - error( OUString::createFromAscii( "Installation problem: cannot find XML file:" ) + aXMLName );
12625 -
12626 - // error handler, entity resolver omitted
12627 -
12628 - ImportContext *pCtx = new ImportContext( *this );
12629 -
12630 - uno::Reference< xml::input::XRoot > xRoot( pCtx );
12631 - uno::Sequence < uno::Any > aArgs( 1 );
12632 - aArgs[0] <<= xRoot;
12633 - uno::Reference< xml::sax::XDocumentHandler > xDocHandler
12634 - (mxFactory->createInstanceWithArguments
12635 - ( OUString::createFromAscii( "com.sun.star.xml.input.SaxDocumentHandler" ),
12636 - aArgs ), uno::UNO_QUERY );
12637 -
12638 - if (! xDocHandler.is() )
12639 - error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName );
12640 -
12641 - xParser->setDocumentHandler( xDocHandler );
12642 -
12643 - xml::sax::InputSource source;
12644 - source.aInputStream = xStream;
12645 - source.sSystemId = OUString::createFromAscii( "virtual file" );
12646 -
12647 - try
12648 - {
12649 - xParser->parseStream( source );
12650 - }
12651 - catch ( xml::sax::SAXParseException& e )
12652 - {
12653 - OUString c = OUString::createFromAscii( ":" );
12654 - error( aXMLName
12655 - + c + OUString::valueOf( e.LineNumber )
12656 - + c + OUString::valueOf( e.ColumnNumber )
12657 - + c + OUString::createFromAscii( "Sax parse error" ) );
12658 - }
12659 -}
12660 -
12661 -// XLayoutContainer
12662 -uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (uno::RuntimeException)
12663 -{
12664 - return uno::Reference< awt::XLayoutContainer >();
12665 -}
12666 -
12667 -// local helper ...
12668 -void LayoutRoot::addItem( const OUString &rName,
12669 - const uno::Reference< awt::XLayoutConstrains > &xRef )
12670 -{
12671 - maItems[ rName ] = xRef;
12672 -}
12673 -
12674 -// XNameAccess
12675 -uno::Any SAL_CALL LayoutRoot::getByName( const OUString &rName )
12676 - throw ( container::NoSuchElementException,
12677 - lang::WrappedTargetException,
12678 - uno::RuntimeException )
12679 -{
12680 - ::osl::MutexGuard aGuard( maMutex );
12681 - if ( mbDisposed )
12682 - throw lang::DisposedException();
12683 -
12684 - uno::Reference< awt::XLayoutConstrains > xItem;
12685 - ItemHash::iterator i = maItems.find( rName );
12686 - if ( i != maItems.end() )
12687 - xItem = i->second;
12688 - return uno::makeAny( xItem );
12689 -}
12690 -
12691 -sal_Bool SAL_CALL LayoutRoot::hasByName( const OUString &rName )
12692 - throw (uno::RuntimeException)
12693 -{
12694 - ::osl::MutexGuard aGuard( maMutex );
12695 - if ( mbDisposed ) throw lang::DisposedException();
12696 -
12697 - ItemHash::iterator i = maItems.find( rName );
12698 - return i != maItems.end();
12699 -}
12700 -
12701 -uno::Sequence< OUString > SAL_CALL LayoutRoot::getElementNames()
12702 - throw ( uno::RuntimeException )
12703 -{
12704 - ::osl::MutexGuard aGuard( maMutex );
12705 - if ( mbDisposed ) throw lang::DisposedException();
12706 -
12707 - uno::Sequence< OUString > aNames( maItems.size() );
12708 - sal_Int32 nPos = 0;
12709 -
12710 - for ( ItemHash::const_iterator i = maItems.begin();
12711 - i != maItems.end(); i++ )
12712 - aNames[ nPos++ ] = i->first;
12713 -
12714 - return aNames;
12715 -}
12716 -
12717 -uno::Type SAL_CALL LayoutRoot::getElementType()
12718 - throw ( uno::RuntimeException )
12719 -{
12720 - return getCppuType( ( const uno::Reference< awt::XLayoutConstrains >* )NULL );
12721 -}
12722 -
12723 -sal_Bool SAL_CALL LayoutRoot::hasElements()
12724 - throw ( uno::RuntimeException )
12725 -{
12726 - ::osl::MutexGuard aGuard( maMutex );
12727 -
12728 - if ( mbDisposed ) throw lang::DisposedException();
12729 -
12730 - return maItems.size() > 0;
12731 -}
12732 -
12733 -// XComponent
12734 -void SAL_CALL LayoutRoot::dispose()
12735 - throw ( uno::RuntimeException )
12736 -{
12737 - ::osl::MutexGuard aGuard( maMutex );
12738 -
12739 - if ( mbDisposed ) throw lang::DisposedException();
12740 -
12741 - if ( mpListeners )
12742 - {
12743 -
12744 - lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
12745 - mpListeners->disposeAndClear( aSource );
12746 - delete mpListeners;
12747 - mpListeners = NULL;
12748 - }
12749 -
12750 - maItems.clear();
12751 - mbDisposed = sal_True;
12752 -}
12753 -
12754 -void SAL_CALL LayoutRoot::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
12755 - throw ( uno::RuntimeException )
12756 -{
12757 - ::osl::MutexGuard aGuard( maMutex );
12758 -
12759 - if ( mbDisposed ) throw lang::DisposedException();
12760 -
12761 - if ( !mpListeners )
12762 - mpListeners = new ::cppu::OInterfaceContainerHelper( maMutex );
12763 - mpListeners->addInterface( xListener );
12764 -}
12765 -
12766 -void SAL_CALL LayoutRoot::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
12767 - throw ( uno::RuntimeException )
12768 -{
12769 - ::osl::MutexGuard aGuard( maMutex );
12770 -
12771 - if ( mbDisposed ) throw lang::DisposedException();
12772 -
12773 - if ( mpListeners )
12774 - mpListeners->removeInterface( xListener );
12775 -}
12776 -
12777 -// builder
12778 -
12779 -LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attrbs,uno::Reference< awt::XLayoutContainer > xParent )
12780 -{
12781 - LayoutWidget *pWidget = new LayoutWidget( mxToolkit, xParent, unoName, attrbs );
12782 - if ( !mpToplevel )
12783 - {
12784 - mpToplevel = pWidget;
12785 - mxWindow = uno::Reference< awt::XWindow >( pWidget->getPeer(), uno::UNO_QUERY );
12786 - mxContainer = pWidget->mxContainer;
12787 - }
12788 - if ( pWidget->mxContainer.is() )
12789 - pWidget->mxContainer->setLayoutUnit( mxLayoutUnit );
12790 - if ( id.getLength() )
12791 - maItems[ id ] = pWidget->getPeer();
12792 - return pWidget;
12793 -}
12794 -
12795 -#if 0
12796 -uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
12797 -{
12798 - if ( mpToplevel )
12799 - return mpToplevel->getPeer();
12800 - return uno::Reference< awt::XLayoutConstrains > ();
12801 -}
12802 -
12803 -uno::Reference< awt::XLayoutConstrains > LayoutRoot::getById( OUString id )
12804 -{
12805 - uno::Reference< awt::XLayoutConstrains > rRef = 0;
12806 - ItemHash::iterator i = maItems.find( id );
12807 - if ( i != maItems.end() )
12808 - rRef = i->second;
12809 - return rRef;
12810 -}
12811 -#endif
12812 -
12813 -LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
12814 - uno::Reference< awt::XLayoutContainer > xParent,
12815 - OUString unoName, long attrbs )
12816 -{
12817 - while ( xParent.is() && !uno::Reference< awt::XWindow >( xParent, uno::UNO_QUERY ).is() )
12818 - {
12819 - uno::Reference< awt::XLayoutContainer > xContainer( xParent, uno::UNO_QUERY );
12820 - assert( xContainer.is() );
12821 - xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
12822 - }
12823 -
12824 - mxWidget = createWidget( xToolkit, xParent, unoName, attrbs );
12825 - assert( mxWidget.is() );
12826 - mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
12827 -}
12828 -
12829 -LayoutWidget::~LayoutWidget()
12830 -{
12831 - /* should we dispose of the references...? */
12832 - // at least of its children... Or should root?
12833 -}
12834 -
12835 -bool LayoutWidget::addChild( LayoutWidget *pChild )
12836 -{
12837 - if ( !mxContainer.is() )
12838 - return false;
12839 -
12840 - try
12841 - {
12842 - mxContainer->addChild( pChild->mxWidget );
12843 - }
12844 - catch( awt::MaxChildrenException ex )
12845 - {
12846 - return false;
12847 - }
12848 - return true;
12849 -}
12850 -
12851 -void LayoutWidget::setProperties( PropList const& rProps )
12852 -{
12853 - ::layoutimpl::setProperties( mxWidget, rProps );
12854 -}
12855 -
12856 -void LayoutWidget::setProperty( OUString const& attr, OUString const& value )
12857 -{
12858 - ::layoutimpl::setProperty( mxWidget, attr, value );
12859 -}
12860 -
12861 -void LayoutWidget::setChildProperties( LayoutWidget *pChild,
12862 - PropList const& rProps )
12863 -{
12864 - uno::Reference< beans::XPropertySet > xChildPeer;
12865 - xChildPeer = mxContainer->getChildProperties( pChild->mxWidget );
12866 -
12867 - if ( xChildPeer.is() )
12868 - ::layoutimpl::setProperties( xChildPeer, rProps );
12869 -}
12870 -
12871 -} // namespace layoutimpl
12872 -
12873 --- toolkit/source/layout/root.hxx.old 2009-04-06 16:42:11.000000000 +0000
12874 +++ toolkit/source/layout/root.hxx 1970-01-01 00:00:00.000000000 +0000
12875 @@ -1,160 +0,0 @@
12876 -/*************************************************************************
12877 - *
12878 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
12879 - *
12880 - * Copyright 2008 by Sun Microsystems, Inc.
12881 - *
12882 - * OpenOffice.org - a multi-platform office productivity suite
12883 - *
12884 - * $RCSfile: root.hxx,v $
12885 - *
12886 - * $Revision: 1.3 $
12887 - *
12888 - * This file is part of OpenOffice.org.
12889 - *
12890 - * OpenOffice.org is free software: you can redistribute it and/or modify
12891 - * it under the terms of the GNU Lesser General Public License version 3
12892 - * only, as published by the Free Software Foundation.
12893 - *
12894 - * OpenOffice.org is distributed in the hope that it will be useful,
12895 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12896 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12897 - * GNU Lesser General Public License version 3 for more details
12898 - * (a copy is included in the LICENSE file that accompanied this code).
12899 - *
12900 - * You should have received a copy of the GNU Lesser General Public License
12901 - * version 3 along with OpenOffice.org. If not, see
12902 - * <http://www.openoffice.org/license.html>
12903 - * for a copy of the LGPLv3 License.
12904 - *
12905 - ************************************************************************/
12906 -
12907 -#ifndef CORE_ROOT_HXX
12908 -#define CORE_ROOT_HXX
12909 -
12910 -#define _BACKWARD_BACKWARD_WARNING_H 1
12911 -#include <hash_map>
12912 -
12913 -#include <com/sun/star/awt/XLayoutRoot.hpp>
12914 -#include <com/sun/star/awt/XToolkit.hpp>
12915 -#include <com/sun/star/awt/XWindow.hpp>
12916 -#include <com/sun/star/io/XInputStream.hpp>
12917 -#include <com/sun/star/lang/XComponent.hpp>
12918 -#include <com/sun/star/lang/XInitialization.hpp>
12919 -#include <cppuhelper/implbase3.hxx>
12920 -#include <cppuhelper/interfacecontainer.h>
12921 -#include <toolkit/dllapi.h>
12922 -
12923 -#include "proplist.hxx"
12924 -
12925 -namespace layoutimpl
12926 -{
12927 -
12928 -namespace css = ::com::sun::star;
12929 -
12930 -css::uno::Reference< css::io::XInputStream > getFileAsStream( const rtl::OUString &rName );
12931 -
12932 -/* Interface generation code -- to hook to a parser. */
12933 -
12934 -/*
12935 - TODO: (ricardo) I think we should cut on LayoutRoot, stripping out its widget
12936 - proxy interface (just make it return the root widget). Would even make it easier
12937 - if there was interest to support multiple toplevel widgets in the same file.
12938 -
12939 - We also need to make sure the code gets diposed well... There is no need to keep
12940 - these objects around after initialization...
12941 -*/
12942 -
12943 -
12944 -class LayoutWidget;
12945 -
12946 -class TOOLKIT_DLLPUBLIC LayoutRoot : public ::cppu::WeakImplHelper3<
12947 - css::awt::XLayoutRoot,
12948 - css::lang::XInitialization,
12949 - css::lang::XComponent>
12950 -{
12951 -protected:
12952 - ::osl::Mutex maMutex;
12953 -
12954 - typedef std::hash_map< rtl::OUString,
12955 - css::uno::Reference< css::awt::XLayoutConstrains >,
12956 - ::rtl::OUStringHash > ItemHash;
12957 - ItemHash maItems;
12958 -
12959 - sal_Bool mbDisposed;
12960 - css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
12961 - ::cppu::OInterfaceContainerHelper *mpListeners;
12962 -
12963 - css::uno::Reference< css::awt::XWindow > mxWindow;
12964 - css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
12965 -
12966 - css::uno::Reference< css::awt::XToolkit > mxToolkit;
12967 - LayoutWidget *mpToplevel;
12968 - css::uno::Reference< css::awt::XLayoutUnit > mxLayoutUnit;
12969 -
12970 - void error( rtl::OUString const& message );
12971 -
12972 -public:
12973 - LayoutRoot( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
12974 - virtual ~LayoutRoot();
12975 -
12976 - void addItem( const rtl::OUString &rName,
12977 - const css::uno::Reference< css::awt::XLayoutConstrains > &xRef );
12978 -
12979 - void setWindow( css::uno::Reference< css::awt::XLayoutConstrains > xPeer )
12980 - {
12981 - mxWindow = css::uno::Reference< css::awt::XWindow >( xPeer, css::uno::UNO_QUERY );
12982 - }
12983 -
12984 - // get XLayoutContainer
12985 - virtual css::uno::Reference< css::awt::XLayoutContainer > SAL_CALL getLayoutContainer() throw (css::uno::RuntimeException);
12986 -
12987 - // XInitialization
12988 - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException);
12989 -
12990 - // XNameAccess
12991 - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
12992 - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException);
12993 - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
12994 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
12995 - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
12996 -
12997 - // XComponent
12998 - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
12999 - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
13000 - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
13001 -
13002 - // generator
13003 - virtual LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs, css::uno::Reference< css::awt::XLayoutContainer > xParent );
13004 -};
13005 -
13006 -class TOOLKIT_DLLPUBLIC LayoutWidget
13007 -{
13008 - friend class LayoutRoot;
13009 -
13010 -public:
13011 - LayoutWidget() {}
13012 - LayoutWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
13013 - css::uno::Reference< css::awt::XLayoutContainer > xToplevel,
13014 - rtl::OUString unoName, long attrbs );
13015 - virtual ~LayoutWidget();
13016 -
13017 - virtual void setProperties( const PropList &rProps );
13018 - virtual void setProperty( rtl::OUString const& attr, rtl::OUString const& value );
13019 -
13020 - virtual bool addChild( LayoutWidget *pChild );
13021 - virtual void setChildProperties( LayoutWidget *pChild, const PropList &rProps );
13022 -
13023 - inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
13024 - { return mxWidget; }
13025 - inline css::uno::Reference< css::awt::XLayoutContainer > getContainer()
13026 - { return mxContainer; }
13027 -
13028 -protected:
13029 - css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
13030 - css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
13031 -};
13032 -
13033 -} // namespace layoutimpl
13034 -
13035 -#endif // CORE_ROOT_HXX
13036 --- toolkit/source/layout/table.cxx.old 2009-04-02 10:49:36.000000000 +0000
13037 +++ toolkit/source/layout/table.cxx 1970-01-01 00:00:00.000000000 +0000
13038 @@ -1,315 +0,0 @@
13039 -/*************************************************************************
13040 - *
13041 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13042 - *
13043 - * Copyright 2008 by Sun Microsystems, Inc.
13044 - *
13045 - * OpenOffice.org - a multi-platform office productivity suite
13046 - *
13047 - * $RCSfile: table.cxx,v $
13048 - *
13049 - * $Revision: 1.3 $
13050 - *
13051 - * This file is part of OpenOffice.org.
13052 - *
13053 - * OpenOffice.org is free software: you can redistribute it and/or modify
13054 - * it under the terms of the GNU Lesser General Public License version 3
13055 - * only, as published by the Free Software Foundation.
13056 - *
13057 - * OpenOffice.org is distributed in the hope that it will be useful,
13058 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13059 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13060 - * GNU Lesser General Public License version 3 for more details
13061 - * (a copy is included in the LICENSE file that accompanied this code).
13062 - *
13063 - * You should have received a copy of the GNU Lesser General Public License
13064 - * version 3 along with OpenOffice.org. If not, see
13065 - * <http://www.openoffice.org/license.html>
13066 - * for a copy of the LGPLv3 License.
13067 - *
13068 - ************************************************************************/
13069 -
13070 -#include <table.hxx>
13071 -
13072 -#include <sal/macros.h>
13073 -#include <osl/mutex.hxx>
13074 -#include <cppuhelper/propshlp.hxx>
13075 -#include <cppuhelper/interfacecontainer.h>
13076 -#include <com/sun/star/awt/PosSize.hpp>
13077 -#include <tools/debug.hxx>
13078 -
13079 -// fixed point precision for distributing error
13080 -#define FIXED_PT 16
13081 -
13082 -namespace layoutimpl
13083 -{
13084 -
13085 -using namespace com::sun::star;
13086 -
13087 -Table::ChildProps::ChildProps( Table::ChildData *pData )
13088 -{
13089 - addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
13090 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
13091 - &( pData->mbExpand[ 0 ] ) );
13092 - addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
13093 - ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
13094 - &( pData->mbExpand[ 1 ] ) );
13095 - addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
13096 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
13097 - &( pData->mnColSpan ) );
13098 - addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
13099 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
13100 - &( pData->mnRowSpan ) );
13101 -}
13102 -
13103 -bool Table::ChildData::isVisible()
13104 -{
13105 - return Box_Base::ChildData::isVisible()
13106 - && ( mnColSpan > 0 ) && ( mnRowSpan > 0 );
13107 -}
13108 -
13109 -Table::Table()
13110 - : Box_Base()
13111 - , mnColsLen( 1 )// another default value could be 0xffff for infinite columns( = 1 row )
13112 -{
13113 - addProp( RTL_CONSTASCII_USTRINGPARAM( "Columns" ),
13114 - ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
13115 - &mnColsLen );
13116 -}
13117 -
13118 -Table::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
13119 - : Box_Base::ChildData( xChild )
13120 -// , mbExpand( { 0, 1 } )
13121 - , mnColSpan( 1 )
13122 - , mnRowSpan( 1 )
13123 - , mnLeftCol( 0 )
13124 - , mnRightCol( 0 )
13125 - , mnTopRow( 0 )
13126 - , mnBottomRow( 0 )
13127 -{
13128 - mbExpand[ 0 ] = 0;
13129 - mbExpand[ 1 ] = 1;
13130 -}
13131 -
13132 -Table::ChildData*
13133 -Table::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
13134 -{
13135 - return new ChildData( xChild );
13136 -}
13137 -
13138 -Table::ChildProps*
13139 -Table::createChildProps( Box_Base::ChildData *pData )
13140 -{
13141 - return new ChildProps( static_cast<Table::ChildData*> ( pData ) );
13142 -}
13143 -
13144 -void SAL_CALL
13145 -Table::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
13146 - throw( uno::RuntimeException, awt::MaxChildrenException )
13147 -{
13148 - if ( xChild.is() )
13149 - {
13150 - Box_Base::addChild( xChild );
13151 - // cause of flicker
13152 - allocateChildAt( xChild, awt::Rectangle( 0,0,0,0 ) );
13153 - }
13154 -}
13155 -
13156 -awt::Size SAL_CALL
13157 -Table::getMinimumSize() throw( uno::RuntimeException )
13158 -{
13159 - int nRowsLen = 0;
13160 -
13161 - // 1. layout the table -- adjust to cope with row-spans...
13162 - {
13163 - // temporary 1D representation of the table
13164 - std::vector< ChildData *> aTable;
13165 -
13166 - int col = 0;
13167 - int row = 0;
13168 - for ( std::list<Box_Base::ChildData *>::iterator it
13169 - = maChildren.begin(); it != maChildren.end(); it++ )
13170 - {
13171 - ChildData *child = static_cast<Table::ChildData*> ( *it );
13172 - if ( !child->isVisible() )
13173 - continue;
13174 -
13175 - while ( col + SAL_MIN( child->mnColSpan, mnColsLen ) > mnColsLen )
13176 - {
13177 - col = 0;
13178 - row++;
13179 -
13180 - unsigned int i = col + ( row*mnColsLen );
13181 - while ( aTable.size() > i && !aTable[ i ] )
13182 - i++;
13183 -
13184 - col = i % mnColsLen;
13185 - row = i / mnColsLen;
13186 - }
13187 -
13188 - child->mnLeftCol = col;
13189 - child->mnRightCol = SAL_MIN( col + child->mnColSpan, mnColsLen );
13190 - child->mnTopRow = row;
13191 - child->mnBottomRow = row + child->mnRowSpan;
13192 -
13193 - col += child->mnColSpan;
13194 -
13195 - unsigned int start = child->mnLeftCol +( child->mnTopRow*mnColsLen );
13196 - unsigned int end =( child->mnRightCol-1 ) +( ( child->mnBottomRow-1 )*mnColsLen );
13197 - if ( aTable.size() < end+1 )
13198 - aTable.resize( end+1, NULL );
13199 - for ( unsigned int i = start; i < end; i++ )
13200 - aTable[ i ] = child;
13201 -
13202 - nRowsLen = SAL_MAX( nRowsLen, child->mnBottomRow );
13203 - }
13204 - }
13205 -
13206 - // 2. calculate columns/rows sizes
13207 - for ( int g = 0; g < 2; g++ )
13208 - {
13209 - std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
13210 -
13211 - aGroup.clear();
13212 - aGroup.resize( g == 0 ? mnColsLen : nRowsLen );
13213 -
13214 - // 2.1 base sizes on one-column/row children
13215 - for ( std::list<Box_Base::ChildData *>::iterator it
13216 - = maChildren.begin(); it != maChildren.end(); it++ )
13217 - {
13218 - ChildData *child = static_cast<Table::ChildData*> ( *it );
13219 - if ( !child->isVisible() )
13220 - continue;
13221 - const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
13222 - const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
13223 -
13224 - if ( nFirstAttach == nLastAttach-1 )
13225 - {
13226 - child->maRequisition = child->mxChild->getMinimumSize();
13227 - int attach = nFirstAttach;
13228 - int child_size = g == 0 ? child->maRequisition.Width
13229 - : child->maRequisition.Height;
13230 - aGroup[ attach ].mnSize = SAL_MAX( aGroup[ attach ].mnSize,
13231 - child_size );
13232 - if ( child->mbExpand[ g ] )
13233 - aGroup[ attach ].mbExpand = true;
13234 - }
13235 - }
13236 -
13237 - // 2.2 make sure multiple-columns/rows children fit
13238 - for ( std::list<Box_Base::ChildData *>::iterator it
13239 - = maChildren.begin(); it != maChildren.end(); it++ )
13240 - {
13241 - ChildData *child = static_cast<Table::ChildData*> ( *it );
13242 - if ( !child->isVisible() )
13243 - continue;
13244 - const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
13245 - const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
13246 -
13247 - if ( nFirstAttach != nLastAttach-1 )
13248 - {
13249 - child->maRequisition = child->mxChild->getMinimumSize();
13250 - int size = 0;
13251 - int expandables = 0;
13252 - for ( int i = nFirstAttach; i < nLastAttach; i++ )
13253 - {
13254 - size += aGroup[ i ].mnSize;
13255 - if ( aGroup[ i ].mbExpand )
13256 - expandables++;
13257 - }
13258 -
13259 - int child_size = g == 0 ? child->maRequisition.Width
13260 - : child->maRequisition.Height;
13261 - int extra = child_size - size;
13262 - if ( extra > 0 )
13263 - {
13264 - if ( expandables )
13265 - extra /= expandables;
13266 - else
13267 - extra /= nLastAttach - nFirstAttach;
13268 -
13269 - for ( int i = nFirstAttach; i < nLastAttach; i++ )
13270 - if ( expandables == 0 || aGroup[ i ].mbExpand )
13271 - aGroup[ i ].mnSize += extra;
13272 - }
13273 - }
13274 - }
13275 - }
13276 -
13277 - // 3. Sum everything up
13278 - mnColExpandables =( mnRowExpandables = 0 );
13279 - maRequisition.Width =( maRequisition.Height = 0 );
13280 - for ( std::vector<GroupData>::iterator it = maCols.begin();
13281 - it != maCols.end(); it++ )
13282 - {
13283 - maRequisition.Width += it->mnSize;
13284 - if ( it->mbExpand )
13285 - mnColExpandables++;
13286 - }
13287 - for ( std::vector<GroupData>::iterator it = maRows.begin();
13288 - it != maRows.end(); it++ )
13289 - {
13290 - maRequisition.Height += it->mnSize;
13291 - if ( it->mbExpand )
13292 - mnRowExpandables++;
13293 - }
13294 -
13295 - return maRequisition;
13296 -}
13297 -
13298 -void SAL_CALL
13299 -Table::allocateArea( const awt::Rectangle &rArea )
13300 - throw( uno::RuntimeException )
13301 -{
13302 - maAllocation = rArea;
13303 - if ( maCols.size() == 0 || maRows.size() == 0 )
13304 - return;
13305 -
13306 - int nExtraSize[ 2 ] = { SAL_MAX( rArea.Width - maRequisition.Width, 0 ),
13307 - SAL_MAX( rArea.Height - maRequisition.Height, 0 ) };
13308 - // split it
13309 - nExtraSize[ 0 ] /= mnColExpandables ? mnColExpandables : mnColsLen;
13310 - nExtraSize[ 1 ] /= mnRowExpandables ? mnRowExpandables : maRows.size();
13311 -
13312 - for ( std::list<Box_Base::ChildData *>::const_iterator it
13313 - = maChildren.begin(); it != maChildren.end(); it++ )
13314 - {
13315 - ChildData *child = static_cast<Table::ChildData*> ( *it );
13316 - if ( !child->isVisible() )
13317 - continue;
13318 -
13319 - awt::Rectangle rChildArea( rArea.X, rArea.Y, 0, 0 );
13320 -
13321 - for ( int g = 0; g < 2; g++ )
13322 - {
13323 - std::vector< GroupData > &aGroup = g == 0 ? maCols : maRows;
13324 - const int nFirstAttach = g == 0 ? child->mnLeftCol : child->mnTopRow;
13325 - const int nLastAttach = g == 0 ? child->mnRightCol : child->mnBottomRow;
13326 -
13327 - for ( int i = 0; i < nFirstAttach; i++ )
13328 - {
13329 - int gSize = aGroup[ i ].mnSize;
13330 - if ( aGroup[ i ].mbExpand )
13331 - gSize += nExtraSize[ g ];
13332 - if ( g == 0 )
13333 - rChildArea.X += gSize;
13334 - else
13335 - rChildArea.Y += gSize;
13336 - }
13337 - for ( int i = nFirstAttach; i < nLastAttach; i++ )
13338 - {
13339 - int gSize = aGroup[ i ].mnSize;
13340 - if ( aGroup[ i ].mbExpand )
13341 - gSize += nExtraSize[ g ];
13342 - if ( g == 0 )
13343 - rChildArea.Width += gSize;
13344 - else
13345 - rChildArea.Height += gSize;
13346 - }
13347 - }
13348 -
13349 - allocateChildAt( child->mxChild, rChildArea );
13350 - }
13351 -}
13352 -
13353 -} // namespace layoutimpl
13354 --- toolkit/source/layout/table.hxx.old 2009-04-02 10:49:36.000000000 +0000
13355 +++ toolkit/source/layout/table.hxx 1970-01-01 00:00:00.000000000 +0000
13356 @@ -1,108 +0,0 @@
13357 -/*************************************************************************
13358 - *
13359 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13360 - *
13361 - * Copyright 2008 by Sun Microsystems, Inc.
13362 - *
13363 - * OpenOffice.org - a multi-platform office productivity suite
13364 - *
13365 - * $RCSfile: table.hxx,v $
13366 - *
13367 - * $Revision: 1.3 $
13368 - *
13369 - * This file is part of OpenOffice.org.
13370 - *
13371 - * OpenOffice.org is free software: you can redistribute it and/or modify
13372 - * it under the terms of the GNU Lesser General Public License version 3
13373 - * only, as published by the Free Software Foundation.
13374 - *
13375 - * OpenOffice.org is distributed in the hope that it will be useful,
13376 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13377 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13378 - * GNU Lesser General Public License version 3 for more details
13379 - * (a copy is included in the LICENSE file that accompanied this code).
13380 - *
13381 - * You should have received a copy of the GNU Lesser General Public License
13382 - * version 3 along with OpenOffice.org. If not, see
13383 - * <http://www.openoffice.org/license.html>
13384 - * for a copy of the LGPLv3 License.
13385 - *
13386 - ************************************************************************/
13387 -
13388 -#ifndef TABLE_HXX
13389 -#define TABLE_HXX
13390 -
13391 -#include "box-base.hxx"
13392 -
13393 -namespace layoutimpl
13394 -{
13395 -
13396 -class Table : public Box_Base
13397 -{
13398 -public:
13399 - // Children properties
13400 - struct ChildData : public Box_Base::ChildData
13401 - {
13402 - sal_Bool mbExpand[ 2 ];
13403 - sal_Int32 mnColSpan;
13404 - sal_Int32 mnRowSpan;
13405 - int mnLeftCol;
13406 - int mnRightCol;
13407 - int mnTopRow;
13408 - int mnBottomRow;
13409 -
13410 - ChildData( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
13411 - bool isVisible();
13412 - };
13413 -
13414 - struct ChildProps : public Box_Base::ChildProps
13415 - {
13416 - ChildProps( ChildData *pData );
13417 - };
13418 -
13419 -protected:
13420 -
13421 - // a group of children; either a column or a row
13422 - struct GroupData
13423 - {
13424 - sal_Bool mbExpand;
13425 - int mnSize; // request size (width or height)
13426 - GroupData() : mbExpand( false ), mnSize( 0 ) {}
13427 - };
13428 -
13429 - // Table properties
13430 - sal_Int32 mnColsLen;
13431 - std::vector< GroupData > maCols;
13432 - std::vector< GroupData > maRows;
13433 - int mnColExpandables, mnRowExpandables;
13434 -
13435 - ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
13436 - ChildProps *createChildProps( Box_Base::ChildData* pData );
13437 -
13438 -public:
13439 - Table();
13440 -
13441 - // css::awt::XLayoutContainer
13442 - virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
13443 - throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
13444 -
13445 - virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
13446 - throw (css::uno::RuntimeException);
13447 -
13448 - virtual css::awt::Size SAL_CALL getMinimumSize()
13449 - throw(css::uno::RuntimeException);
13450 -
13451 - // unimplemented:
13452 - virtual sal_Bool SAL_CALL hasHeightForWidth()
13453 - throw(css::uno::RuntimeException)
13454 - { return false; }
13455 - virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 /*nWidth*/ )
13456 - throw(css::uno::RuntimeException)
13457 - { return maRequisition.Height; }
13458 -
13459 - PROPHELPER_SET_INFO
13460 -};
13461 -
13462 -} // namespace layoutimpl
13463 -
13464 -#endif /*TABLE_HXX*/
13465 --- toolkit/source/layout/timer.cxx.old 2009-04-02 10:49:36.000000000 +0000
13466 +++ toolkit/source/layout/timer.cxx 1970-01-01 00:00:00.000000000 +0000
13467 @@ -1,152 +0,0 @@
13468 -/*************************************************************************
13469 - *
13470 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13471 - *
13472 - * Copyright 2008 by Sun Microsystems, Inc.
13473 - *
13474 - * OpenOffice.org - a multi-platform office productivity suite
13475 - *
13476 - * $RCSfile: timer.cxx,v $
13477 - *
13478 - * $Revision: 1.3 $
13479 - *
13480 - * This file is part of OpenOffice.org.
13481 - *
13482 - * OpenOffice.org is free software: you can redistribute it and/or modify
13483 - * it under the terms of the GNU Lesser General Public License version 3
13484 - * only, as published by the Free Software Foundation.
13485 - *
13486 - * OpenOffice.org is distributed in the hope that it will be useful,
13487 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13488 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13489 - * GNU Lesser General Public License version 3 for more details
13490 - * (a copy is included in the LICENSE file that accompanied this code).
13491 - *
13492 - * You should have received a copy of the GNU Lesser General Public License
13493 - * version 3 along with OpenOffice.org. If not, see
13494 - * <http://www.openoffice.org/license.html>
13495 - * for a copy of the LGPLv3 License.
13496 - *
13497 - ************************************************************************/
13498 -
13499 -#include "timer.hxx"
13500 -
13501 -#include <vector>
13502 -#include <list>
13503 -#include <vcl/timer.hxx>
13504 -#include <com/sun/star/awt/XLayoutContainer.hpp>
13505 -
13506 -namespace layoutimpl
13507 -{
13508 -using namespace ::com::sun::star;
13509 -
13510 -class AllocateTimer : public Timer
13511 -{
13512 - typedef std::list< uno::Reference< awt::XLayoutContainer > > ContainerList;
13513 - ContainerList mxContainers;
13514 - uno::Reference< awt::XLayoutContainer > mxLastAdded;
13515 -
13516 -public:
13517 - AllocateTimer()
13518 - {
13519 - // timer set to 0 -- just process it as soon as it gets idle
13520 - SetTimeout( 0 );
13521 - }
13522 -
13523 - static inline bool isParentOf( uno::Reference< awt::XLayoutContainer > xParent,
13524 - uno::Reference< awt::XLayoutContainer > xWidget )
13525 - {
13526 - while ( xWidget.is() )
13527 - {
13528 - if ( xWidget == xParent )
13529 - return true;
13530 - xWidget = uno::Reference< awt::XLayoutContainer >( xWidget->getParent(), uno::UNO_QUERY );
13531 - }
13532 - return false;
13533 - }
13534 -
13535 - static inline void eraseChildren( ContainerList::iterator &it, ContainerList &list )
13536 - {
13537 - ContainerList::iterator jt = list.begin();
13538 - while ( jt != list.end() )
13539 - {
13540 - if ( it != jt && isParentOf( *it, *jt ) )
13541 - jt = list.erase( jt );
13542 - else
13543 - jt++;
13544 - }
13545 - }
13546 -
13547 - static inline bool isContainerDamaged( uno::Reference< awt::XLayoutContainer > xContainer )
13548 - {
13549 - uno::Reference< awt::XLayoutConstrains > xConstrains( xContainer, uno::UNO_QUERY );
13550 - awt::Size lastReq( xContainer->getRequestedSize() );
13551 - awt::Size curReq( xConstrains->getMinimumSize() );
13552 - return lastReq.Width != curReq.Width || lastReq.Height != curReq.Height;
13553 - }
13554 -
13555 - void add( const uno::Reference< awt::XLayoutContainer > &xContainer )
13556 - {
13557 - // small optimization
13558 - if ( mxLastAdded == xContainer )
13559 - return;
13560 - mxLastAdded = xContainer;
13561 -
13562 - mxContainers.push_back( xContainer );
13563 - }
13564 -
13565 - virtual void Timeout()
13566 - {
13567 - mxLastAdded = uno::Reference< awt::XLayoutContainer >();
13568 -
13569 - // 1. remove duplications and children
13570 - for ( ContainerList::iterator it = mxContainers.begin();
13571 - it != mxContainers.end(); it++ )
13572 - eraseChildren( it, mxContainers );
13573 -
13574 - // 2. check damage extent
13575 - for ( ContainerList::iterator it = mxContainers.begin();
13576 - it != mxContainers.end(); it++ )
13577 - {
13578 - uno::Reference< awt::XLayoutContainer > xContainer = *it;
13579 - while ( xContainer->getParent().is() && isContainerDamaged( xContainer ) )
13580 - {
13581 - xContainer = uno::Reference< awt::XLayoutContainer >(
13582 - xContainer->getParent(), uno::UNO_QUERY );
13583 - }
13584 -
13585 - if ( *it != xContainer )
13586 - {
13587 - // 2.2 replace it with parent
13588 - *it = xContainer;
13589 -
13590 - // 2.3 remove children of new parent
13591 - eraseChildren( it, mxContainers );
13592 - }
13593 - }
13594 -
13595 - // 3. force re-calculations
13596 - for( ContainerList::iterator it = mxContainers.begin();
13597 - it != mxContainers.end(); it++ )
13598 - (*it)->allocateArea( (*it)->getAllocatedArea() );
13599 - }
13600 -};
13601 -
13602 -static void AddResizeTimeout( const uno::Reference< awt::XLayoutContainer > &xCont )
13603 -{
13604 - static AllocateTimer timer;
13605 - timer.add( xCont );
13606 - timer.Start();
13607 -}
13608 -
13609 -LayoutUnit::LayoutUnit() : LayoutUnit_Base()
13610 -{
13611 -}
13612 -
13613 -void SAL_CALL LayoutUnit::queueResize( const uno::Reference< awt::XLayoutContainer > &xContainer )
13614 - throw( uno::RuntimeException )
13615 -{
13616 - AddResizeTimeout( xContainer );
13617 -}
13618 -
13619 -}
13620 --- toolkit/source/layout/timer.hxx.old 2009-04-02 10:49:36.000000000 +0000
13621 +++ toolkit/source/layout/timer.hxx 1970-01-01 00:00:00.000000000 +0000
13622 @@ -1,53 +0,0 @@
13623 -/*************************************************************************
13624 - *
13625 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13626 - *
13627 - * Copyright 2008 by Sun Microsystems, Inc.
13628 - *
13629 - * OpenOffice.org - a multi-platform office productivity suite
13630 - *
13631 - * $RCSfile: timer.hxx,v $
13632 - *
13633 - * $Revision: 1.3 $
13634 - *
13635 - * This file is part of OpenOffice.org.
13636 - *
13637 - * OpenOffice.org is free software: you can redistribute it and/or modify
13638 - * it under the terms of the GNU Lesser General Public License version 3
13639 - * only, as published by the Free Software Foundation.
13640 - *
13641 - * OpenOffice.org is distributed in the hope that it will be useful,
13642 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13643 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13644 - * GNU Lesser General Public License version 3 for more details
13645 - * (a copy is included in the LICENSE file that accompanied this code).
13646 - *
13647 - * You should have received a copy of the GNU Lesser General Public License
13648 - * version 3 along with OpenOffice.org. If not, see
13649 - * <http://www.openoffice.org/license.html>
13650 - * for a copy of the LGPLv3 License.
13651 - *
13652 - ************************************************************************/
13653 -
13654 -#ifndef CORE_TIMER_HXX
13655 -#define CORE_TIMER_HXX
13656 -
13657 -#include <com/sun/star/awt/XLayoutUnit.hpp>
13658 -#include <cppuhelper/implbase1.hxx>
13659 -
13660 -namespace layoutimpl
13661 -{
13662 -
13663 -typedef ::cppu::WeakImplHelper1< com::sun::star::awt::XLayoutUnit > LayoutUnit_Base;
13664 -
13665 -class LayoutUnit : public LayoutUnit_Base
13666 -{
13667 -public:
13668 - LayoutUnit();
13669 - void SAL_CALL queueResize( const com::sun::star::uno::Reference< com::sun::star::awt::XLayoutContainer > &xContainer )
13670 - throw( com::sun::star::uno::RuntimeException );
13671 -};
13672 -
13673 -}
13674 -
13675 -#endif /*CORE_TIMER_HXX*/
13676 --- toolkit/source/layout/translate.cxx.old 2009-04-06 16:42:11.000000000 +0000
13677 +++ toolkit/source/layout/translate.cxx 1970-01-01 00:00:00.000000000 +0000
13678 @@ -1,134 +0,0 @@
13679 -/*************************************************************************
13680 - *
13681 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13682 - *
13683 - * Copyright 2008 by Sun Microsystems, Inc.
13684 - *
13685 - * OpenOffice.org - a multi-platform office productivity suite
13686 - *
13687 - * $RCSfile: translate.cxx,v $
13688 - *
13689 - * $Revision: 1.4 $
13690 - *
13691 - * This file is part of OpenOffice.org.
13692 - *
13693 - * OpenOffice.org is free software: you can redistribute it and/or modify
13694 - * it under the terms of the GNU Lesser General Public License version 3
13695 - * only, as published by the Free Software Foundation.
13696 - *
13697 - * OpenOffice.org is distributed in the hope that it will be useful,
13698 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13699 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13700 - * GNU Lesser General Public License version 3 for more details
13701 - * (a copy is included in the LICENSE file that accompanied this code).
13702 - *
13703 - * You should have received a copy of the GNU Lesser General Public License
13704 - * version 3 along with OpenOffice.org. If not, see
13705 - * <http://www.openoffice.org/license.html>
13706 - * for a copy of the LGPLv3 License.
13707 - *
13708 - ************************************************************************/
13709 -
13710 -#include "translate.hxx"
13711 -
13712 -#include <list>
13713 -#if TEST_LAYOUT
13714 -#include <cstdio>
13715 -#include "tools/getprocessworkingdir.hxx"
13716 -#endif
13717 -
13718 -#include <unotools/bootstrap.hxx>
13719 -#include <unotools/localfilehelper.hxx>
13720 -#include <unotools/ucbhelper.hxx>
13721 -#include <vcl/svapp.hxx>
13722 -
13723 -#include "proplist.hxx"
13724 -
13725 -namespace layoutimpl
13726 -{
13727 -namespace css = ::com::sun::star;
13728 -using namespace css;
13729 -using ::rtl::OUString;
13730 -using ::utl::LocalFileHelper;
13731 -using ::utl::UCBContentHelper;
13732 -using ::utl::Bootstrap;
13733 -
13734 -static std::list<OUString>
13735 -getLocaleSubdirList( lang::Locale const& rLocale )
13736 -{
13737 - std::list<OUString> aSubdirs;
13738 - aSubdirs.push_front( OUString::createFromAscii( "." ) );
13739 - aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
13740 - if ( rLocale.Language.getLength() )
13741 - aSubdirs.push_front( rLocale.Language );
13742 - if ( rLocale.Country.getLength() )
13743 - {
13744 - OUString aLocaleCountry = rLocale.Language
13745 - + OUString::createFromAscii( "_" )
13746 - + rLocale.Country;
13747 - aSubdirs.push_front( aLocaleCountry );
13748 - if ( rLocale.Variant.getLength() )
13749 - aSubdirs.push_front( aLocaleCountry
13750 - + OUString::createFromAscii( "." )
13751 - + rLocale.Variant );
13752 - }
13753 - return aSubdirs;
13754 -}
13755 -
13756 -static bool
13757 -fileExists( String const& aFile )
13758 -{
13759 - String aUrl;
13760 - LocalFileHelper::ConvertPhysicalNameToURL( aFile, aUrl );
13761 - return UCBContentHelper::Exists( aUrl );
13762 -}
13763 -
13764 -static OUString
13765 -getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
13766 - OUString const& aXMLName )
13767 -{
13768 - static OUString const aSlash = OUString::createFromAscii( "/" );
13769 - String aResult;
13770 - for ( std::list<OUString>::const_iterator i = aSubDirs.begin();
13771 - i != aSubDirs.end(); i++ )
13772 - {
13773 - String aFile = aDir + aSlash + *i + aSlash + aXMLName;
13774 - OSL_TRACE( "testing: %s", OUSTRING_CSTR( aFile ) );
13775 - if ( fileExists( aFile ) )
13776 - return aFile;
13777 - }
13778 - return OUString();
13779 -}
13780 -
13781 -/* FIXME: IWBN to share code with impimagetree.cxx, also for reading
13782 - from zip files. */
13783 -OUString
13784 -readRightTranslation( OUString const& aXMLName )
13785 -{
13786 - String aXMLFile;
13787 - std::list<OUString> aSubdirs
13788 - = getLocaleSubdirList( Application::GetSettings().GetUILocale() );
13789 -#if TEST_LAYOUT // read from cwd first
13790 - OUString aCurrentWorkingUrl;
13791 - tools::getProcessWorkingDir( &aCurrentWorkingUrl );
13792 - String aCurrentWorkingDir;
13793 - LocalFileHelper::ConvertURLToPhysicalName( aCurrentWorkingUrl, aCurrentWorkingDir );
13794 - aXMLFile = getFirstExisting( aCurrentWorkingDir, aSubdirs, aXMLName );
13795 - if ( aXMLFile.Len() )
13796 - ;
13797 - else
13798 -#endif /* TEST_LAYOUT */
13799 - {
13800 - OUString aShareUrl;
13801 - Bootstrap::locateSharedData( aShareUrl );
13802 - OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" );
13803 - String aXMLDir;
13804 - LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir );
13805 - aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName );
13806 - }
13807 -
13808 - OSL_TRACE( "FOUND:%s", OUSTRING_CSTR ( OUString (aXMLFile) ) );
13809 - return aXMLFile;
13810 -}
13811 -
13812 -} // namespace layoutimpl
13813 --- toolkit/source/layout/translate.hxx.old 2009-04-02 10:49:36.000000000 +0000
13814 +++ toolkit/source/layout/translate.hxx 1970-01-01 00:00:00.000000000 +0000
13815 @@ -1,44 +0,0 @@
13816 -/*************************************************************************
13817 - *
13818 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13819 - *
13820 - * Copyright 2008 by Sun Microsystems, Inc.
13821 - *
13822 - * OpenOffice.org - a multi-platform office productivity suite
13823 - *
13824 - * $RCSfile: translate.hxx,v $
13825 - *
13826 - * $Revision: 1.3 $
13827 - *
13828 - * This file is part of OpenOffice.org.
13829 - *
13830 - * OpenOffice.org is free software: you can redistribute it and/or modify
13831 - * it under the terms of the GNU Lesser General Public License version 3
13832 - * only, as published by the Free Software Foundation.
13833 - *
13834 - * OpenOffice.org is distributed in the hope that it will be useful,
13835 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
13836 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13837 - * GNU Lesser General Public License version 3 for more details
13838 - * (a copy is included in the LICENSE file that accompanied this code).
13839 - *
13840 - * You should have received a copy of the GNU Lesser General Public License
13841 - * version 3 along with OpenOffice.org. If not, see
13842 - * <http://www.openoffice.org/license.html>
13843 - * for a copy of the LGPLv3 License.
13844 - *
13845 - ************************************************************************/
13846 -
13847 -#ifndef CORE_TRANSLATE_HXX
13848 -#define CORE_TRANSLATE_HXX
13849 -
13850 -namespace rtl {
13851 -class OUString;
13852 -} // namespace rtl
13853 -
13854 -namespace layoutimpl
13855 -{
13856 -::rtl::OUString readRightTranslation( ::rtl::OUString const& aXMLName );
13857 -} // namespace layoutimpl
13858 -
13859 -#endif /* CORE_TRANSLATE_HXX */
13860 --- toolkit/source/layout/vcl/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
13861 +++ toolkit/source/layout/vcl/makefile.mk 2009-04-06 16:42:13.000000000 +0000
13862 @@ -0,0 +1,56 @@
13863 +#*************************************************************************
13864 +#
13865 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13866 +#
13867 +# Copyright 2008 by Sun Microsystems, Inc.
13868 +#
13869 +# OpenOffice.org - a multi-platform office productivity suite
13870 +#
13871 +# $RCSfile$
13872 +#
13873 +# $Revision$
13874 +#
13875 +# This file is part of OpenOffice.org.
13876 +#
13877 +# OpenOffice.org is free software: you can redistribute it and/or modify
13878 +# it under the terms of the GNU Lesser General Public License version 3
13879 +# only, as published by the Free Software Foundation.
13880 +#
13881 +# OpenOffice.org is distributed in the hope that it will be useful,
13882 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
13883 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13884 +# GNU Lesser General Public License version 3 for more details
13885 +# (a copy is included in the LICENSE file that accompanied this code).
13886 +#
13887 +# You should have received a copy of the GNU Lesser General Public License
13888 +# version 3 along with OpenOffice.org. If not, see
13889 +# <http://www.openoffice.org/license.html>
13890 +# for a copy of the LGPLv3 License.
13891 +#
13892 +#*************************************************************************
13893 +
13894 +PRJ=../../..
13895 +PRJNAME=toolkit
13896 +TARGET=layout-vcl
13897 +ENABLE_EXCEPTIONS=true
13898 +
13899 +# --- Settings -----------------------------------------------------
13900 +
13901 +.INCLUDE : settings.mk
13902 +.INCLUDE : $(PRJ)$/util$/makefile.pmk
13903 +
13904 +.IF "$(COMNAME)" == "gcc3"
13905 +CFLAGS+=-Wall -fno-default-inline
13906 +.ENDIF
13907 +
13908 +# --- Files --------------------------------------------------------
13909 +
13910 +SLOFILES= \
13911 + $(SLO)$/wrapper.obj \
13912 + $(SLO)$/wbutton.obj \
13913 + $(SLO)$/wcontainer.obj \
13914 + $(SLO)$/wfield.obj
13915 +
13916 +# --- Targets ------------------------------------------------------
13917 +
13918 +.INCLUDE : target.mk
13919 --- toolkit/source/layout/vcl/wbutton.cxx.old 1970-01-01 00:00:00.000000000 +0000
13920 +++ toolkit/source/layout/vcl/wbutton.cxx 2009-04-06 16:42:13.000000000 +0000
13921 @@ -0,0 +1,675 @@
13922 +/*************************************************************************
13923 + *
13924 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
13925 + *
13926 + * Copyright 2008 by Sun Microsystems, Inc.
13927 + *
13928 + * OpenOffice.org - a multi-platform office productivity suite
13929 + *
13930 + * $RCSfile$
13931 + *
13932 + * $Revision$
13933 + *
13934 + * This file is part of OpenOffice.org.
13935 + *
13936 + * OpenOffice.org is free software: you can redistribute it and/or modify
13937 + * it under the terms of the GNU Lesser General Public License version 3
13938 + * only, as published by the Free Software Foundation.
13939 + *
13940 + * OpenOffice.org is distributed in the hope that it will be useful,
13941 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13942 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13943 + * GNU Lesser General Public License version 3 for more details
13944 + * (a copy is included in the LICENSE file that accompanied this code).
13945 + *
13946 + * You should have received a copy of the GNU Lesser General Public License
13947 + * version 3 along with OpenOffice.org. If not, see
13948 + * <http://www.openoffice.org/license.html>
13949 + * for a copy of the LGPLv3 License.
13950 + *
13951 + ************************************************************************/
13952 +
13953 +#include "wrapper.hxx"
13954 +
13955 +#include <com/sun/star/awt/PosSize.hpp>
13956 +#include <com/sun/star/awt/XActionListener.hpp>
13957 +#include <com/sun/star/awt/XButton.hpp>
13958 +#include <com/sun/star/awt/XCheckBox.hpp>
13959 +#include <com/sun/star/awt/XRadioButton.hpp>
13960 +#include <com/sun/star/graphic/XGraphic.hpp>
13961 +#include <cppuhelper/implbase1.hxx>
13962 +#include <toolkit/awt/vclxwindow.hxx>
13963 +#include <toolkit/awt/vclxwindows.hxx>
13964 +#include <toolkit/helper/convert.hxx>
13965 +#include <vcl/button.hxx>
13966 +#include <vcl/event.hxx>
13967 +#include <vcl/msgbox.hxx>
13968 +#include <vcl/svapp.hxx>
13969 +#include <vcl/window.hxx>
13970 +
13971 +#include <list>
13972 +
13973 +#include <layout/core/helper.hxx>
13974 +
13975 +using namespace ::com::sun::star;
13976 +
13977 +using rtl::OUString;
13978 +
13979 +namespace layout
13980 +{
13981 +
13982 +class ImageImpl
13983 +{
13984 + public:
13985 + uno::Reference< graphic::XGraphic > mxGraphic;
13986 + ImageImpl( const char *pName )
13987 + : mxGraphic( layoutimpl::loadGraphic( pName ) )
13988 + {
13989 + if ( !mxGraphic.is() )
13990 + {
13991 + DBG_ERROR1( "ERROR: failed to load image: `%s'\n", pName );
13992 + }
13993 + }
13994 +};
13995 +
13996 +Image::Image( const char *pName )
13997 + : pImpl( new ImageImpl( pName ) )
13998 +{
13999 +}
14000 +
14001 +Image::~Image()
14002 +{
14003 + delete pImpl;
14004 +}
14005 +
14006 +class ButtonImpl : public ControlImpl
14007 + , public ::cppu::WeakImplHelper1< awt::XActionListener >
14008 +{
14009 + Link maClickHdl;
14010 +
14011 +public:
14012 + uno::Reference< awt::XButton > mxButton;
14013 + ButtonImpl( Context *context, const PeerHandle &peer, Window *window )
14014 + : ControlImpl( context, peer, window )
14015 + , mxButton( peer, uno::UNO_QUERY )
14016 + {
14017 + /* We have default action when clicked, always listen. */
14018 + mxButton->addActionListener( this );
14019 + }
14020 +
14021 + ~ButtonImpl()
14022 + {
14023 + }
14024 +
14025 + virtual void Click() { /* make me pure virtual? */ };
14026 +
14027 + Link& GetClickHdl ()
14028 + {
14029 + return maClickHdl;
14030 + }
14031 +
14032 + virtual void SetClickHdl( Link const& link )
14033 + {
14034 + maClickHdl = link;
14035 + }
14036 +
14037 + void SAL_CALL disposing( lang::EventObject const& e )
14038 + throw (uno::RuntimeException)
14039 + {
14040 + mxButton->removeActionListener( this );
14041 + ControlImpl::disposing (e);
14042 + mxButton.clear ();
14043 + }
14044 +
14045 + virtual void SAL_CALL actionPerformed( const awt::ActionEvent& )
14046 + throw (uno::RuntimeException)
14047 + {
14048 + if ( !maClickHdl )
14049 + Click();
14050 + else
14051 + maClickHdl.Call( static_cast<Window *>( mpWindow ) );
14052 + }
14053 +
14054 + bool SetModeImage( uno::Reference< graphic::XGraphic > xGraph )
14055 + {
14056 + setProperty( "Graphic", uno::Any( xGraph ) );
14057 + return true;
14058 + }
14059 +};
14060 +
14061 +Button::~Button ()
14062 +{
14063 +}
14064 +
14065 +String Button::GetStandardText (sal_uInt16 button_type)
14066 +{
14067 + return ::Button::GetStandardText (button_type);
14068 +}
14069 +
14070 +void Button::SetText( OUString const& rStr )
14071 +{
14072 + if ( !getImpl().mxButton.is() )
14073 + return;
14074 + getImpl().mxButton->setLabel( rStr );
14075 +}
14076 +
14077 +void Button::SetClickHdl( const Link& link )
14078 +{
14079 + if (&getImpl () && getImpl().mxButton.is ())
14080 + getImpl().SetClickHdl( link );
14081 +}
14082 +
14083 +Link& Button::GetClickHdl ()
14084 +{
14085 + return getImpl().GetClickHdl ();
14086 +}
14087 +
14088 +bool Button::SetModeImage( const Image& rImage )
14089 +{
14090 + return getImpl().SetModeImage( rImage.getImpl().mxGraphic );
14091 +}
14092 +
14093 +void Button::SetImageAlign( ImageAlign eAlign )
14094 +{
14095 + getImpl().setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
14096 +}
14097 +
14098 +void Button::Click()
14099 +{
14100 +}
14101 +
14102 +IMPL_GET_IMPL( Button );
14103 +IMPL_CONSTRUCTORS( Button, Control, "button" );
14104 +IMPL_GET_WINDOW (Button);
14105 +
14106 +class PushButtonImpl : public ButtonImpl
14107 + , public ::cppu::WeakImplHelper1< awt::XItemListener >
14108 +{
14109 + Link maToggleHdl;
14110 +public:
14111 + PushButtonImpl( Context *context, const PeerHandle &peer, Window *window )
14112 + : ButtonImpl( context, peer, window )
14113 + {
14114 + }
14115 +
14116 + void SetToggleHdl( const Link& link )
14117 + {
14118 + // XButton doesn't have an explicit event for Toggle. Anyway, it is a
14119 + // superset of the clicks: all clicks, and explicit toggles
14120 + if (!link && !!maToggleHdl)
14121 + mxButton->removeActionListener( this );
14122 + else if (!!link && !maToggleHdl)
14123 + mxButton->addActionListener( this );
14124 + maToggleHdl = link;
14125 + }
14126 + void SAL_CALL disposing( lang::EventObject const& e )
14127 + throw (uno::RuntimeException)
14128 + {
14129 + ButtonImpl::disposing (e);
14130 + }
14131 + virtual void SAL_CALL actionPerformed( awt::ActionEvent const& e )
14132 + throw (uno::RuntimeException)
14133 + {
14134 + ButtonImpl::actionPerformed( e );
14135 + fireToggle();
14136 + }
14137 + virtual void SAL_CALL itemStateChanged( const awt::ItemEvent& )
14138 + throw (uno::RuntimeException)
14139 + {
14140 + maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
14141 + }
14142 + void fireToggle()
14143 + {
14144 + maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
14145 + }
14146 +
14147 +};
14148 +
14149 +PushButton::~PushButton ()
14150 +{
14151 + SetToggleHdl (Link ());
14152 +}
14153 +
14154 +void PushButton::Check( bool bCheck )
14155 +{
14156 + getImpl().setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
14157 + // XButton doesn't have explicit toggle event
14158 + getImpl().fireToggle();
14159 +}
14160 +
14161 +bool PushButton::IsChecked() const
14162 +{
14163 + return !!( getImpl().getProperty( "State" ).get< sal_Int16 >() );
14164 +}
14165 +
14166 +void PushButton::Toggle()
14167 +{
14168 + Check( true );
14169 +}
14170 +
14171 +void PushButton::SetToggleHdl( const Link& link )
14172 +{
14173 + if (&getImpl () && getImpl().mxButton.is ())
14174 + getImpl().SetToggleHdl( link );
14175 +}
14176 +
14177 +IMPL_GET_IMPL( PushButton );
14178 +IMPL_CONSTRUCTORS( PushButton, Button, "pushbutton" );
14179 +IMPL_GET_WINDOW (PushButton);
14180 +
14181 +class RadioButtonImpl : public ButtonImpl
14182 + , public ::cppu::WeakImplHelper1< awt::XItemListener >
14183 +{
14184 + Link maToggleHdl;
14185 +public:
14186 + uno::Reference< awt::XRadioButton > mxRadioButton;
14187 + RadioButtonImpl( Context *context, const PeerHandle &peer, Window *window )
14188 + : ButtonImpl( context, peer, window )
14189 + , mxRadioButton( peer, uno::UNO_QUERY )
14190 + {
14191 + }
14192 +
14193 + void Check( bool bCheck )
14194 + {
14195 + if ( !mxRadioButton.is() )
14196 + return;
14197 +
14198 +#if 1
14199 + // Have setState fire item event for
14200 + // RadioGroups::RadioGroup::itemStateChanged ()
14201 + ::RadioButton *r = static_cast<RadioButton*>(mpWindow)->GetRadioButton ();
14202 + bool state = r->IsRadioCheckEnabled ();
14203 + r->EnableRadioCheck();
14204 + mxRadioButton->setState( !!bCheck );
14205 + r->EnableRadioCheck (state);
14206 +#else
14207 + mxRadioButton->setState( !!bCheck );
14208 +#endif
14209 + fireToggle();
14210 + }
14211 +
14212 + bool IsChecked()
14213 + {
14214 + if ( !mxRadioButton.is() )
14215 + return false;
14216 + return mxRadioButton->getState();
14217 + }
14218 +
14219 + void SetToggleHdl( const Link& link )
14220 + {
14221 + if (!link && !!maToggleHdl)
14222 + mxRadioButton->removeItemListener( this );
14223 + else if (!!link && !maToggleHdl)
14224 + mxRadioButton->addItemListener( this );
14225 + maToggleHdl = link;
14226 + }
14227 +
14228 + inline void fireToggle()
14229 + {
14230 + maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
14231 + }
14232 +
14233 + virtual void SetClickHdl( const Link& link )
14234 + {
14235 + // Keep RadioGroups::RadioGroup's actionListener at HEAD
14236 + // of list. This way, it can handle RadioGroup's button
14237 + // states before all other callbacks and make sure the
14238 + // client code has the right state.
14239 +
14240 + // IWBN to add an XRadioButton2 and layout::VCLXRadioButton
14241 + // with {get,set}RadioGroup() (and a "radiogroup" property
14242 + // even) and handle the grouping here in RadioButtonImpl.
14243 + uno::Reference< uno::XInterface > x = static_cast<VCLXRadioButton*> (mpWindow->GetVCLXWindow ())->getFirstActionListener ();
14244 + uno::Reference< awt::XActionListener > a = uno::Reference< awt::XActionListener> (x ,uno::UNO_QUERY );
14245 + mxButton->removeActionListener (a);
14246 + ButtonImpl::SetClickHdl (link);
14247 + mxButton->addActionListener (a);
14248 + }
14249 +
14250 + void SAL_CALL disposing( lang::EventObject const& e )
14251 + throw (uno::RuntimeException)
14252 + {
14253 + ButtonImpl::disposing (e);
14254 + }
14255 +
14256 + virtual void SAL_CALL itemStateChanged( const awt::ItemEvent& )
14257 + throw (uno::RuntimeException)
14258 + {
14259 + maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
14260 + }
14261 +};
14262 +
14263 +RadioButton::~RadioButton ()
14264 +{
14265 + SetToggleHdl (Link ());
14266 +}
14267 +
14268 +void RadioButton::Check( bool bCheck )
14269 +{
14270 + getImpl().Check( bCheck );
14271 +}
14272 +
14273 +bool RadioButton::IsChecked() const
14274 +{
14275 + return getImpl().IsChecked();
14276 +}
14277 +
14278 +void RadioButton::SetToggleHdl( const Link& link )
14279 +{
14280 + if (&getImpl () && getImpl().mxRadioButton.is ())
14281 + getImpl().SetToggleHdl( link );
14282 +}
14283 +
14284 +IMPL_GET_IMPL( RadioButton );
14285 +IMPL_GET_WINDOW( RadioButton );
14286 +IMPL_GET_VCLXWINDOW( RadioButton );
14287 +IMPL_CONSTRUCTORS( RadioButton, Button, "radiobutton" );
14288 +
14289 +class CheckBoxImpl : public ButtonImpl
14290 + , public ::cppu::WeakImplHelper1< awt::XItemListener >
14291 +{
14292 + Link maToggleHdl;
14293 + public:
14294 + uno::Reference< awt::XCheckBox > mxCheckBox;
14295 + CheckBoxImpl( Context *context, const PeerHandle &peer, Window *window )
14296 + : ButtonImpl( context, peer, window )
14297 + , mxCheckBox( peer, uno::UNO_QUERY )
14298 + {
14299 + }
14300 +
14301 + void SetToggleHdl( const Link& link )
14302 + {
14303 + if (!link && !!maToggleHdl)
14304 + mxCheckBox->removeItemListener( this );
14305 + else if (!!link && !maToggleHdl)
14306 + mxCheckBox->addItemListener( this );
14307 + maToggleHdl = link;
14308 + }
14309 + void SAL_CALL disposing( lang::EventObject const& e )
14310 + throw (uno::RuntimeException)
14311 + {
14312 + ButtonImpl::disposing (e);
14313 + }
14314 + virtual void SAL_CALL itemStateChanged( const awt::ItemEvent& )
14315 + throw (uno::RuntimeException)
14316 + {
14317 + maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
14318 + }
14319 +};
14320 +
14321 +CheckBox::~CheckBox ()
14322 +{
14323 + SetToggleHdl (Link ());
14324 +}
14325 +
14326 +void CheckBox::Check( bool bCheck )
14327 +{
14328 + if ( !getImpl().mxCheckBox.is() )
14329 + return;
14330 + getImpl().mxCheckBox->setState( !!bCheck );
14331 +}
14332 +
14333 +bool CheckBox::IsChecked() const
14334 +{
14335 + if ( !getImpl().mxCheckBox.is() )
14336 + return false;
14337 + return getImpl().mxCheckBox->getState() != 0;
14338 +}
14339 +
14340 +void CheckBox::SetToggleHdl( const Link& link )
14341 +{
14342 + if (&getImpl () && getImpl().mxCheckBox.is ())
14343 + getImpl().SetToggleHdl( link );
14344 +}
14345 +
14346 +IMPL_GET_IMPL( CheckBox );
14347 +IMPL_CONSTRUCTORS( CheckBox, Button, "checkbox" );
14348 +
14349 +#define BUTTON_IMPL(t, parent, response) \
14350 + class t##Impl : public parent##Impl \
14351 + { \
14352 + public: \
14353 + t##Impl( Context *context, PeerHandle const& peer, Window *window ) \
14354 + : parent##Impl( context, peer, window ) \
14355 + { \
14356 + } \
14357 + void Click() \
14358 + { \
14359 + if (Dialog *d = static_cast<Dialog *> (mpCtx)) \
14360 + d->EndDialog( response ); \
14361 + } \
14362 + }
14363 +
14364 +/* Common button types currently unavailable in OOo: */
14365 +/* mpReset */
14366 +/* mpApply */
14367 +/* mpAction */
14368 +#define RET_RESET 6
14369 +#define RET_APPLY 7
14370 +#define BUTTONID_RESET RET_RESET
14371 +#define BUTTONID_APPLY RET_APPLY
14372 +
14373 +BUTTON_IMPL( OKButton, PushButton, BUTTONID_OK );
14374 +BUTTON_IMPL( CancelButton, PushButton, BUTTONID_CANCEL );
14375 +BUTTON_IMPL( YesButton, PushButton, BUTTONID_YES );
14376 +BUTTON_IMPL( NoButton, PushButton, BUTTONID_NO );
14377 +BUTTON_IMPL( RetryButton, PushButton, BUTTONID_RETRY );
14378 +BUTTON_IMPL( IgnoreButton, PushButton, BUTTONID_IGNORE );
14379 +BUTTON_IMPL( ResetButton, PushButton, BUTTONID_RESET );
14380 +BUTTON_IMPL( ApplyButton, PushButton, BUTTONID_APPLY ); /* Deprecated? */
14381 +BUTTON_IMPL( HelpButton, PushButton, BUTTONID_HELP );
14382 +
14383 +IMPL_CONSTRUCTORS( OKButton, PushButton, "okbutton" );
14384 +IMPL_CONSTRUCTORS( CancelButton, PushButton, "cancelbutton" );
14385 +IMPL_CONSTRUCTORS( YesButton, PushButton, "yesbutton" );
14386 +IMPL_CONSTRUCTORS( NoButton, PushButton, "nobutton" );
14387 +IMPL_CONSTRUCTORS( RetryButton, PushButton, "retrybutton" );
14388 +IMPL_CONSTRUCTORS( IgnoreButton, PushButton, "ignorebutton" );
14389 +IMPL_CONSTRUCTORS( ResetButton, PushButton, "resetbutton" );
14390 +IMPL_CONSTRUCTORS( ApplyButton, PushButton, "applybutton" ); /* Deprecated? */
14391 +IMPL_CONSTRUCTORS( HelpButton, PushButton, "helpbutton" );
14392 +
14393 +class AdvancedButtonImpl : public PushButtonImpl
14394 +{
14395 +protected:
14396 + bool bAdvancedMode;
14397 + std::list< Window*> maAdvanced;
14398 + std::list< Window*> maSimple;
14399 +
14400 +public:
14401 + rtl::OUString mAdvancedLabel;
14402 + rtl::OUString mSimpleLabel;
14403 +
14404 +protected:
14405 + Window* Remove( std::list< Window*> lst, Window* w )
14406 + {
14407 + for ( std::list< Window*>::iterator it = maAdvanced.begin();
14408 + it != maAdvanced.end(); it++ )
14409 + if ( *it == w )
14410 + {
14411 + lst.erase( it );
14412 + return *it;
14413 + }
14414 + return 0;
14415 + }
14416 +
14417 +public:
14418 + AdvancedButtonImpl( Context *context, PeerHandle const& peer, Window *window )
14419 + : PushButtonImpl( context, peer, window )
14420 + , bAdvancedMode( false )
14421 + // TODO: i18n
14422 + // Button::GetStandardText( BUTTON_ADVANCED );
14423 + // Button::GetStandardText( BUTTON_SIMPLE );
14424 + , mAdvancedLabel( rtl::OUString::createFromAscii( "Advanced..." ) )
14425 + , mSimpleLabel( rtl::OUString::createFromAscii( "Simple..." ) )
14426 + {
14427 + }
14428 + void Click()
14429 + {
14430 + bAdvancedMode = !bAdvancedMode;
14431 + if ( bAdvancedMode )
14432 + advancedMode();
14433 + else
14434 + simpleMode();
14435 + }
14436 + void setAlign ()
14437 + {
14438 + ::PushButton *b = static_cast<PushButton*> (mpWindow)->GetPushButton ();
14439 + b->SetSymbolAlign (SYMBOLALIGN_RIGHT);
14440 + b->SetSmallSymbol ();
14441 + //mpWindow->SetStyle (mpWindow->GetStyle() | WB_CENTER);
14442 + }
14443 + void advancedMode()
14444 + {
14445 + ::PushButton *b = static_cast<PushButton*> (mpWindow)->GetPushButton ();
14446 + b->SetSymbol (SYMBOL_PAGEUP);
14447 + setAlign ();
14448 + if (mSimpleLabel.getLength ())
14449 + b->SetText (mSimpleLabel);
14450 + for ( std::list< Window*>::iterator it = maAdvanced.begin();
14451 + it != maAdvanced.end(); it++ )
14452 + ( *it )->Show();
14453 + for ( std::list< Window*>::iterator it = maSimple.begin();
14454 + it != maSimple.end(); it++ )
14455 + ( *it )->Hide();
14456 +
14457 + redraw ();
14458 + }
14459 + void simpleMode()
14460 + {
14461 + //mxButton->setLabel( mSimpleLabel );
14462 + ::PushButton *b = static_cast<PushButton*> (mpWindow)->GetPushButton ();
14463 + b->SetSymbol (SYMBOL_PAGEDOWN);
14464 + if (mAdvancedLabel.getLength ())
14465 + b->SetText (mAdvancedLabel);
14466 + setAlign ();
14467 + for ( std::list< Window*>::iterator it = maAdvanced.begin();
14468 + it != maAdvanced.end(); it++ )
14469 + ( *it )->Hide();
14470 + for ( std::list< Window*>::iterator it = maSimple.begin();
14471 + it != maSimple.end(); it++ )
14472 + ( *it )->Show();
14473 +
14474 + redraw (true);
14475 + }
14476 + void AddAdvanced( Window* w )
14477 + {
14478 + maAdvanced.push_back( w );
14479 + if ( !bAdvancedMode )
14480 + w->Hide();
14481 + }
14482 + void AddSimple( Window* w )
14483 + {
14484 + maSimple.push_back( w );
14485 + if ( bAdvancedMode )
14486 + w->Hide();
14487 + }
14488 + void RemoveAdvanced( Window* w )
14489 + {
14490 + Remove( maAdvanced, w );
14491 + }
14492 + void RemoveSimple( Window* w )
14493 + {
14494 + Remove( maSimple, w );
14495 + }
14496 +};
14497 +
14498 +void AdvancedButton::AddAdvanced( Window* w )
14499 +{
14500 + getImpl().AddAdvanced( w );
14501 +}
14502 +
14503 +void AdvancedButton::AddSimple( Window* w )
14504 +{
14505 + getImpl().AddSimple( w );
14506 +}
14507 +
14508 +void AdvancedButton::RemoveAdvanced( Window* w )
14509 +{
14510 + getImpl().RemoveAdvanced( w );
14511 +}
14512 +
14513 +void AdvancedButton::RemoveSimple( Window* w )
14514 +{
14515 + getImpl().RemoveSimple( w );
14516 +}
14517 +
14518 +void AdvancedButton::SetAdvancedText (rtl::OUString const& text)
14519 +{
14520 + if (text.getLength ())
14521 + getImpl ().mAdvancedLabel = text;
14522 +}
14523 +
14524 +void AdvancedButton::SetSimpleText (rtl::OUString const& text)
14525 +{
14526 + if (text.getLength ())
14527 + getImpl ().mSimpleLabel = text;
14528 +}
14529 +
14530 +rtl::OUString AdvancedButton::GetAdvancedText () const
14531 +{
14532 + return getImpl ().mAdvancedLabel;
14533 +}
14534 +
14535 +rtl::OUString AdvancedButton::GetSimpleText () const
14536 +{
14537 + return getImpl ().mSimpleLabel;
14538 +}
14539 +
14540 +void AdvancedButton::SetDelta (int)
14541 +{
14542 +}
14543 +
14544 +IMPL_CONSTRUCTORS_BODY( AdvancedButton, PushButton, "advancedbutton", getImpl().simpleMode () );
14545 +IMPL_GET_IMPL( AdvancedButton );
14546 +
14547 +
14548 +class MoreButtonImpl : public AdvancedButtonImpl
14549 +{
14550 +public:
14551 + MoreButtonImpl( Context *context, PeerHandle const& peer, Window *window )
14552 + : AdvancedButtonImpl( context, peer, window)
14553 + {
14554 + mSimpleLabel = Button::GetStandardText( BUTTON_MORE );
14555 + mAdvancedLabel = Button::GetStandardText( BUTTON_LESS );
14556 + }
14557 + void AddWindow( Window* w ) { AddAdvanced( w ); }
14558 + void RemoveWindow( Window* w ) { RemoveAdvanced( w ); }
14559 +};
14560 +
14561 +// TODO
14562 +//BUTTON_IMPL( MoreButton, PushButton, 0 );
14563 +IMPL_CONSTRUCTORS_BODY( MoreButton, AdvancedButton, "morebutton", getImpl().simpleMode () );
14564 +IMPL_GET_IMPL( MoreButton );
14565 +
14566 +void MoreButton::AddWindow( Window* w )
14567 +{
14568 + getImpl().AddWindow( w );
14569 +}
14570 +
14571 +void MoreButton::RemoveWindow( Window* w )
14572 +{
14573 + getImpl().RemoveWindow( w );
14574 +}
14575 +
14576 +void MoreButton::SetMoreText (rtl::OUString const& text)
14577 +{
14578 + SetAdvancedText (text);
14579 +}
14580 +
14581 +void MoreButton::SetLessText (rtl::OUString const& text)
14582 +{
14583 + SetSimpleText (text);
14584 +}
14585 +
14586 +rtl::OUString MoreButton::GetMoreText () const
14587 +{
14588 + return GetAdvancedText ();
14589 +}
14590 +
14591 +rtl::OUString MoreButton::GetLessText () const
14592 +{
14593 + return GetSimpleText ();
14594 +}
14595 +
14596 +} // namespace layout
14597 --- toolkit/source/layout/vcl/wcontainer.cxx.old 1970-01-01 00:00:00.000000000 +0000
14598 +++ toolkit/source/layout/vcl/wcontainer.cxx 2009-04-06 16:42:13.000000000 +0000
14599 @@ -0,0 +1,270 @@
14600 +/*************************************************************************
14601 + *
14602 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
14603 + *
14604 + * Copyright 2008 by Sun Microsystems, Inc.
14605 + *
14606 + * OpenOffice.org - a multi-platform office productivity suite
14607 + *
14608 + * $RCSfile$
14609 + *
14610 + * $Revision$
14611 + *
14612 + * This file is part of OpenOffice.org.
14613 + *
14614 + * OpenOffice.org is free software: you can redistribute it and/or modify
14615 + * it under the terms of the GNU Lesser General Public License version 3
14616 + * only, as published by the Free Software Foundation.
14617 + *
14618 + * OpenOffice.org is distributed in the hope that it will be useful,
14619 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
14620 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14621 + * GNU Lesser General Public License version 3 for more details
14622 + * (a copy is included in the LICENSE file that accompanied this code).
14623 + *
14624 + * You should have received a copy of the GNU Lesser General Public License
14625 + * version 3 along with OpenOffice.org. If not, see
14626 + * <http://www.openoffice.org/license.html>
14627 + * for a copy of the LGPLv3 License.
14628 + *
14629 + ************************************************************************/
14630 +
14631 +#include "wrapper.hxx"
14632 +
14633 +#include <com/sun/star/awt/XLayoutRoot.hpp>
14634 +#include <com/sun/star/awt/XLayoutContainer.hpp>
14635 +#include <comphelper/processfactory.hxx>
14636 +#include <layout/core/helper.hxx>
14637 +#include <tools/debug.hxx>
14638 +
14639 +using namespace ::com::sun::star;
14640 +
14641 +namespace layout
14642 +{
14643 +
14644 +Container::Container( Context const* context, char const* pId )
14645 + : mxContainer( context->GetPeerHandle( pId ), uno::UNO_QUERY )
14646 +{
14647 + if ( !mxContainer.is() )
14648 + {
14649 + DBG_ERROR1( "Error: failed to associate container with '%s'", pId );
14650 + }
14651 +}
14652 +
14653 +Container::Container( rtl::OUString const& rName, sal_Int32 nBorder )
14654 +{
14655 + mxContainer = layoutimpl::WidgetFactory::createContainer( rName );
14656 +
14657 + uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
14658 + xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Border" ) ),
14659 + uno::Any( nBorder ) );
14660 +}
14661 +
14662 +void Container::Add( Window *pChild )
14663 +{
14664 + if ( pChild )
14665 + {
14666 + uno::Reference< awt::XLayoutConstrains > xChild( pChild->GetPeer(), uno::UNO_QUERY );
14667 + mxContainer->addChild( xChild );
14668 + }
14669 +}
14670 +
14671 +void Container::Add( Container *pChild )
14672 +{
14673 + if ( pChild )
14674 + {
14675 + uno::Reference< awt::XLayoutConstrains > xChild( pChild->getImpl(), uno::UNO_QUERY );
14676 + mxContainer->addChild( xChild );
14677 + }
14678 +}
14679 +
14680 +void Container::Remove( Window *pChild )
14681 +{
14682 + if ( pChild )
14683 + {
14684 + uno::Reference< awt::XLayoutConstrains > xChild( pChild->GetPeer(), uno::UNO_QUERY );
14685 + mxContainer->removeChild( xChild );
14686 + }
14687 +}
14688 +
14689 +void Container::Remove( Container *pChild )
14690 +{
14691 + if ( pChild )
14692 + {
14693 + uno::Reference< awt::XLayoutConstrains > xChild( pChild->getImpl(), uno::UNO_QUERY );
14694 + mxContainer->removeChild( xChild );
14695 + }
14696 +}
14697 +
14698 +void Container::Clear()
14699 +{
14700 + css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > children;
14701 + children = mxContainer->getChildren();
14702 + for (int i = 0; i < children.getLength(); i++)
14703 + mxContainer->removeChild( children[i] );
14704 +}
14705 +
14706 +void Container::ShowAll( bool bShow )
14707 +{
14708 + struct inner
14709 + {
14710 + static void setChildrenVisible( uno::Reference < awt::XLayoutContainer > xCont,
14711 + bool bVisible ) /* auxiliary */
14712 + {
14713 + if ( xCont.is() )
14714 + {
14715 + uno::Sequence< uno::Reference < awt::XLayoutConstrains > > aChildren;
14716 + aChildren = xCont->getChildren();
14717 + for (int i = 0; i < aChildren.getLength(); i++)
14718 + {
14719 + uno::Reference < awt::XLayoutConstrains > xChild( aChildren[ i ] );
14720 +
14721 + uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY);
14722 + if ( xWin.is() )
14723 + xWin->setVisible( bVisible );
14724 +
14725 + uno::Reference < awt::XLayoutContainer > xChildCont(
14726 + xChild, uno::UNO_QUERY );
14727 + setChildrenVisible( xChildCont, bVisible );
14728 + }
14729 + }
14730 + }
14731 + };
14732 +
14733 + inner::setChildrenVisible( mxContainer, bShow );
14734 +}
14735 +
14736 +void Container::Show()
14737 +{
14738 + ShowAll( true );
14739 +}
14740 +
14741 +void Container::Hide()
14742 +{
14743 + ShowAll( false );
14744 +}
14745 +
14746 +Table::Table( sal_Int32 nBorder, sal_Int32 nColumns )
14747 + : Container( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ), nBorder )
14748 +{
14749 + uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
14750 + xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" ) ),
14751 + uno::Any( nColumns ) );
14752 +}
14753 +
14754 +void Table::Add( Window *window, bool bXExpand, bool bYExpand,
14755 + sal_Int32 nXSpan, sal_Int32 nYSpan )
14756 +{
14757 + if ( !window )
14758 + return;
14759 + WindowImpl &rImpl = window->getImpl();
14760 + uno::Reference< awt::XLayoutConstrains > xChild( rImpl.mxWindow,
14761 + uno::UNO_QUERY );
14762 + mxContainer->addChild( xChild );
14763 + setProps( xChild, bXExpand, bYExpand, nXSpan, nYSpan );
14764 +}
14765 +
14766 +void Table::Add( Container *pContainer, bool bXExpand, bool bYExpand,
14767 + sal_Int32 nXSpan, sal_Int32 nYSpan )
14768 +{
14769 + if ( !pContainer )
14770 + return;
14771 + uno::Reference< awt::XLayoutConstrains > xChild( pContainer->getImpl(),
14772 + uno::UNO_QUERY );
14773 + mxContainer->addChild( xChild );
14774 + setProps( xChild, bXExpand, bYExpand, nXSpan, nYSpan );
14775 +}
14776 +
14777 +void Table::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
14778 + bool bXExpand, bool bYExpand, sal_Int32 nXSpan, sal_Int32 nYSpan )
14779 +{
14780 + uno::Reference< beans::XPropertySet > xProps
14781 + ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
14782 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ) ),
14783 + uno::Any( bXExpand ) );
14784 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ) ),
14785 + uno::Any( bYExpand ) );
14786 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ) ),
14787 + uno::Any( nXSpan ) );
14788 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ) ),
14789 + uno::Any( nYSpan ) );
14790 +}
14791 +
14792 +Box::Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous )
14793 + : Container( rName, nBorder )
14794 +{
14795 + uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
14796 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ) ),
14797 + uno::Any( bHomogeneous ) );
14798 +}
14799 +
14800 +void Box::Add( Window *window, bool bExpand, bool bFill, sal_Int32 nPadding)
14801 +{
14802 + if ( !window )
14803 + return;
14804 + WindowImpl &rImpl = window->getImpl();
14805 + uno::Reference< awt::XLayoutConstrains > xChild( rImpl.mxWindow,
14806 + uno::UNO_QUERY );
14807 +
14808 + mxContainer->addChild( xChild );
14809 + setProps( xChild, bExpand, bFill, nPadding );
14810 +}
14811 +
14812 +void Box::Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding)
14813 +{
14814 + if ( !pContainer )
14815 + return;
14816 +
14817 + uno::Reference< awt::XLayoutConstrains > xChild( pContainer->getImpl(),
14818 + uno::UNO_QUERY );
14819 + mxContainer->addChild( xChild );
14820 + setProps( xChild, bExpand, bFill, nPadding );
14821 +}
14822 +
14823 +void Box::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
14824 + bool bExpand, bool bFill, sal_Int32 nPadding )
14825 +{
14826 + uno::Reference< beans::XPropertySet > xProps
14827 + ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
14828 +
14829 + xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Expand" ) ),
14830 + uno::Any( bExpand ) );
14831 + xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Fill" ) ),
14832 + uno::Any( bFill ) );
14833 + xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Padding" ) ),
14834 + uno::Any( nPadding ) );
14835 +}
14836 +
14837 +Table::Table( Context const* context, char const* pId )
14838 + : Container( context, pId )
14839 +{
14840 +}
14841 +
14842 +Box::Box( Context const* context, char const* pId )
14843 + : Container( context, pId )
14844 +{
14845 +}
14846 +
14847 +HBox::HBox( sal_Int32 nBorder, bool bHomogeneous )
14848 + : Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hbox" ) ),
14849 + nBorder, bHomogeneous )
14850 +{
14851 +}
14852 +
14853 +HBox::HBox( Context const* context, char const* pId )
14854 + : Box( context, pId )
14855 +{
14856 +}
14857 +
14858 +VBox::VBox( sal_Int32 nBorder, bool bHomogeneous )
14859 + : Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vbox" ) ),
14860 + nBorder, bHomogeneous )
14861 +{
14862 +}
14863 +
14864 +VBox::VBox( Context const* context, char const* pId )
14865 + : Box( context, pId )
14866 +{
14867 +}
14868 +
14869 +} // namespace layout
14870 --- toolkit/source/layout/vcl/wfield.cxx.old 1970-01-01 00:00:00.000000000 +0000
14871 +++ toolkit/source/layout/vcl/wfield.cxx 2009-04-06 16:42:13.000000000 +0000
14872 @@ -0,0 +1,762 @@
14873 +/*************************************************************************
14874 + *
14875 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
14876 + *
14877 + * Copyright 2008 by Sun Microsystems, Inc.
14878 + *
14879 + * OpenOffice.org - a multi-platform office productivity suite
14880 + *
14881 + * $RCSfile$
14882 + *
14883 + * $Revision$
14884 + *
14885 + * This file is part of OpenOffice.org.
14886 + *
14887 + * OpenOffice.org is free software: you can redistribute it and/or modify
14888 + * it under the terms of the GNU Lesser General Public License version 3
14889 + * only, as published by the Free Software Foundation.
14890 + *
14891 + * OpenOffice.org is distributed in the hope that it will be useful,
14892 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
14893 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14894 + * GNU Lesser General Public License version 3 for more details
14895 + * (a copy is included in the LICENSE file that accompanied this code).
14896 + *
14897 + * You should have received a copy of the GNU Lesser General Public License
14898 + * version 3 along with OpenOffice.org. If not, see
14899 + * <http://www.openoffice.org/license.html>
14900 + * for a copy of the LGPLv3 License.
14901 + *
14902 + ************************************************************************/
14903 +
14904 +#include "wrapper.hxx"
14905 +
14906 +#include <comphelper/processfactory.hxx>
14907 +#include <com/sun/star/awt/XMetricField.hpp>
14908 +#include <com/sun/star/awt/XNumericField.hpp>
14909 +#include <com/sun/star/awt/XTextComponent.hpp>
14910 +#include <com/sun/star/awt/XListBox.hpp>
14911 +#include <com/sun/star/awt/XComboBox.hpp>
14912 +#include <cppuhelper/implbase1.hxx>
14913 +#include <com/sun/star/awt/XActionListener.hpp>
14914 +#include <com/sun/star/awt/XItemListener.hpp>
14915 +#include <vcl/combobox.hxx>
14916 +#include <vcl/lstbox.hxx>
14917 +
14918 +#include <toolkit/awt/vclxwindows.hxx>
14919 +
14920 +using namespace ::com::sun::star;
14921 +using rtl::OUString;
14922 +
14923 +namespace layout
14924 +{
14925 +
14926 +class EditImpl : public ControlImpl
14927 + , public ::cppu::WeakImplHelper1< awt::XTextListener >
14928 +{
14929 +public:
14930 + Link maModifyHdl;
14931 +
14932 + uno::Reference< awt::XTextComponent > mxEdit;
14933 + EditImpl( Context *context, const PeerHandle &peer, Window *window )
14934 + : ControlImpl( context, peer, window )
14935 + , mxEdit( peer, uno::UNO_QUERY )
14936 + {
14937 + }
14938 +
14939 + ~EditImpl ();
14940 +
14941 + virtual void SAL_CALL disposing( lang::EventObject const& e )
14942 + throw (css::uno::RuntimeException);
14943 +
14944 + virtual void SetModifyHdl( Link const& link );
14945 +
14946 + void SAL_CALL textChanged( const css::awt::TextEvent& /* rEvent */ )
14947 + throw (css::uno::RuntimeException)
14948 + {
14949 + maModifyHdl.Call( mpWindow );
14950 + }
14951 +};
14952 +
14953 +EditImpl::~EditImpl ()
14954 +{
14955 +}
14956 +
14957 +void SAL_CALL EditImpl::disposing( lang::EventObject const& e )
14958 + throw (css::uno::RuntimeException)
14959 +{
14960 + ControlImpl::disposing (e);
14961 + mxEdit.clear ();
14962 +}
14963 +
14964 +void EditImpl::SetModifyHdl( Link const& link )
14965 +{
14966 + if (!link && !!maModifyHdl)
14967 + mxEdit->removeTextListener( this );
14968 + else if (!!link && !maModifyHdl)
14969 + mxEdit->addTextListener( this );
14970 + maModifyHdl = link;
14971 +}
14972 +
14973 +Edit::~Edit ()
14974 +{
14975 + SetModifyHdl (Link ());
14976 +}
14977 +
14978 +void Edit::SetSelection( Selection const& rSelection )
14979 +{
14980 + if ( !getImpl().mxEdit.is() )
14981 + return;
14982 + getImpl().mxEdit->setSelection( awt::Selection( rSelection.Min(), rSelection.Max() ) );
14983 +}
14984 +
14985 +void Edit::SetText( OUString const& rStr ) const
14986 +{
14987 + if ( !getImpl().mxEdit.is() )
14988 + return;
14989 + getImpl().mxEdit->setText( rStr );
14990 +}
14991 +
14992 +String Edit::GetText() const
14993 +{
14994 + if ( !getImpl().mxEdit.is() )
14995 + return OUString();
14996 + return OUString( getImpl().mxEdit->getText());
14997 +}
14998 +
14999 +void Edit::SetModifyHdl( const Link& link )
15000 +{
15001 + if (&getImpl () && getImpl().mxEdit.is ())
15002 + getImpl().SetModifyHdl( link );
15003 +}
15004 +
15005 +IMPL_CONSTRUCTORS( Edit, Control, "edit" );
15006 +IMPL_GET_IMPL( Edit );
15007 +
15008 +// Window/Control/Edit/MultiLineEdit
15009 +class MultiLineEditImpl : public EditImpl
15010 +{
15011 +public:
15012 + MultiLineEditImpl( Context *context, const PeerHandle &peer, Window *window )
15013 + : EditImpl( context, peer, window )
15014 + {
15015 + }
15016 +};
15017 +
15018 +IMPL_CONSTRUCTORS( MultiLineEdit, Edit, "multilineedit" );
15019 +IMPL_GET_IMPL( MultiLineEdit );
15020 +
15021 +// Window/Control/Edit/SpinField
15022 +class SpinFieldImpl : public EditImpl
15023 +{
15024 + public:
15025 + SpinFieldImpl( Context *context, const PeerHandle &peer, Window *window )
15026 + : EditImpl( context, peer, window )
15027 + {
15028 + }
15029 +};
15030 +
15031 +IMPL_CONSTRUCTORS( SpinField, Edit, "spinfield" );
15032 +
15033 +// Window/Control/Edit/SpinField/NumericField
15034 +class NumericFieldImpl : public SpinFieldImpl
15035 +{
15036 + public:
15037 + NumericFieldImpl( Context *context, const PeerHandle &peer, Window *window )
15038 + : SpinFieldImpl( context, peer, window )
15039 + {
15040 + }
15041 +};
15042 +
15043 +// Window/Control/Edit/SpinField/MetricField
15044 +class MetricFieldImpl : public SpinFieldImpl
15045 +{
15046 + public:
15047 + MetricFieldImpl( Context *context, const PeerHandle &peer, Window *window )
15048 + : SpinFieldImpl( context, peer, window )
15049 + {
15050 + }
15051 +};
15052 +
15053 +IMPL_GET_IMPL( SpinField );
15054 +IMPL_GET_IMPL( NumericField );
15055 +IMPL_GET_IMPL( MetricField );
15056 +
15057 +// FormatterBase
15058 +class FormatterBaseImpl
15059 +{
15060 + protected:
15061 + PeerHandle mpeer;
15062 + public:
15063 + explicit FormatterBaseImpl( const PeerHandle &peer )
15064 + : mpeer( peer )
15065 + {
15066 + };
15067 +};
15068 +
15069 +FormatterBase::FormatterBase( FormatterBaseImpl *pFormatImpl )
15070 + : mpFormatImpl( pFormatImpl )
15071 +{
15072 +}
15073 +
15074 +class NumericFormatterImpl : public FormatterBaseImpl
15075 +{
15076 + public:
15077 + uno::Reference< awt::XNumericField > mxField;
15078 + explicit NumericFormatterImpl( const PeerHandle &peer )
15079 + : FormatterBaseImpl( peer )
15080 + , mxField( peer, uno::UNO_QUERY )
15081 + {
15082 + }
15083 +
15084 + // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
15085 + double valueToDouble( sal_Int64 nValue )
15086 + {
15087 + sal_Int16 nDigits = mxField->getDecimalDigits();
15088 + double n = (double)nValue;
15089 + for ( sal_uInt16 d = 0; d < nDigits; d++ )
15090 + n /= 10;
15091 + return n;
15092 + } // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
15093 + sal_Int64 doubleToValue( double nValue )
15094 + {
15095 + sal_Int16 nDigits = mxField->getDecimalDigits();
15096 + double n = nValue;
15097 + for ( sal_uInt16 d = 0; d < nDigits; d++ )
15098 + n *= 10;
15099 + return (sal_Int64) n;
15100 + }
15101 +};
15102 +
15103 +class MetricFormatterImpl : public FormatterBaseImpl
15104 +{
15105 + public:
15106 + uno::Reference< awt::XMetricField > mxField;
15107 + explicit MetricFormatterImpl( const PeerHandle &peer )
15108 + : FormatterBaseImpl( peer )
15109 + , mxField( peer, uno::UNO_QUERY )
15110 + {
15111 + }
15112 +};
15113 +
15114 +// NumericFormatter
15115 +
15116 +NumericFormatter::NumericFormatter( FormatterBaseImpl *pImpl )
15117 + : FormatterBase( pImpl )
15118 +{
15119 +}
15120 +
15121 +NumericFormatterImpl& NumericFormatter::getFormatImpl() const
15122 +{
15123 + return *( static_cast<NumericFormatterImpl *>( mpFormatImpl ) );
15124 +}
15125 +
15126 +#define SET_IMPL(vclmethod, idlmethod) \
15127 + void NumericFormatter::vclmethod( sal_Int64 nValue ) \
15128 + { \
15129 + if ( !getFormatImpl().mxField.is() ) \
15130 + return; \
15131 + getFormatImpl().mxField->idlmethod( getFormatImpl().valueToDouble( nValue ) ); \
15132 + }
15133 +
15134 +SET_IMPL( SetMin, setMin )
15135 +SET_IMPL( SetMax, setMax )
15136 +SET_IMPL( SetLast, setLast )
15137 +SET_IMPL( SetFirst, setFirst )
15138 +SET_IMPL( SetValue, setValue )
15139 +SET_IMPL( SetSpinSize, setSpinSize )
15140 +
15141 +sal_Int64 NumericFormatter::GetValue() const
15142 +{
15143 + if ( !getFormatImpl().mxField.is() )
15144 + return 0;
15145 + return getFormatImpl().doubleToValue( getFormatImpl().mxField->getValue() );
15146 +}
15147 +
15148 +#undef SET_IMPL
15149 +
15150 +IMPL_CONSTRUCTORS_2( NumericField, SpinField, NumericFormatter, "numericfield" );
15151 +
15152 +// MetricFormatter
15153 +
15154 +MetricFormatter::MetricFormatter( FormatterBaseImpl *pImpl )
15155 + : FormatterBase( pImpl )
15156 +{
15157 +}
15158 +MetricFormatterImpl& MetricFormatter::getFormatImpl() const
15159 +{ return *( static_cast<MetricFormatterImpl *>( mpFormatImpl ) ); }
15160 +
15161 +#define MetricUnitVclToUno(a) ((sal_uInt16)(a))
15162 +
15163 +#define SET_IMPL(vclmethod, idlmethod) \
15164 + void MetricFormatter::vclmethod( sal_Int64 nValue, FieldUnit nUnit ) \
15165 + { \
15166 + if ( !getFormatImpl().mxField.is() ) \
15167 + return; \
15168 + getFormatImpl().mxField->idlmethod( nValue, MetricUnitVclToUno( nUnit ) ); \
15169 + }
15170 +
15171 +SET_IMPL( SetMin, setMin )
15172 +SET_IMPL( SetMax, setMax )
15173 +SET_IMPL( SetLast, setLast )
15174 +SET_IMPL( SetFirst, setFirst )
15175 +SET_IMPL( SetValue, setValue )
15176 +
15177 +#undef SET_IMPL
15178 +
15179 +void MetricFormatter::SetSpinSize( sal_Int64 nValue )
15180 +{
15181 + if ( !getFormatImpl().mxField.is() )
15182 + return;
15183 + getFormatImpl().mxField->setSpinSize( nValue );
15184 +}
15185 +
15186 +sal_Int64 MetricFormatter::GetValue( FieldUnit nUnit ) const
15187 +{
15188 + if ( !getFormatImpl().mxField.is() )
15189 + return 0;
15190 + return getFormatImpl().mxField->getValue( MetricUnitVclToUno( nUnit ) );
15191 +}
15192 +
15193 +IMPL_CONSTRUCTORS_2( MetricField, SpinField, MetricFormatter, "metricfield" );
15194 +
15195 +// Window/Control/Edit/ComboBox
15196 +class ComboBoxImpl : public EditImpl
15197 + , public ::cppu::WeakImplHelper1< awt::XActionListener >
15198 + , public ::cppu::WeakImplHelper1< awt::XItemListener >
15199 +{
15200 +public:
15201 + uno::Reference< awt::XComboBox > mxComboBox;
15202 +
15203 + Link maClickHdl;
15204 + Link maSelectHdl;
15205 +
15206 + Window *parent;
15207 +
15208 + ComboBoxImpl( Context *context, const PeerHandle &peer, Window *window )
15209 + : EditImpl( context, peer, window )
15210 + , mxComboBox( peer, uno::UNO_QUERY )
15211 + {
15212 + }
15213 +
15214 + ~ComboBoxImpl ();
15215 +
15216 + sal_uInt16 InsertEntry( OUString const& rStr, sal_uInt16 nPos )
15217 + {
15218 + if ( nPos == COMBOBOX_APPEND )
15219 + nPos = GetEntryCount();
15220 + mxComboBox->addItem( rtl::OUString( rStr ), nPos );
15221 + return nPos;
15222 + }
15223 +
15224 + void RemoveEntry( sal_uInt16 nPos )
15225 + {
15226 + mxComboBox->removeItems( nPos, 1 );
15227 + }
15228 +
15229 + sal_uInt16 GetEntryPos( const OUString& rStr ) const
15230 + {
15231 + uno::Sequence< rtl::OUString> aItems( mxComboBox->getItems() );
15232 + rtl::OUString rKey( rStr );
15233 + for (unsigned int i = 0; aItems.getLength(); i++)
15234 + {
15235 + if ( aItems[ i ] == rKey )
15236 + return sal::static_int_cast< sal_uInt16 >( i );
15237 + }
15238 + return COMBOBOX_ENTRY_NOTFOUND;
15239 + }
15240 +
15241 + OUString GetEntry( sal_uInt16 nPos ) const
15242 + {
15243 + return OUString( mxComboBox->getItem( nPos ) );
15244 + }
15245 +
15246 + sal_uInt16 GetEntryCount() const
15247 + {
15248 + return mxComboBox->getItemCount();
15249 + }
15250 +
15251 + void SetClickHdl( Link const& link )
15252 + {
15253 + if (!link && !!maClickHdl)
15254 + mxComboBox->removeActionListener( this );
15255 + else if (!!link && !maClickHdl)
15256 + mxComboBox->addActionListener( this );
15257 + maClickHdl = link;
15258 + }
15259 +
15260 + void SetSelectHdl( Link const& link )
15261 + {
15262 + if (!link && !!maSelectHdl)
15263 + mxComboBox->removeItemListener( this );
15264 + else if (!!link && !maSelectHdl)
15265 + mxComboBox->addItemListener( this );
15266 + maSelectHdl = link;
15267 + }
15268 +
15269 + virtual void SAL_CALL disposing( lang::EventObject const& e )
15270 + throw (css::uno::RuntimeException);
15271 +
15272 + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& /* rEvent */ )
15273 + throw (css::uno::RuntimeException)
15274 + {
15275 + ComboBox* pComboBox = static_cast<ComboBox*>( mpWindow );
15276 + if ( !pComboBox )
15277 + return;
15278 + maClickHdl.Call( pComboBox );
15279 + }
15280 +
15281 + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& /* rEvent */ )
15282 + throw (css::uno::RuntimeException)
15283 + {
15284 + ComboBox* pComboBox = static_cast<ComboBox*>( mpWindow );
15285 + if ( !pComboBox )
15286 + return;
15287 + maSelectHdl.Call( pComboBox );
15288 + }
15289 +};
15290 +
15291 +ComboBox::~ComboBox ()
15292 +{
15293 + OSL_TRACE ("%s: deleting ComboBox for window: %p", __FUNCTION__, GetWindow ());
15294 +}
15295 +
15296 +ComboBoxImpl::~ComboBoxImpl ()
15297 +{
15298 + OSL_TRACE ("%s: deleting ComboBoxImpl for window: %p", __FUNCTION__, mpWindow ? mpWindow->GetWindow () : 0);
15299 + OSL_TRACE ("%s: deleting ComboBoxImpl for listener: %p", __FUNCTION__, static_cast<XFocusListener*> (this));
15300 +}
15301 +
15302 +void ComboBoxImpl::disposing( lang::EventObject const& e )
15303 + throw (css::uno::RuntimeException)
15304 +{
15305 + EditImpl::disposing (e);
15306 + mxComboBox.clear ();
15307 +}
15308 +
15309 +sal_uInt16 ComboBox::InsertEntry( const OUString &rStr, sal_uInt16 nPos )
15310 +{
15311 + return getImpl().InsertEntry( rStr, nPos );
15312 +}
15313 +
15314 +void ComboBox::RemoveEntry( const OUString& rStr )
15315 +{
15316 + getImpl().RemoveEntry( GetEntryPos( rStr ) );
15317 +}
15318 +
15319 +void ComboBox::RemoveEntry( sal_uInt16 nPos )
15320 +{
15321 + getImpl().RemoveEntry( nPos );
15322 +}
15323 +
15324 +void ComboBox::Clear()
15325 +{
15326 + uno::Sequence< rtl::OUString> aNoItems;
15327 + getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
15328 +}
15329 +
15330 +sal_uInt16 ComboBox::GetEntryPos( const OUString& rStr ) const
15331 +{
15332 + return getImpl().GetEntryPos( rStr );
15333 +}
15334 +
15335 +String ComboBox::GetEntry( sal_uInt16 nPos ) const
15336 +{
15337 + rtl::OUString rItem = getImpl().mxComboBox->getItem( nPos );
15338 + return OUString( rItem );
15339 +}
15340 +
15341 +sal_uInt16 ComboBox::GetEntryCount() const
15342 +{
15343 + return getImpl().GetEntryCount();
15344 +}
15345 +
15346 +void ComboBox::SetClickHdl( const Link& link )
15347 +{
15348 + if (&getImpl () && getImpl().mxComboBox.is ())
15349 + getImpl().SetClickHdl( link );
15350 +}
15351 +
15352 +void ComboBox::SetSelectHdl( const Link& link )
15353 +{
15354 + if (&getImpl () && getImpl().mxComboBox.is ())
15355 + getImpl().SetSelectHdl( link );
15356 +}
15357 +
15358 +void ComboBox::EnableAutocomplete (bool enable, bool matchCase)
15359 +{
15360 + GetComboBox ()->EnableAutocomplete (enable, matchCase);
15361 +}
15362 +
15363 +IMPL_CONSTRUCTORS_BODY( ComboBox, Edit, "combobox", getImpl().parent = parent; );
15364 +IMPL_GET_WINDOW (ComboBox);
15365 +/// IMPL_GET_IMPL( ComboBox );
15366 +
15367 +static ComboBoxImpl& null_combobox_impl = (ComboBoxImpl&)*(ComboBoxImpl*)0;
15368 +
15369 +ComboBoxImpl &ComboBox::getImpl () const
15370 +{
15371 + if (ComboBoxImpl* c = static_cast<ComboBoxImpl *>(mpImpl))
15372 + return *c;
15373 + return null_combobox_impl;
15374 +}
15375 +
15376 +
15377 +// Window/Control/ListBox
15378 +class ListBoxImpl : public ControlImpl
15379 + , public ::cppu::WeakImplHelper1< awt::XActionListener >
15380 + , public ::cppu::WeakImplHelper1< awt::XItemListener >
15381 +{
15382 + Link maClickHdl;
15383 + Link maSelectHdl;
15384 +public:
15385 + uno::Reference< awt::XListBox > mxListBox;
15386 + ListBoxImpl( Context *context, const PeerHandle &peer, Window *window )
15387 + : ControlImpl( context, peer, window ),
15388 + mxListBox( peer, uno::UNO_QUERY )
15389 + {
15390 + SelectEntryPos( 0, true );
15391 + }
15392 +
15393 + sal_uInt16 InsertEntry(const OUString& rStr, sal_uInt16 nPos)
15394 + {
15395 + if ( nPos == LISTBOX_APPEND )
15396 + nPos = mxListBox->getItemCount();
15397 + mxListBox->addItem( rtl::OUString( rStr ), nPos );
15398 + return nPos;
15399 + }
15400 +
15401 + void RemoveEntry( sal_uInt16 nPos )
15402 + {
15403 + mxListBox->removeItems( nPos, 1 );
15404 + }
15405 +
15406 + sal_uInt16 RemoveEntry(const OUString& rStr, sal_uInt16 nPos)
15407 + {
15408 + if ( nPos == LISTBOX_APPEND )
15409 + nPos = mxListBox->getItemCount();
15410 + mxListBox->addItem( rtl::OUString( rStr ), nPos );
15411 + return nPos;
15412 + }
15413 +
15414 + sal_uInt16 GetEntryPos( const OUString& rStr ) const
15415 + {
15416 + uno::Sequence< rtl::OUString> aItems( mxListBox->getItems() );
15417 + rtl::OUString rKey( rStr );
15418 + for (unsigned int i = 0; aItems.getLength(); i++)
15419 + {
15420 + if ( aItems[ i ] == rKey )
15421 + return sal::static_int_cast< sal_uInt16 >( i );
15422 + }
15423 + return LISTBOX_ENTRY_NOTFOUND;
15424 + }
15425 +
15426 + OUString GetEntry( sal_uInt16 nPos ) const
15427 + {
15428 + return mxListBox->getItem( nPos );
15429 + }
15430 +
15431 + sal_uInt16 GetEntryCount() const
15432 + {
15433 + return mxListBox->getItemCount();
15434 + }
15435 +
15436 + void SelectEntryPos( sal_uInt16 nPos, bool bSelect )
15437 + {
15438 + mxListBox->selectItemPos( nPos, bSelect );
15439 + }
15440 +
15441 + sal_uInt16 GetSelectEntryCount() const
15442 + {
15443 + return sal::static_int_cast< sal_uInt16 >( mxListBox->getSelectedItems().getLength() );
15444 + }
15445 +
15446 + sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex ) const
15447 + {
15448 + sal_uInt16 nSelected = 0;
15449 + if ( mxListBox->isMutipleMode() )
15450 + {
15451 + uno::Sequence< short > aItems( mxListBox->getSelectedItemsPos() );
15452 + if ( nSelIndex < aItems.getLength() )
15453 + nSelected = aItems[ nSelIndex ];
15454 + }
15455 + else
15456 + nSelected = mxListBox->getSelectedItemPos();
15457 + return nSelected;
15458 + }
15459 +
15460 + void SetClickHdl( Link const& link )
15461 + {
15462 + if (!link && !!maClickHdl)
15463 + mxListBox->removeActionListener( this );
15464 + else if (!!link && !maClickHdl)
15465 + mxListBox->addActionListener( this );
15466 + maClickHdl = link;
15467 + }
15468 +
15469 + void SetSelectHdl( Link const& link )
15470 + {
15471 + if (!link && !!maSelectHdl)
15472 + mxListBox->removeItemListener( this );
15473 + else if (!!link && !maSelectHdl)
15474 + mxListBox->addItemListener( this );
15475 + maSelectHdl = link;
15476 + }
15477 +
15478 + virtual void SAL_CALL disposing( lang::EventObject const& e )
15479 + throw (css::uno::RuntimeException)
15480 + {
15481 + ControlImpl::disposing (e);
15482 + mxListBox.clear ();
15483 + }
15484 +
15485 + void SAL_CALL actionPerformed( const css::awt::ActionEvent& /* rEvent */ )
15486 + throw (css::uno::RuntimeException)
15487 + {
15488 + maClickHdl.Call( mpWindow );
15489 + }
15490 +
15491 + void SAL_CALL itemStateChanged( const css::awt::ItemEvent& /* rEvent */ )
15492 + throw (css::uno::RuntimeException)
15493 + {
15494 + ListBox* pListBox = static_cast<ListBox*>( mpWindow );
15495 + if ( !pListBox )
15496 + return;
15497 + maSelectHdl.Call( pListBox );
15498 + }
15499 +};
15500 +
15501 +ListBox::~ListBox ()
15502 +{
15503 +}
15504 +
15505 +sal_uInt16 ListBox::InsertEntry(const OUString& rStr, sal_uInt16 nPos)
15506 +{
15507 + return getImpl().InsertEntry(rStr, nPos);
15508 +}
15509 +
15510 +void ListBox::RemoveEntry( sal_uInt16 nPos )
15511 +{
15512 + return getImpl().RemoveEntry( nPos );
15513 +}
15514 +
15515 +void ListBox::RemoveEntry( const OUString& rStr )
15516 +{
15517 + return getImpl().RemoveEntry( GetEntryPos( rStr ) );
15518 +}
15519 +
15520 +void ListBox::Clear()
15521 +{
15522 + uno::Sequence< rtl::OUString> aNoItems;
15523 + getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
15524 +}
15525 +
15526 +sal_uInt16 ListBox::GetEntryPos( const OUString& rStr ) const
15527 +{
15528 + return getImpl().GetEntryPos( rStr );
15529 +}
15530 +
15531 +String ListBox::GetEntry( sal_uInt16 nPos ) const
15532 +{
15533 + return getImpl().GetEntry( nPos );
15534 +}
15535 +
15536 +sal_uInt16 ListBox::GetEntryCount() const
15537 +{
15538 + return getImpl().GetEntryCount();
15539 +}
15540 +
15541 +void ListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
15542 +{
15543 + getImpl().SelectEntryPos( nPos, bSelect );
15544 +}
15545 +
15546 +void ListBox::SelectEntry( const OUString& rStr, bool bSelect )
15547 +{
15548 + SelectEntryPos( GetEntryPos( rStr ), bSelect );
15549 +}
15550 +
15551 +sal_uInt16 ListBox::GetSelectEntryCount() const
15552 +{
15553 + return getImpl().GetSelectEntryCount();
15554 +}
15555 +
15556 +sal_uInt16 ListBox::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
15557 +{
15558 + return getImpl().GetSelectEntryPos( nSelIndex );
15559 +}
15560 +
15561 +String ListBox::GetSelectEntry( sal_uInt16 nSelIndex ) const
15562 +{
15563 + return GetEntry( GetSelectEntryPos( nSelIndex ) );
15564 +}
15565 +
15566 +void ListBox::SetSelectHdl( const Link& link )
15567 +{
15568 + getImpl().SetSelectHdl( link );
15569 +}
15570 +
15571 +void ListBox::SetClickHdl( const Link& link )
15572 +{
15573 + if (&getImpl () && getImpl().mxListBox.is ())
15574 + getImpl().SetClickHdl( link );
15575 +}
15576 +
15577 +
15578 +void ListBox::SetEntryData( sal_uInt16 pos, void* data)
15579 +{
15580 + GetListBox ()->SetEntryData (pos, data);
15581 +}
15582 +
15583 +void* ListBox::GetEntryData( sal_uInt16 pos) const
15584 +{
15585 + return GetListBox ()->GetEntryData (pos);
15586 +}
15587 +
15588 +// SvxLanguageBox
15589 +void ListBox::SetLanguageList( sal_Int16/*list*/, bool/*hasLangNone*/, bool /*langNoneIsLangAll*/, bool /*checkSpellAvail*/)
15590 +{
15591 +}
15592 +
15593 +sal_uInt16 ListBox::InsertLanguage( const LanguageType/*type*/, sal_uInt16/*pos*/)
15594 +{
15595 + return 0;
15596 +}
15597 +sal_uInt16 ListBox::InsertLanguage( const LanguageType/*type*/, bool/*checkEntry*/, sal_uInt16 /*pos*/)
15598 +{
15599 + return 0;
15600 +}
15601 +void ListBox::RemoveLanguage( const LanguageType/*type*/)
15602 +{
15603 +}
15604 +void ListBox::SelectLanguage( const LanguageType/*type*/, bool/*select*/)
15605 +{
15606 +}
15607 +LanguageType ListBox::GetSelectLanguage() const
15608 +{
15609 + return 0;
15610 +}
15611 +bool ListBox::IsLanguageSelected( const LanguageType/*type*/) const
15612 +{
15613 + return true;
15614 +}
15615 +
15616 +IMPL_CONSTRUCTORS ( ListBox, Control, "listbox" );
15617 +IMPL_GET_IMPL( ListBox );
15618 +IMPL_GET_WINDOW (ListBox);
15619 +
15620 +// Window/Control/List/MultiListBox
15621 +class MultiListBoxImpl : public ListBoxImpl
15622 +{
15623 +public:
15624 + MultiListBoxImpl( Context *context, const PeerHandle &peer, Window *window )
15625 + : ListBoxImpl( context, peer, window )
15626 + {
15627 + }
15628 +};
15629 +
15630 +IMPL_CONSTRUCTORS_BODY( MultiListBox, ListBox, "multilistbox", GetMultiListBox()->EnableMultiSelection( true ); );
15631 +IMPL_GET_IMPL( MultiListBox );
15632 +IMPL_GET_WINDOW( MultiListBox );
15633 +
15634 +} // namespace layout
15635 --- toolkit/source/layout/vcl/wrapper.cxx.old 1970-01-01 00:00:00.000000000 +0000
15636 +++ toolkit/source/layout/vcl/wrapper.cxx 2009-04-06 16:42:13.000000000 +0000
15637 @@ -0,0 +1,1586 @@
15638 +/*************************************************************************
15639 + *
15640 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
15641 + *
15642 + * Copyright 2008 by Sun Microsystems, Inc.
15643 + *
15644 + * OpenOffice.org - a multi-platform office productivity suite
15645 + *
15646 + * $RCSfile$
15647 + *
15648 + * $Revision$
15649 + *
15650 + * This file is part of OpenOffice.org.
15651 + *
15652 + * OpenOffice.org is free software: you can redistribute it and/or modify
15653 + * it under the terms of the GNU Lesser General Public License version 3
15654 + * only, as published by the Free Software Foundation.
15655 + *
15656 + * OpenOffice.org is distributed in the hope that it will be useful,
15657 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
15658 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15659 + * GNU Lesser General Public License version 3 for more details
15660 + * (a copy is included in the LICENSE file that accompanied this code).
15661 + *
15662 + * You should have received a copy of the GNU Lesser General Public License
15663 + * version 3 along with OpenOffice.org. If not, see
15664 + * <http://www.openoffice.org/license.html>
15665 + * for a copy of the LGPLv3 License.
15666 + *
15667 + ************************************************************************/
15668 +
15669 +#include <tools/rc.h>
15670 +//#define RESOURCE_PUBLISH_PROTECTED 1
15671 +#if RESOURCE_PUBLISH_PROTECTED
15672 +// ugh, override non-helpful proctection
15673 +#define protected public
15674 +#endif /* RESOURCE_PUBLISH_PROTECTED */
15675 +#include <tools/rc.hxx>
15676 +#undef protected
15677 +
15678 +
15679 +#include "wrapper.hxx"
15680 +
15681 +#include <awt/vclxplugin.hxx>
15682 +#include <awt/vclxtabcontrol.hxx>
15683 +#include <com/sun/star/awt/PosSize.hpp>
15684 +#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
15685 +#include <com/sun/star/awt/WindowAttribute.hpp>
15686 +#include <com/sun/star/awt/XDialog2.hpp>
15687 +#include <com/sun/star/awt/XProgressBar.hpp>
15688 +#include <com/sun/star/awt/XSimpleTabController.hpp>
15689 +#include <com/sun/star/awt/XTabListener.hpp>
15690 +#include <com/sun/star/graphic/XGraphic.hpp>
15691 +#include <comphelper/processfactory.hxx>
15692 +#include <layout/core/factory.hxx>
15693 +#include <layout/core/localized-string.hxx>
15694 +#include <layout/core/root.hxx>
15695 +#include <toolkit/awt/vclxwindow.hxx>
15696 +#include <vcl/ctrl.hxx>
15697 +#include <vcl/dialog.hxx>
15698 +#include <vcl/image.hxx>
15699 +#include <vcl/tabctrl.hxx>
15700 +#include <vcl/tabpage.hxx>
15701 +#include <vcl/window.hxx>
15702 +
15703 +using namespace ::com::sun::star;
15704 +using rtl::OUString;
15705 +
15706 +namespace layout
15707 +{
15708 +
15709 +// Context bits ...
15710 +class ContextImpl
15711 +{
15712 + uno::Reference< awt::XLayoutRoot > mxRoot;
15713 + uno::Reference< container::XNameAccess > mxNameAccess;
15714 + PeerHandle mxTopLevel;
15715 +
15716 +public:
15717 + ContextImpl( char const *pPath )
15718 + {
15719 + uno::Sequence< uno::Any > aParams( 1 );
15720 + aParams[0] <<= OUString( pPath, strlen( pPath ), RTL_TEXTENCODING_UTF8 );
15721 +
15722 + uno::Reference< lang::XSingleServiceFactory > xFactory(
15723 + comphelper::createProcessComponent(
15724 + OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
15725 + uno::UNO_QUERY );
15726 + if ( !xFactory.is() )
15727 + {
15728 + throw uno::RuntimeException(
15729 + OUString( RTL_CONSTASCII_USTRINGPARAM( "Layout engine not installed" ) ),
15730 + uno::Reference< uno::XInterface >() );
15731 + }
15732 + mxRoot = uno::Reference< awt::XLayoutRoot >(
15733 + xFactory->createInstanceWithArguments( aParams ),
15734 + uno::UNO_QUERY );
15735 +
15736 + mxNameAccess = uno::Reference< container::XNameAccess >( mxRoot, uno::UNO_QUERY );
15737 + }
15738 +
15739 + ~ContextImpl()
15740 + {
15741 + }
15742 +
15743 + PeerHandle getByName( const OUString &rName )
15744 + {
15745 + uno::Any val = mxNameAccess->getByName( rName );
15746 + PeerHandle xRet;
15747 + val >>= xRet;
15748 + return xRet;
15749 + }
15750 + PeerHandle getTopLevel()
15751 + {
15752 + return mxTopLevel;
15753 + }
15754 + void setTopLevel( PeerHandle xToplevel )
15755 + {
15756 + mxTopLevel = xToplevel;
15757 + }
15758 + PeerHandle getRoot()
15759 + {
15760 + return mxRoot;
15761 + }
15762 +};
15763 +
15764 +Context::Context( const char *pPath )
15765 + : pImpl( new ContextImpl( pPath ) )
15766 +{
15767 +}
15768 +Context::~Context()
15769 +{
15770 + delete pImpl;
15771 + pImpl = NULL;
15772 +}
15773 +
15774 +void Context::setToplevel( PeerHandle xToplevel )
15775 +{
15776 + pImpl->setTopLevel( xToplevel );
15777 +}
15778 +
15779 +PeerHandle Context::getToplevel()
15780 +{
15781 + return pImpl->getTopLevel();
15782 +}
15783 +PeerHandle Context::getRoot()
15784 +{
15785 + return pImpl->getRoot();
15786 +}
15787 +
15788 +PeerHandle Context::GetPeerHandle( const char *id, sal_uInt32 nId ) const
15789 +{
15790 + PeerHandle xHandle;
15791 + xHandle = pImpl->getByName( OUString( id, strlen( id ), RTL_TEXTENCODING_UTF8 ) );
15792 + if ( !xHandle.is() )
15793 + {
15794 + DBG_ERROR1( "Failed to fetch widget '%s'", id );
15795 + }
15796 +
15797 + if ( nId != 0 )
15798 + {
15799 + rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId );
15800 + xHandle = GetPeerHandle( aStr, 0 );
15801 + }
15802 + return xHandle;
15803 +}
15804 +
15805 +WindowImpl::WindowImpl (Context *context, const PeerHandle &peer, Window *window)
15806 + : mpWindow (window)
15807 + , mpCtx (context)
15808 + , mxWindow (peer, uno::UNO_QUERY)
15809 + , mxVclPeer (peer, uno::UNO_QUERY)
15810 + , mvclWindow (0)
15811 + , bFirstTimeVisible (true)
15812 +{
15813 +}
15814 +
15815 +WindowImpl::~WindowImpl ()
15816 +{
15817 + if (mpWindow)
15818 + mpWindow->mpImpl = 0;
15819 + if (mvclWindow)
15820 + {
15821 + VCLXWindow *v = mvclWindow->GetWindowPeer ();
15822 + v->SetWindow (0);
15823 + mvclWindow->SetComponentInterface (uno::Reference <awt::XWindowPeer> ());
15824 + mvclWindow->SetWindowPeer (uno::Reference <awt::XWindowPeer> (), 0);
15825 + delete mvclWindow;
15826 + mvclWindow = 0;
15827 + }
15828 +}
15829 +
15830 +void WindowImpl::wrapperGone ()
15831 +{
15832 + mvclWindow = 0;
15833 + mpWindow->mpImpl = 0;
15834 + mpWindow = 0;
15835 + mpCtx = 0;
15836 + if ( mxWindow.is() )
15837 + {
15838 + uno::Reference< lang::XComponent > xComp( mxWindow, uno::UNO_QUERY );
15839 + mxWindow.clear ();
15840 + if ( xComp.is() )
15841 + xComp->dispose();
15842 + }
15843 +}
15844 +
15845 +void SAL_CALL WindowImpl::disposing (lang::EventObject const&)
15846 + throw (uno::RuntimeException)
15847 +{
15848 + if (mxWindow.is ())
15849 + mxWindow.clear ();
15850 +}
15851 +
15852 +uno::Any WindowImpl::getProperty (char const* name)
15853 +{
15854 + if ( !this || !mxVclPeer.is() )
15855 + return css::uno::Any();
15856 + return mxVclPeer->getProperty
15857 + ( rtl::OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ) );
15858 +}
15859 +
15860 +void WindowImpl::setProperty (char const *name, uno::Any any)
15861 +{
15862 + if ( !this || !mxVclPeer.is() )
15863 + return;
15864 + mxVclPeer->setProperty
15865 + ( rtl::OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ), any );
15866 +}
15867 +
15868 +void WindowImpl::redraw (bool resize)
15869 +{
15870 + uno::Reference <awt::XWindow> ref (mxWindow, uno::UNO_QUERY);
15871 + ::Window* window = VCLXWindow::GetImplementation (ref)->GetWindow ();
15872 + ::Window* parent = window->GetParent();
15873 + ::Rectangle r = Rectangle (parent->GetPosPixel (),
15874 + parent->GetSizePixel ());
15875 + parent->Invalidate (r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
15876 + if (resize)
15877 + parent->SetPosSizePixel (0, 0, 1, 1, awt::PosSize::SIZE);
15878 + else
15879 + parent->SetPosSizePixel (0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
15880 + awt::PosSize::SIZE);
15881 +}
15882 +
15883 +Window::Window( WindowImpl *pImpl )
15884 + : mpImpl( pImpl )
15885 +{
15886 + mpImpl->mvclWindow = GetVCLXWindow () ? GetWindow () : 0;
15887 +}
15888 +
15889 +Window::~Window()
15890 +{
15891 + /* likely to be an UNO object - with floating references */
15892 + if (mpImpl)
15893 + mpImpl->wrapperGone ();
15894 + mpImpl = 0;
15895 +}
15896 +
15897 +///IMPL_GET_IMPL( Control );
15898 +
15899 +static ControlImpl& null_control_impl = (ControlImpl&)*(ControlImpl*)0;
15900 +
15901 +ControlImpl &Control::getImpl () const
15902 +{
15903 + if (ControlImpl* c = static_cast<ControlImpl *>(mpImpl))
15904 + return *c;
15905 + return null_control_impl;
15906 +}
15907 +
15908 +Control::~Control ()
15909 +{
15910 + SetGetFocusHdl (Link ());
15911 + SetLoseFocusHdl (Link ());
15912 +}
15913 +
15914 +void Window::setRes (ResId const& res)
15915 +{
15916 +#if RESOURCE_PUBLISH_PROTECTED
15917 + // Resources are shut-off from use. Is that really necessary?
15918 + Resource &r = *GetWindow ();
15919 + r.GetRes (res);
15920 +#else /* !RESOURCE_PUBLISH_PROTECTED */
15921 + //We *must* derive. Is this also really necessary?
15922 + //Resource r (res);
15923 +
15924 + // ugh, I wonder which solution is cleaner...
15925 + class Resource_open_up : public Resource
15926 + {
15927 + public:
15928 + Resource_open_up (ResId const& r)
15929 + : Resource (r)
15930 + {
15931 + }
15932 + static sal_Int32 GetLongRes (void *p)
15933 + {
15934 + return Resource::GetLongRes (p);
15935 + }
15936 + void* GetClassRes ()
15937 + {
15938 + return Resource::GetClassRes ();
15939 + }
15940 + sal_Int32 ReadLongRes ()
15941 + {
15942 + return Resource::ReadLongRes ();
15943 + }
15944 + UniString ReadStringRes ()
15945 + {
15946 + return Resource::ReadStringRes ();
15947 + }
15948 + };
15949 +
15950 + Resource_open_up r (res);
15951 +#endif /* !RESOURCE_PUBLISH_PROTECTED */
15952 + if (sal_uInt32 help_id = (sal_uInt32)r.GetLongRes (static_cast<char *> (r.GetClassRes ()) + 12))
15953 + SetHelpId (help_id);
15954 + sal_uInt32 mask = r.ReadLongRes ();
15955 + if ( mask & WINDOW_TEXT )
15956 + SetText( r.ReadStringRes ());
15957 +}
15958 +
15959 +void Window::SetParent( ::Window *parent )
15960 +{
15961 + uno::Reference <awt::XWindow> ref( GetPeer(), uno::UNO_QUERY );
15962 + if (VCLXWindow *vcl = VCLXWindow::GetImplementation( ref ))
15963 + if (::Window *window = vcl->GetWindow())
15964 + window->SetParent( parent );
15965 +}
15966 +
15967 +void Window::SetParent( Window *parent )
15968 +{
15969 + /* Let's hear it for C++: poor man's dynamic binding. */
15970 + parent->ParentSet (this);
15971 +}
15972 +
15973 +void Window::ParentSet (Window *window)
15974 +{
15975 + window->SetParent (GetWindow ());
15976 +}
15977 +
15978 +Context *Window::getContext()
15979 +{
15980 + return this && mpImpl ? mpImpl->mpCtx : NULL;
15981 +}
15982 +
15983 +PeerHandle Window::GetPeer() const
15984 +{
15985 + if ( !mpImpl )
15986 + return PeerHandle();
15987 + return mpImpl->mxWindow;
15988 +}
15989 +
15990 +uno::Reference<awt::XWindow> Window::GetRef() const
15991 +{
15992 + return uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY );
15993 +}
15994 +
15995 +VCLXWindow* Window::GetVCLXWindow() const
15996 +{
15997 + return VCLXWindow::GetImplementation( GetRef() );
15998 +}
15999 +
16000 +::Window* Window::GetWindow() const
16001 +{
16002 + return GetVCLXWindow()->GetWindow();
16003 +}
16004 +
16005 +::Window* Window::GetParent() const
16006 +{
16007 + return GetWindow()->GetParent();
16008 +}
16009 +
16010 +void Window::SetHelpId( sal_uIntPtr id )
16011 +{
16012 + GetWindow()->SetHelpId( id );
16013 +}
16014 +
16015 +sal_uIntPtr Window::GetHelpId() const
16016 +{
16017 + return GetWindow()->GetHelpId();
16018 +}
16019 +
16020 +void Window::SetSmartHelpId( SmartId const& id, SmartIdUpdateMode mode )
16021 +{
16022 + GetWindow()->SetSmartHelpId( id, mode );
16023 +}
16024 +
16025 +SmartId Window::GetSmartHelpId() const
16026 +{
16027 + return GetWindow()->GetSmartHelpId();
16028 +}
16029 +
16030 +void Window::EnterWait ()
16031 +{
16032 + GetWindow()->EnterWait ();
16033 +}
16034 +void Window::LeaveWait ()
16035 +{
16036 + GetWindow()->LeaveWait ();
16037 +}
16038 +bool Window::IsWait () const
16039 +{
16040 + return GetWindow()->IsWait ();
16041 +}
16042 +
16043 +bool Window::IsVisible () const
16044 +{
16045 + if (GetWindow ())
16046 + return GetWindow()->IsVisible ();
16047 + return false;
16048 +}
16049 +
16050 +bool Window::HasChildPathFocus (bool systemWindow) const
16051 +{
16052 + return GetWindow()->HasChildPathFocus (systemWindow);
16053 +}
16054 +
16055 +void Window::SetPosPixel (Point const&)
16056 +{
16057 +}
16058 +
16059 +Point Window::GetPosPixel () const
16060 +{
16061 + return Point ();
16062 +}
16063 +
16064 +void Window::SetSizePixel (Size const&)
16065 +{
16066 +}
16067 +
16068 +Size Window::GetSizePixel () const
16069 +{
16070 + return Size ();
16071 +}
16072 +
16073 +// void Window::Enable (bool enable, bool child);
16074 +// {
16075 +// GetWindow ()->Enable (enable, child);
16076 +// }
16077 +
16078 +// void Window::Disable (bool child)
16079 +// {
16080 +// GetWindow ()->Disable (child);
16081 +// }
16082 +
16083 +bool Window::IsEnabled () const
16084 +{
16085 + return GetWindow ()->IsEnabled ();
16086 +// if (getImpl().mxWindow.is ())
16087 +// return getImpl ().mxWindow->isEnabled ();
16088 +// return false;
16089 +}
16090 +
16091 +void Window::EnableInput (bool enable, bool child)
16092 +{
16093 + GetWindow ()->EnableInput (enable, child);
16094 +}
16095 +
16096 +bool Window::IsInputEnabled () const
16097 +{
16098 + return GetWindow ()->IsInputEnabled ();
16099 +}
16100 +
16101 +struct ToolkitVclPropsMap
16102 +{
16103 + WinBits vclStyle;
16104 + long initAttr;
16105 + const char *propName;
16106 +
16107 + // the value to give the prop to enable/disable it -- not the most brilliant
16108 + // type declaration and storage, but does the work... properties are
16109 + // either a boolean or a short since they are either a directly wrappers for
16110 + // a WinBit, or aggregates related (like Align for WB_LEFT, _RIGHT and _CENTER).
16111 + bool isBoolean;
16112 + short enableProp, disableProp;
16113 +};
16114 +
16115 +#define TYPE_BOOL true
16116 +#define TYPE_SHORT false
16117 +#define NOTYPE 0
16118 +static const ToolkitVclPropsMap toolkitVclPropsMap[] =
16119 +{
16120 + { WB_BORDER, awt::WindowAttribute::BORDER, "Border", TYPE_SHORT, 1, 0 },
16121 + { WB_NOBORDER, awt::VclWindowPeerAttribute::NOBORDER, "Border", TYPE_SHORT, 0, 1 },
16122 + { WB_SIZEABLE, awt::WindowAttribute::SIZEABLE, NULL, NOTYPE, 0, 0 },
16123 + { WB_MOVEABLE, awt::WindowAttribute::MOVEABLE, NULL, NOTYPE, 0, 0 },
16124 + { WB_CLOSEABLE, awt::WindowAttribute::CLOSEABLE, NULL, NOTYPE, 0, 0 },
16125 +
16126 + { WB_HSCROLL, awt::VclWindowPeerAttribute::HSCROLL, NULL, NOTYPE, 0, 0 },
16127 + { WB_VSCROLL, awt::VclWindowPeerAttribute::VSCROLL, NULL, NOTYPE, 0, 0 },
16128 + { WB_LEFT, awt::VclWindowPeerAttribute::LEFT, "Align", TYPE_SHORT, 0, 0 },
16129 + { WB_CENTER, awt::VclWindowPeerAttribute::CENTER, "Align", TYPE_SHORT, 1, 0 },
16130 + { WB_RIGHT, awt::VclWindowPeerAttribute::RIGHT, "Align", TYPE_SHORT, 2, 0 },
16131 + { WB_SPIN, awt::VclWindowPeerAttribute::SPIN, NULL, NOTYPE, 0, 0 },
16132 + { WB_SORT, awt::VclWindowPeerAttribute::SORT, NULL, NOTYPE, 0, 0 },
16133 + { WB_DROPDOWN, awt::VclWindowPeerAttribute::DROPDOWN, "Dropdown", TYPE_BOOL, 1, 0 },
16134 + { WB_DEFBUTTON, awt::VclWindowPeerAttribute::DEFBUTTON, "DefaultButton", TYPE_BOOL, 1, 0 },
16135 + { WB_READONLY, awt::VclWindowPeerAttribute::READONLY, NULL, NOTYPE, 0, 0 },
16136 + { WB_CLIPCHILDREN, awt::VclWindowPeerAttribute::CLIPCHILDREN, NULL, NOTYPE, 0, 0 },
16137 + { WB_GROUP, awt::VclWindowPeerAttribute::GROUP, NULL, NOTYPE, 0, 0 },
16138 +
16139 + { WB_OK, awt::VclWindowPeerAttribute::OK, NULL, NOTYPE, 0, 0 },
16140 + { WB_OK_CANCEL, awt::VclWindowPeerAttribute::OK_CANCEL, NULL, NOTYPE, 0, 0 },
16141 + { WB_YES_NO, awt::VclWindowPeerAttribute::YES_NO, NULL, NOTYPE, 0, 0 },
16142 + { WB_YES_NO_CANCEL, awt::VclWindowPeerAttribute::YES_NO_CANCEL, NULL, NOTYPE, 1, 0 },
16143 + { WB_RETRY_CANCEL, awt::VclWindowPeerAttribute::RETRY_CANCEL, NULL, NOTYPE, 1, 0 },
16144 + { WB_DEF_OK, awt::VclWindowPeerAttribute::DEF_OK, NULL, NOTYPE, 0, 0 },
16145 + { WB_DEF_CANCEL, awt::VclWindowPeerAttribute::DEF_CANCEL, NULL, NOTYPE, 1, 0 },
16146 + { WB_DEF_RETRY, awt::VclWindowPeerAttribute::DEF_RETRY, NULL, NOTYPE, 0, 0 },
16147 + { WB_DEF_YES, awt::VclWindowPeerAttribute::DEF_YES, NULL, NOTYPE, 0, 0 },
16148 + { WB_DEF_NO, awt::VclWindowPeerAttribute::DEF_NO, NULL, NOTYPE, 0, 0 },
16149 +
16150 + { WB_AUTOHSCROLL, awt::VclWindowPeerAttribute::AUTOHSCROLL, "AutoHScroll", TYPE_BOOL, 1, 0 },
16151 + { WB_AUTOVSCROLL, awt::VclWindowPeerAttribute::AUTOVSCROLL, "AutoVScroll", TYPE_BOOL, 1, 0 },
16152 +
16153 + { WB_WORDBREAK, 0, "MultiLine", TYPE_BOOL, 1, 0 },
16154 + { WB_NOPOINTERFOCUS, 0, "FocusOnClick", TYPE_BOOL, 1, 0 },
16155 + { WB_TOGGLE, 0, "Toggle", TYPE_BOOL, 1, 0 },
16156 + { WB_REPEAT, 0, "Repeat", TYPE_BOOL, 1, 0 },
16157 + { WB_NOHIDESELECTION, 0, "HideInactiveSelection", TYPE_BOOL, 1, 0 },
16158 +};
16159 +#undef TYPE_BOOL
16160 +#undef TYPE_SHORT
16161 +#undef NOTYPE
16162 +
16163 +static const int toolkitVclPropsMapLen =
16164 + sizeof( toolkitVclPropsMap ) / sizeof( ToolkitVclPropsMap );
16165 +
16166 +void Window::SetStyle( WinBits nStyle )
16167 +{
16168 + uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
16169 + for (int i = 0; i < toolkitVclPropsMapLen; i++)
16170 + {
16171 + if ( toolkitVclPropsMap[ i ].propName )
16172 + {
16173 + short nValue;
16174 + if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
16175 + nValue = toolkitVclPropsMap[ i ].enableProp;
16176 + else
16177 + nValue = toolkitVclPropsMap[ i ].disableProp;
16178 + uno::Any aValue;
16179 + if ( toolkitVclPropsMap[ i ].isBoolean )
16180 + aValue = uno::makeAny( (bool) nValue );
16181 + else
16182 + aValue = uno::makeAny( (short) nValue );
16183 + mpImpl->setProperty( toolkitVclPropsMap[ i ].propName, aValue );
16184 + }
16185 + }
16186 +}
16187 +
16188 +WinBits Window::GetStyle()
16189 +{
16190 + uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
16191 + WinBits ret = 0;
16192 + for (int i = 0; i < toolkitVclPropsMapLen; i++)
16193 + {
16194 + if ( toolkitVclPropsMap[ i ].propName )
16195 + {
16196 + short nValue = 0;
16197 + if ( toolkitVclPropsMap[ i ].isBoolean )
16198 + {
16199 + bool bValue = false;
16200 + mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= bValue;
16201 + nValue = bValue ? 1 : 0;
16202 + }
16203 + else
16204 + mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= nValue;
16205 + if ( nValue == toolkitVclPropsMap[ i ].enableProp )
16206 + ret |= toolkitVclPropsMap[i].vclStyle;
16207 + }
16208 + }
16209 + return ret;
16210 +}
16211 +
16212 +/* Unpleasant way to get an xToolkit pointer ... */
16213 +uno::Reference< awt::XToolkit > getToolkit()
16214 +{
16215 + static uno::Reference< awt::XToolkit > xToolkit;
16216 + if (!xToolkit.is())
16217 + {
16218 + // Urgh ...
16219 + xToolkit = uno::Reference< awt::XToolkit >(
16220 + ::comphelper::getProcessServiceFactory()->createInstance(
16221 + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ),
16222 + uno::UNO_QUERY );
16223 + if ( !xToolkit.is() )
16224 + throw uno::RuntimeException(
16225 + OUString( RTL_CONSTASCII_USTRINGPARAM( "failed to create toolkit!") ),
16226 + uno::Reference< uno::XInterface >() );
16227 + }
16228 + return xToolkit;
16229 +}
16230 +
16231 +PeerHandle Window::CreatePeer( Window *parent, WinBits nStyle, const char *pName)
16232 +{
16233 + long nWinAttrbs = 0;
16234 + for (int i = 0; i < toolkitVclPropsMapLen; i++)
16235 + if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
16236 + nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
16237 +
16238 + return layoutimpl::WidgetFactory::createWidget (getToolkit(), parent->GetPeer(), OUString::createFromAscii( pName ), nWinAttrbs);
16239 +}
16240 +
16241 +void Window::Enable( bool bEnable )
16242 +{
16243 + if ( !getImpl().mxWindow.is() )
16244 + return;
16245 + getImpl().mxWindow->setEnable( bEnable );
16246 +}
16247 +
16248 +void Window::Show( bool bVisible )
16249 +{
16250 + if ( !getImpl().mxWindow.is() )
16251 + return;
16252 + getImpl().mxWindow->setVisible( bVisible );
16253 + if (GetParent() && bVisible && getImpl().bFirstTimeVisible)
16254 + {
16255 + getImpl().redraw ();
16256 + getImpl().bFirstTimeVisible = false;
16257 + }
16258 +}
16259 +
16260 +void Window::GrabFocus()
16261 +{
16262 + if ( !getImpl().mxWindow.is() )
16263 + return;
16264 + getImpl().mxWindow->setFocus();
16265 +}
16266 +
16267 +void Window::SetUpdateMode(bool mode)
16268 +{
16269 + GetWindow()->SetUpdateMode( mode );
16270 +}
16271 +
16272 +void Window::SetPointer( Pointer const& pointer )
16273 +{
16274 + GetWindow()->SetPointer( pointer );
16275 +}
16276 +
16277 +Pointer const& Window::GetPointer() const
16278 +{
16279 + return GetWindow()->GetPointer();
16280 +}
16281 +
16282 +void Window::SetText( OUString const& str )
16283 +{
16284 + GetWindow()->SetText( str );
16285 +}
16286 +
16287 +String Window::GetText() const
16288 +{
16289 + return GetWindow()->GetText();
16290 +}
16291 +
16292 +sal_Int32 Window::GetCtrlTextWidth (OUString const&) const
16293 +{
16294 + return 0;
16295 +}
16296 +
16297 +sal_Int32 Window::GetTextHeight () const
16298 +{
16299 + return 0;
16300 +}
16301 +
16302 +Size Window::LogicToPixel( Size const& size, MapMode const&) const
16303 +{
16304 + return size;
16305 +}
16306 +
16307 +ControlImpl::ControlImpl (Context *context, const PeerHandle &peer, Window *window)
16308 + : WindowImpl( context, peer, window )
16309 +{
16310 +}
16311 +
16312 +ControlImpl::~ControlImpl ()
16313 +{
16314 + if ((!!mGetFocusHdl || !!mLoseFocusHdl) && mxWindow.is ())
16315 + /* Disposing will be done @ VCLXWindow::dispose () maFocusListeners.disposeAndClear()
16316 + don't do it twice */
16317 + mxWindow.clear ();
16318 +}
16319 +
16320 +void ControlImpl::SetGetFocusHdl (Link const& link)
16321 +{
16322 + if (!mLoseFocusHdl || !link)
16323 + UpdateListening (link);
16324 + mGetFocusHdl = link;
16325 +}
16326 +
16327 +Link& ControlImpl::GetGetFocusHdl ()
16328 +{
16329 + return mGetFocusHdl;
16330 +}
16331 +
16332 +void ControlImpl::SetLoseFocusHdl (Link const& link)
16333 +{
16334 + if (!mGetFocusHdl || !link)
16335 + UpdateListening (link);
16336 + mLoseFocusHdl = link;
16337 +}
16338 +
16339 +Link& ControlImpl::GetLoseFocusHdl ()
16340 +{
16341 + return mGetFocusHdl;
16342 +}
16343 +
16344 +void ControlImpl::UpdateListening (Link const& link)
16345 +{
16346 + if (!link && (!!mGetFocusHdl || !!mLoseFocusHdl)
16347 + && (!mGetFocusHdl || !mLoseFocusHdl))
16348 + mxWindow->removeFocusListener (this);
16349 + else if (!!link && !mGetFocusHdl && !mLoseFocusHdl)
16350 + mxWindow->addFocusListener (this);
16351 +}
16352 +
16353 +void SAL_CALL ControlImpl::disposing (lang::EventObject const&)
16354 + throw (uno::RuntimeException)
16355 +{
16356 +/// mxWindow.clear ();
16357 +}
16358 +
16359 +void SAL_CALL ControlImpl::focusGained (awt::FocusEvent const&)
16360 + throw (uno::RuntimeException)
16361 +{
16362 + mGetFocusHdl.Call (mpWindow);
16363 +}
16364 +
16365 +void SAL_CALL ControlImpl::focusLost (awt::FocusEvent const&)
16366 + throw (uno::RuntimeException)
16367 +{
16368 + mLoseFocusHdl.Call (mpWindow);
16369 +}
16370 +
16371 +Link& Control::GetGetFocusHdl ()
16372 +{
16373 + return getImpl ().GetGetFocusHdl ();
16374 +}
16375 +
16376 +void Control::SetGetFocusHdl (Link const& link)
16377 +{
16378 + if (&getImpl () && getImpl().mxWindow.is ())
16379 + getImpl ().SetGetFocusHdl (link);
16380 +}
16381 +
16382 +Link& Control::GetLoseFocusHdl ()
16383 +{
16384 + return getImpl ().GetLoseFocusHdl ();
16385 +}
16386 +
16387 +void Control::SetLoseFocusHdl (Link const& link)
16388 +{
16389 + if (&getImpl () && getImpl().mxWindow.is ())
16390 + getImpl ().SetLoseFocusHdl (link);
16391 +}
16392 +
16393 +class DialogImpl : public WindowImpl
16394 +{
16395 +public:
16396 + uno::Reference< awt::XDialog2 > mxDialog;
16397 + DialogImpl( Context *context, PeerHandle const &peer, Window *window );
16398 +};
16399 +
16400 +DialogImpl::DialogImpl( Context *context, const PeerHandle &peer, Window *window )
16401 + : WindowImpl( context, peer, window )
16402 + , mxDialog( peer, uno::UNO_QUERY )
16403 +{
16404 +}
16405 +
16406 +Dialog::Dialog( Window *parent, const char *xml_file, const char *id, sal_uInt32 nId )
16407 + : Context( xml_file )
16408 + , Window( new DialogImpl( this, Context::GetPeerHandle( id, nId ), this ) )
16409 + , bConstruct (true)
16410 +{
16411 + if ( parent )
16412 + SetParent( parent );
16413 +}
16414 +
16415 +Dialog::Dialog( ::Window *parent, const char *xml_file, const char *id, sal_uInt32 nId )
16416 + : Context( xml_file )
16417 + , Window( new DialogImpl( this, Context::GetPeerHandle( id, nId ), this ) )
16418 +{
16419 + if ( parent )
16420 + SetParent( parent );
16421 +}
16422 +
16423 +Dialog::~Dialog ()
16424 +{
16425 +}
16426 +
16427 +IMPL_GET_WINDOW (Dialog);
16428 +IMPL_GET_IMPL (Dialog);
16429 +
16430 +#define MX_DIALOG if (getImpl ().mxDialog.is ()) getImpl ().mxDialog
16431 +#define RETURN_MX_DIALOG if (getImpl ().mxDialog.is ()) return getImpl ().mxDialog
16432 +
16433 +short Dialog::Execute()
16434 +{
16435 + RETURN_MX_DIALOG->execute ();
16436 + return -1;
16437 +}
16438 +
16439 +void Dialog::EndDialog( long result )
16440 +{
16441 + MX_DIALOG->endDialog (result);
16442 +}
16443 +
16444 +void Dialog::SetText( OUString const& str )
16445 +{
16446 + SetTitle (str);
16447 +}
16448 +
16449 +void Dialog::SetTitle( OUString const& str )
16450 +{
16451 + MX_DIALOG->setTitle (str);
16452 +}
16453 +
16454 +bool Dialog::Close ()
16455 +{
16456 + EndDialog (false);
16457 + return true;
16458 +}
16459 +
16460 +long Dialog::Notify (NotifyEvent& event)
16461 +{
16462 + return GetDialog ()->Notify (event);
16463 +}
16464 +
16465 +void Dialog::Initialize (SfxChildWinInfo*)
16466 +{
16467 +}
16468 +
16469 +#define MESSAGE_BOX_MEMBER_INIT\
16470 + Dialog (parent, xml_file, id)\
16471 + , imageError (this, "FI_ERROR")\
16472 + , imageInfo (this, "FI_INFO")\
16473 + , imageQuery (this, "FI_QUERY")\
16474 + , imageWarning (this, "FI_WARNING")\
16475 + , messageText (this, "FT_MESSAGE")\
16476 + , cancelButton (this, "BTN_CANCEL")\
16477 + , helpButton (this, "BTN_HELP")\
16478 + , ignoreButton (this, "BTN_IGNORE")\
16479 + , noButton (this, "BTN_NO")\
16480 + , retryButton (this, "BTN_RETRY")\
16481 + , yesButton (this, "BTN_YES")
16482 +
16483 +MessageBox::MessageBox (::Window *parent, char const* message,
16484 + char const* yes, char const* no, sal_uIntPtr help_id,
16485 + char const* xml_file, char const* id)
16486 + : MESSAGE_BOX_MEMBER_INIT
16487 +{
16488 + ignoreButton.Hide ();
16489 + retryButton.Hide ();
16490 + init (message, yes, no, help_id);
16491 +}
16492 +
16493 +MessageBox::MessageBox (::Window *parent, OUString const& message,
16494 + OUString yes, OUString no, sal_uIntPtr help_id,
16495 + char const* xml_file, char const* id)
16496 + : MESSAGE_BOX_MEMBER_INIT
16497 +{
16498 + ignoreButton.Hide ();
16499 + retryButton.Hide ();
16500 + init (message, yes, no, help_id);
16501 +}
16502 +
16503 +#if !defined (__GNUC__)
16504 +#define __PRETTY_FUNCTION__ __FUNCTION__
16505 +#endif /* !__GNUC__ */
16506 +
16507 +MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message,
16508 + char const* yes, char const* no, sal_uIntPtr help_id,
16509 + char const* xml_file, char const* id)
16510 + : MESSAGE_BOX_MEMBER_INIT
16511 +{
16512 + // HIG suggests using verbs instead of yes/no/retry etc.
16513 + // This constructor provides client-code compatibility: Client code should be fixed.
16514 + OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
16515 + bits_init (bits, OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
16516 +}
16517 +
16518 +MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message,
16519 + OUString yes, OUString no, sal_uIntPtr help_id,
16520 + char const* xml_file, char const* id)
16521 + : MESSAGE_BOX_MEMBER_INIT
16522 +{
16523 + // HIG suggests using verbs instead of yes/no/retry etc.
16524 + // This constructor provides client-code compatibility: Client code should be fixed.
16525 + OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
16526 + bits_init (bits, message, yes, no, help_id);
16527 +}
16528 +
16529 +void MessageBox::bits_init (WinBits bits, OUString const& message,
16530 + OUString yes, OUString no, sal_uIntPtr help_id)
16531 +{
16532 + if ( bits & ( WB_OK_CANCEL | WB_OK ))
16533 + yes = Button::GetStandardText ( BUTTON_OK );
16534 + if ( bits & (WB_YES_NO | WB_YES_NO_CANCEL ))
16535 + {
16536 + yes = Button::GetStandardText ( BUTTON_YES );
16537 + no = Button::GetStandardText ( BUTTON_NO );
16538 + }
16539 + if (! (bits & (WB_RETRY_CANCEL | WB_YES_NO_CANCEL | WB_ABORT_RETRY_IGNORE )))
16540 + cancelButton.Hide ();
16541 + if (! (bits & (WB_RETRY_CANCEL | WB_ABORT_RETRY_IGNORE)))
16542 + retryButton.Hide ();
16543 + if ( bits & WB_ABORT_RETRY_IGNORE )
16544 + cancelButton.SetText ( Button::GetStandardText (BUTTON_ABORT));
16545 + else
16546 + ignoreButton.Hide ();
16547 + if ( !(bits & ( WB_OK | WB_OK_CANCEL | WB_YES_NO | WB_YES_NO_CANCEL)))
16548 + yesButton.Hide ();
16549 + if ( !(bits & ( WB_YES_NO | WB_YES_NO_CANCEL)))
16550 + noButton.Hide ();
16551 +
16552 + init (message, yes, no, help_id);
16553 +}
16554 +
16555 +void MessageBox::init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id)
16556 +{
16557 + init ( OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
16558 +}
16559 +
16560 +void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, sal_uIntPtr help_id)
16561 +{
16562 + imageError.Hide ();
16563 + imageInfo.Hide ();
16564 + imageQuery.Hide ();
16565 + imageWarning.Hide ();
16566 + if (message.getLength ())
16567 + messageText.SetText (message);
16568 + if (yes.getLength ())
16569 + {
16570 + yesButton.SetText (yes);
16571 + if (yes != OUString (Button::GetStandardText (BUTTON_OK))
16572 + && yes != OUString (Button::GetStandardText (BUTTON_YES)))
16573 + SetTitle (yes);
16574 + if (no.getLength ())
16575 + noButton.SetText (no);
16576 + else
16577 + noButton.Hide ();
16578 + }
16579 + if (help_id)
16580 + SetHelpId (help_id);
16581 + else
16582 + helpButton.Hide ();
16583 +}
16584 +
16585 +#undef MESSAGE_BOX_IMPL
16586 +#define MESSAGE_BOX_IMPL(Name)\
16587 + Name##Box::Name##Box (::Window *parent, char const* message,\
16588 + char const* yes, char const* no, sal_uIntPtr help_id,\
16589 + char const* xml_file, char const* id)\
16590 + : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
16591 + {\
16592 + image##Name.Show ();\
16593 + }\
16594 + Name##Box::Name##Box (::Window *parent, OUString const& message,\
16595 + OUString yes, OUString no, sal_uIntPtr help_id,\
16596 + char const* xml_file, char const* id)\
16597 + : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
16598 + {\
16599 + image##Name.Show ();\
16600 + }\
16601 + Name##Box::Name##Box (::Window *parent, WinBits bits, char const* message,\
16602 + char const* yes, char const* no, sal_uIntPtr help_id,\
16603 + char const* xml_file, char const* id)\
16604 + : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
16605 + {\
16606 + image##Name.Show ();\
16607 + }\
16608 + Name##Box::Name##Box (::Window *parent, WinBits bits, OUString const& message,\
16609 + OUString yes, OUString no, sal_uIntPtr help_id,\
16610 + char const* xml_file, char const* id)\
16611 + : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
16612 + {\
16613 + image##Name.Show ();\
16614 + }
16615 +
16616 +MESSAGE_BOX_IMPL (Error);
16617 +MESSAGE_BOX_IMPL (Info);
16618 +MESSAGE_BOX_IMPL (Query);
16619 +MESSAGE_BOX_IMPL (Warning);
16620 +
16621 +class TabControlImpl
16622 + : public ControlImpl
16623 + , public ::cppu::WeakImplHelper1 <awt::XTabListener>
16624 +{
16625 + Link mActivatePageHdl;
16626 + Link mDeactivatePageHdl;
16627 +
16628 +public:
16629 + uno::Reference <awt::XSimpleTabController> mxTabControl;
16630 + TabControlImpl (Context *context, const PeerHandle &peer, Window *window)
16631 + : ControlImpl (context, peer, window)
16632 + , mxTabControl (peer, uno::UNO_QUERY)
16633 + {
16634 + }
16635 +
16636 + virtual void SAL_CALL disposing (lang::EventObject const& e)
16637 + throw (uno::RuntimeException)
16638 + {
16639 + ControlImpl::disposing (e);
16640 + mxTabControl.clear ();
16641 + }
16642 +
16643 + Link& GetActivatePageHdl ()
16644 + {
16645 + return mActivatePageHdl;
16646 + }
16647 +
16648 + void SetActivatePageHdl (Link const& link)
16649 + {
16650 + if (!mDeactivatePageHdl || !link)
16651 + UpdateListening (link);
16652 + mActivatePageHdl = link;
16653 + }
16654 +
16655 + Link& GetDeactivatePageHdl ()
16656 + {
16657 + return mDeactivatePageHdl;
16658 + }
16659 +
16660 + void SetDeactivatePageHdl (Link const& link)
16661 + {
16662 + if (!mActivatePageHdl || !link)
16663 + UpdateListening (link);
16664 + mDeactivatePageHdl = link;
16665 + }
16666 +
16667 + void UpdateListening (Link const& link)
16668 + {
16669 + if (!link && (!!mActivatePageHdl || !!mDeactivatePageHdl))
16670 + mxTabControl->removeTabListener (this);
16671 + else if (!!link && !mActivatePageHdl && !mDeactivatePageHdl)
16672 + mxTabControl->addTabListener (this);
16673 + }
16674 +
16675 + void SAL_CALL activated (sal_Int32)
16676 + throw (uno::RuntimeException)
16677 + {
16678 + mActivatePageHdl.Call (mpWindow);
16679 + }
16680 +
16681 + void SAL_CALL deactivated (sal_Int32)
16682 + throw (uno::RuntimeException)
16683 + {
16684 + mDeactivatePageHdl.Call (mpWindow);
16685 + }
16686 +
16687 + void SAL_CALL inserted (sal_Int32)
16688 + throw (uno::RuntimeException)
16689 + {
16690 + }
16691 +
16692 + void SAL_CALL removed (sal_Int32)
16693 + throw (uno::RuntimeException)
16694 + {
16695 + }
16696 +
16697 + void SAL_CALL changed (sal_Int32, uno::Sequence <beans::NamedValue> const&)
16698 + throw (uno::RuntimeException)
16699 + {
16700 + }
16701 +};
16702 +
16703 +IMPL_GET_WINDOW (TabControl);
16704 +IMPL_GET_LAYOUT_VCLXWINDOW (TabControl);
16705 +
16706 +#define MX_TABCONTROL if (getImpl ().mxTabControl.is ()) getImpl ().mxTabControl
16707 +#define RETURN_MX_TABCONTROL if (getImpl ().mxTabControl.is ()) return getImpl ().mxTabControl
16708 +
16709 +TabControl::~TabControl ()
16710 +{
16711 + SetActivatePageHdl (Link ());
16712 + SetDeactivatePageHdl (Link ());
16713 +}
16714 +
16715 +void TabControl::InsertPage (sal_uInt16 id, OUString const& title, sal_uInt16 pos)
16716 +{
16717 + (void) pos;
16718 +// GetTabControl ()->InsertPage (id, title, pos);
16719 +// GetTabControl ()->SetTabPage (id, new ::TabPage (GetTabControl ()));
16720 +
16721 + MX_TABCONTROL->insertTab ();
16722 + SetCurPageId (id);
16723 +
16724 +#if 1 // colour me loc productive -- NOT
16725 +#define ADD_PROP( seq, i, name, val )\
16726 + { \
16727 + beans::NamedValue value; \
16728 + value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
16729 + value.Value = uno::makeAny( val ); \
16730 + seq[i] = value; \
16731 + }
16732 +
16733 + uno::Sequence< beans::NamedValue > seq (1);
16734 + ADD_PROP ( seq, 0, "Title", OUString (title) );
16735 + MX_TABCONTROL->setTabProps (id, seq);
16736 +#else
16737 + GetTabPage (id)->SetText (title);
16738 +#endif
16739 +
16740 +#if 0
16741 + /// This so seems the right solution, but it makes the buttons of the
16742 + /// tabdialog move up
16743 +
16744 + ::TabPage *page = GetTabPage (id);
16745 + if (Window *w = dynamic_cast <Window*> (page))
16746 + {
16747 + w->SetParent (this);
16748 + //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16749 + //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16750 + //GetVCLXTabControl ()->AddChild (w);
16751 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16752 + //uno::Reference <uno::XInterface> x (page->GetWindowPeer());
16753 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->::Window::GetWindowPeer (), uno::UNO_QUERY));
16754 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
16755 + }
16756 + getImpl ().redraw ();
16757 +#endif
16758 +}
16759 +void TabControl::RemovePage (sal_uInt16 id)
16760 +{
16761 + GetTabControl ()->RemovePage (id);
16762 +}
16763 +sal_uInt16 TabControl::GetPageCount () const
16764 +{
16765 + return GetTabControl ()->GetPageCount ();
16766 +}
16767 +sal_uInt16 TabControl::GetPageId (sal_uInt16 pos) const
16768 +{
16769 + return GetTabControl ()->GetPageId (pos);
16770 +}
16771 +sal_uInt16 TabControl::GetPagePos (sal_uInt16 id) const
16772 +{
16773 + getImpl ().redraw ();
16774 + return GetTabControl ()->GetPagePos (id);
16775 +}
16776 +void TabControl::SetCurPageId (sal_uInt16 id)
16777 +{
16778 + getImpl ().redraw ();
16779 + GetTabControl ()->SetCurPageId (id);
16780 +}
16781 +sal_uInt16 TabControl::GetCurPageId () const
16782 +{
16783 + return GetTabControl ()->GetCurPageId ();
16784 +}
16785 +void TabControl::SetTabPage (sal_uInt16 id, ::TabPage* page)
16786 +{
16787 + GetTabControl ()->SetTabPage (id, page);
16788 +
16789 +#if 0
16790 + /// This so seems the right solution, but it makes the buttons of the
16791 + /// tabdialog move up
16792 + if (Window *w = dynamic_cast <Window*> (page))
16793 + {
16794 + w->SetParent (this);
16795 + //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16796 + //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16797 + //GetVCLXTabControl ()->AddChild (w);
16798 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
16799 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetWindowPeer (), uno::UNO_QUERY));
16800 + //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
16801 + }
16802 +#endif
16803 + getImpl ().redraw ();
16804 +}
16805 +::TabPage* TabControl::GetTabPage (sal_uInt16 id) const
16806 +{
16807 + return GetTabControl ()->GetTabPage (id);
16808 +}
16809 +void TabControl::SetActivatePageHdl (Link const& link)
16810 +{
16811 + if (&getImpl () && getImpl().mxTabControl.is ())
16812 + getImpl ().SetActivatePageHdl (link);
16813 +}
16814 +Link& TabControl::GetActivatePageHdl () const
16815 +{
16816 + return getImpl ().GetActivatePageHdl ();
16817 +}
16818 +void TabControl::SetDeactivatePageHdl (Link const& link)
16819 +{
16820 + if (&getImpl () && getImpl().mxTabControl.is ())
16821 + getImpl ().SetDeactivatePageHdl (link);
16822 +}
16823 +Link& TabControl::GetDeactivatePageHdl () const
16824 +{
16825 + return getImpl ().GetDeactivatePageHdl ();
16826 +}
16827 +void TabControl::SetTabPageSizePixel (Size const& size)
16828 +{
16829 + GetTabControl ()->SetTabPageSizePixel (size);
16830 +// GetParent()->SetSizePixel (size);
16831 +// GetWindow()->SetSizePixel (size);
16832 + //GetVCLXTabControl->SetTabSize (size);
16833 +}
16834 +Size TabControl::GetTabPageSizePixel () const
16835 +{
16836 +#if 0
16837 + //return GetTabControl ()->GetTabPageSizePixel ();
16838 + static size_t const tab_page_first_index = 1;
16839 + for (size_t i = 0; i < GetPageCount (); i++)
16840 + {
16841 + ::TabPage *p = GetTabPage (i + tab_page_first_index);
16842 + //if (dynamic_cast<Windowt*> (p))
16843 + if (i) // URG
16844 + return p->GetOptimalSize (WINDOWSIZE_MINIMUM);
16845 + }
16846 +#endif
16847 + return GetTabControl ()->GetTabPageSizePixel ();
16848 +}
16849 +
16850 +IMPL_CONSTRUCTORS (TabControl, Control, "tabcontrol");
16851 +IMPL_GET_IMPL (TabControl);
16852 +
16853 +class TabPageImpl : public WindowImpl
16854 +{
16855 +public:
16856 + uno::Reference< awt::XWindow > mxTabPage;
16857 + TabPageImpl( Context *context, const PeerHandle &peer, Window *window )
16858 + : WindowImpl( context, peer, window )
16859 + , mxTabPage( peer, uno::UNO_QUERY )
16860 + {
16861 + }
16862 +};
16863 +
16864 +::Window* TabPage::global_parent = 0;
16865 +TabControl* TabPage::global_tabcontrol = 0;
16866 +
16867 +IMPL_GET_IMPL( TabPage );
16868 +
16869 +TabPage::TabPage( Window *parent, const char *xml_file, const char *id, sal_uInt32 nId)
16870 + : Context( xml_file )
16871 + , Window( new TabPageImpl( this, Context::GetPeerHandle( id, nId ), this ) )
16872 +{
16873 + if ( parent )
16874 + SetParent( parent );
16875 +}
16876 +
16877 +TabPage::TabPage( ::Window *parent, const char *xml_file, const char *id, sal_uInt32 nId)
16878 + : Context( xml_file )
16879 + , Window( new TabPageImpl( this, Context::GetPeerHandle( id, nId ), this ) )
16880 +{
16881 + if ( parent )
16882 + SetParent( parent );
16883 +}
16884 +
16885 +TabPage::~TabPage()
16886 +{
16887 + delete GetTabPage();
16888 +}
16889 +
16890 +IMPL_GET_WINDOW( TabPage );
16891 +
16892 +void TabPage::ActivatePage()
16893 +{
16894 +}
16895 +
16896 +void TabPage::DeactivatePage()
16897 +{
16898 +}
16899 +
16900 +class FixedLineImpl : public ControlImpl
16901 +{
16902 +public:
16903 + FixedLineImpl( Context *context, const PeerHandle &peer, Window *window )
16904 + : ControlImpl( context, peer, window )
16905 + {
16906 + }
16907 +};
16908 +
16909 +IMPL_CONSTRUCTORS( FixedLine, Control, "hfixedline" );
16910 +IMPL_GET_IMPL( FixedLine );
16911 +
16912 +bool FixedLine::IsEnabled()
16913 +{
16914 + //FIXME
16915 + return true;
16916 +}
16917 +
16918 +class FixedTextImpl : public ControlImpl
16919 +{
16920 +public:
16921 + uno::Reference< awt::XFixedText > mxFixedText;
16922 + FixedTextImpl( Context *context, const PeerHandle &peer, Window *window )
16923 + : ControlImpl( context, peer, window )
16924 + , mxFixedText( peer, uno::UNO_QUERY )
16925 + {
16926 + }
16927 +
16928 + ~FixedTextImpl ();
16929 +
16930 + virtual void SAL_CALL disposing( lang::EventObject const& e )
16931 + throw (uno::RuntimeException);
16932 +};
16933 +
16934 +FixedTextImpl::~FixedTextImpl ()
16935 +{
16936 +}
16937 +
16938 +void SAL_CALL FixedTextImpl::disposing( lang::EventObject const& e )
16939 + throw (uno::RuntimeException)
16940 +{
16941 + ControlImpl::disposing (e);
16942 + mxFixedText.clear ();
16943 +}
16944 +
16945 +FixedText::~FixedText ()
16946 +{
16947 +}
16948 +
16949 +IMPL_CONSTRUCTORS( FixedText, Control, "fixedtext" );
16950 +IMPL_GET_IMPL( FixedText );
16951 +
16952 +void FixedText::SetText( OUString const& rStr )
16953 +{
16954 + if ( !getImpl().mxFixedText.is() )
16955 + return;
16956 + getImpl().mxFixedText->setText( rStr );
16957 +}
16958 +
16959 +class FixedInfoImpl : public FixedTextImpl
16960 +{
16961 +public:
16962 + FixedInfoImpl( Context *context, const PeerHandle &peer, Window *window )
16963 + : FixedTextImpl( context, peer, window )
16964 + {
16965 + }
16966 +};
16967 +
16968 +IMPL_CONSTRUCTORS( FixedInfo, FixedText, "fixedinfo" );
16969 +IMPL_GET_IMPL( FixedInfo );
16970 +
16971 +class ProgressBarImpl : public ControlImpl
16972 +{
16973 +public:
16974 + uno::Reference< awt::XProgressBar > mxProgressBar;
16975 + ProgressBarImpl( Context *context, const PeerHandle &peer, Window *window )
16976 + : ControlImpl( context, peer, window )
16977 + , mxProgressBar( peer, uno::UNO_QUERY )
16978 + {
16979 + }
16980 +
16981 + virtual void SAL_CALL disposing( lang::EventObject const& e )
16982 + throw (uno::RuntimeException)
16983 + {
16984 + ControlImpl::disposing (e);
16985 + mxProgressBar.clear ();
16986 + }
16987 +};
16988 +
16989 +
16990 +class FixedImageImpl: public ControlImpl
16991 +{
16992 +public:
16993 + uno::Reference< graphic::XGraphic > mxGraphic;
16994 + FixedImageImpl( Context *context, const PeerHandle &peer, Window *window)
16995 +// const char *pName )
16996 + : ControlImpl( context, peer, window )
16997 + //, mxGraphic( layoutimpl::loadGraphic( pName ) )
16998 + , mxGraphic( peer, uno::UNO_QUERY )
16999 + {
17000 + if ( !mxGraphic.is() )
17001 + {
17002 + DBG_ERROR( "ERROR: failed to load image: `%s'" /*, pName*/ );
17003 + }
17004 +#if 0
17005 + else
17006 + getImpl().mxGraphic->...();
17007 +#endif
17008 + }
17009 +};
17010 +
17011 +IMPL_CONSTRUCTORS( FixedImage, Control, "fixedimage" );
17012 +IMPL_GET_IMPL( FixedImage )
17013 +
17014 +void FixedImage::setImage( ::Image const& i )
17015 +{
17016 + (void) i;
17017 + if ( !getImpl().mxGraphic.is() )
17018 + return;
17019 + //FIXME: hack moved to proplist
17020 + //getImpl().mxGraphic =
17021 +}
17022 +
17023 +#if 0
17024 +
17025 +FixedImage::FixedImage( const char *pName )
17026 + : pImpl( new FixedImageImpl( pName ) )
17027 +{
17028 +}
17029 +
17030 +FixedImage::~FixedImage()
17031 +{
17032 + delete pImpl;
17033 +}
17034 +
17035 +#endif
17036 +
17037 +
17038 +IMPL_CONSTRUCTORS( ProgressBar, Control, "ProgressBar" );
17039 +IMPL_GET_IMPL( ProgressBar );
17040 +
17041 +void ProgressBar::SetForegroundColor( util::Color color )
17042 +{
17043 + if ( !getImpl().mxProgressBar.is() )
17044 + return;
17045 + getImpl().mxProgressBar->setForegroundColor( color );
17046 +}
17047 +
17048 +void ProgressBar::SetBackgroundColor( util::Color color )
17049 +{
17050 + if ( !getImpl().mxProgressBar.is() )
17051 + return;
17052 + getImpl().mxProgressBar->setBackgroundColor( color );
17053 +}
17054 +
17055 +void ProgressBar::SetValue( sal_Int32 i )
17056 +{
17057 + if ( !getImpl().mxProgressBar.is() )
17058 + return;
17059 + getImpl().mxProgressBar->setValue( i );
17060 +}
17061 +
17062 +void ProgressBar::SetRange( sal_Int32 min, sal_Int32 max )
17063 +{
17064 + if ( !getImpl().mxProgressBar.is() )
17065 + return;
17066 + getImpl().mxProgressBar->setRange( min, max );
17067 +}
17068 +
17069 +sal_Int32 ProgressBar::GetValue()
17070 +{
17071 + if ( !getImpl().mxProgressBar.is() )
17072 + return 0;
17073 + return getImpl().mxProgressBar->getValue();
17074 +}
17075 +
17076 +class PluginImpl: public ControlImpl
17077 +{
17078 +public:
17079 + ::Control *mpPlugin;
17080 +
17081 + PluginImpl( Context *context, const PeerHandle &peer, Window *window, :: Control *plugin )
17082 + : ControlImpl( context, peer, window )
17083 + , mpPlugin( plugin )
17084 + {
17085 + uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
17086 + layoutimpl::VCLXPlugin *vcl
17087 + = static_cast<layoutimpl::VCLXPlugin*>( VCLXWindow::GetImplementation( ref ) );
17088 + ::Window *parent = vcl->mpWindow->GetParent();
17089 + vcl->SetWindow( plugin );
17090 + vcl->SetPlugin( mpPlugin );
17091 + plugin->SetParent( parent );
17092 + plugin->SetStyle( vcl->mStyle );
17093 + plugin->SetCreatedWithToolkit( true );
17094 + plugin->SetComponentInterface( vcl );
17095 + plugin->Show();
17096 + }
17097 +};
17098 +
17099 +Plugin::Plugin( Context *context, char const *id, ::Control *plugin )
17100 + : Control( new PluginImpl( context, context->GetPeerHandle( id, 0 ), this, plugin ) )
17101 + , mpPlugin( plugin )
17102 +{
17103 +}
17104 +
17105 +IMPL_GET_IMPL( Plugin );
17106 +
17107 +class LocalizedStringImpl : public WindowImpl
17108 +{
17109 +public:
17110 + layoutimpl::LocalizedString *mpString;
17111 + LocalizedStringImpl( Context *context, const PeerHandle &peer, Window *window )
17112 + : WindowImpl( context, peer, window )
17113 + , mpString( static_cast<layoutimpl::LocalizedString*>( VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( mxWindow, uno::UNO_QUERY ) ) ) )
17114 + {
17115 + }
17116 + OUString getText()
17117 + {
17118 + if ( mpString )
17119 + return mpString->getText();
17120 + return OUString();
17121 + }
17122 + void setText( OUString const& s )
17123 + {
17124 + if ( mpString )
17125 + mpString->setText( s );
17126 + }
17127 +};
17128 +
17129 +IMPL_GET_IMPL( LocalizedString );
17130 +
17131 +LocalizedString::LocalizedString( Context *context, char const* id )
17132 + : Window( new LocalizedStringImpl( context, context->GetPeerHandle( id, 0 ), this ) )
17133 +{
17134 +}
17135 +
17136 +String LocalizedString::getString ()
17137 +{
17138 + return getImpl ().getText ();
17139 +}
17140 +
17141 +OUString LocalizedString::getOUString ()
17142 +{
17143 + return getImpl ().getText ();
17144 +}
17145 +
17146 +LocalizedString::operator OUString ()
17147 +{
17148 + return getOUString ();
17149 +}
17150 +
17151 +OUString LocalizedString::GetToken (sal_uInt32 i, sal_Char c)
17152 +{
17153 + return getString ().GetToken (i, c);
17154 +}
17155 +
17156 +OUString LocalizedString::operator= (OUString const& s)
17157 +{
17158 + getImpl().setText( s );
17159 + return getImpl().getText();
17160 +}
17161 +
17162 +OUString LocalizedString::operator+= (OUString const& b)
17163 +{
17164 + OUString a = getImpl ().getText ();
17165 + a += b;
17166 + getImpl ().setText (a);
17167 + return getImpl ().getText ();
17168 +}
17169 +
17170 +OUString LocalizedString::operator+= (sal_Unicode const b)
17171 +{
17172 + String a = getImpl ().getText ();
17173 + a += b;
17174 + getImpl ().setText (a);
17175 + return getImpl ().getText ();
17176 +}
17177 +
17178 +class InPlugImpl : public WindowImpl
17179 +{
17180 +public:
17181 + InPlugImpl (Context *context, const PeerHandle &peer, Window *window)
17182 + : WindowImpl (context, peer, window)
17183 + {
17184 + }
17185 +};
17186 +
17187 +IMPL_GET_IMPL (InPlug);
17188 +
17189 +static char const *FIXME_set_parent (::Window *parent, char const *xml_file)
17190 +{
17191 + layout::TabPage::global_parent = parent;
17192 + return xml_file;
17193 +}
17194 +
17195 +InPlug::InPlug (Window *parent, char const* xml_file, char const* id, sal_uInt32 nId)
17196 + : Context (FIXME_set_parent (parent ? parent->GetWindow () : 0, xml_file))
17197 + , layout::Window (new InPlugImpl (this, Context::GetPeerHandle (id, nId), this))
17198 +{
17199 + if (parent)
17200 + SetParent (parent);
17201 + if (::Window *w = dynamic_cast< ::Window* > (this))
17202 + w->SetComponentInterface (GetVCLXWindow ());
17203 +}
17204 +
17205 +InPlug::InPlug (::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId)
17206 + : Context (FIXME_set_parent (parent, xml_file))
17207 + , layout::Window (new InPlugImpl (this, Context::GetPeerHandle (id, nId), this))
17208 +{
17209 + if (parent)
17210 + layout::Window::SetParent (parent);
17211 + if (::Window *w = dynamic_cast< ::Window* > (this))
17212 + w->SetComponentInterface (GetVCLXWindow ());
17213 +}
17214 +
17215 +void InPlug::ParentSet (Window *window)
17216 +{
17217 + window->SetParent (dynamic_cast< ::Window* > (this));
17218 +
17219 + /// FIXME: for standalone run of layout::SfxTabDialog
17220 + SetParent (window->GetParent ());
17221 +}
17222 +
17223 +} // namespace layout
17224 --- toolkit/source/layout/vcl/wrapper.hxx.old 1970-01-01 00:00:00.000000000 +0000
17225 +++ toolkit/source/layout/vcl/wrapper.hxx 2009-04-06 16:42:13.000000000 +0000
17226 @@ -0,0 +1,142 @@
17227 +/*************************************************************************
17228 + *
17229 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17230 + *
17231 + * Copyright 2008 by Sun Microsystems, Inc.
17232 + *
17233 + * OpenOffice.org - a multi-platform office productivity suite
17234 + *
17235 + * $RCSfile$
17236 + *
17237 + * $Revision$
17238 + *
17239 + * This file is part of OpenOffice.org.
17240 + *
17241 + * OpenOffice.org is free software: you can redistribute it and/or modify
17242 + * it under the terms of the GNU Lesser General Public License version 3
17243 + * only, as published by the Free Software Foundation.
17244 + *
17245 + * OpenOffice.org is distributed in the hope that it will be useful,
17246 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
17247 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17248 + * GNU Lesser General Public License version 3 for more details
17249 + * (a copy is included in the LICENSE file that accompanied this code).
17250 + *
17251 + * You should have received a copy of the GNU Lesser General Public License
17252 + * version 3 along with OpenOffice.org. If not, see
17253 + * <http://www.openoffice.org/license.html>
17254 + * for a copy of the LGPLv3 License.
17255 + *
17256 + ************************************************************************/
17257 +
17258 +#ifndef LAYOUT_VCL_WRAPPER_HXX
17259 +#define LAYOUT_VCL_WRAPPER_HXX
17260 +
17261 +#include <layout/layout.hxx>
17262 +#include <com/sun/star/uno/Reference.hxx>
17263 +#include <com/sun/star/awt/XDialog2.hpp>
17264 +#include <com/sun/star/awt/XFocusListener.hpp>
17265 +#include <com/sun/star/awt/XWindow.hpp>
17266 +#include <com/sun/star/awt/XVclWindowPeer.hpp>
17267 +#include <cppuhelper/implbase1.hxx>
17268 +
17269 +#include <cstring>
17270 +
17271 +namespace layout
17272 +{
17273 +
17274 +namespace css = com::sun::star;
17275 +
17276 +class WindowImpl
17277 +{
17278 +public:
17279 + Window *mpWindow;
17280 + Context *mpCtx;
17281 + css::uno::Reference< css::awt::XWindow > mxWindow;
17282 + css::uno::Reference< css::awt::XVclWindowPeer > mxVclPeer;
17283 + ::Window *mvclWindow;
17284 + bool bFirstTimeVisible;
17285 +
17286 + WindowImpl (Context *context, PeerHandle const &peer, Window *window);
17287 + virtual ~WindowImpl ();
17288 +
17289 + void wrapperGone();
17290 + css::uno::Any getProperty (char const *name);
17291 + void setProperty (char const *name, css::uno::Any any);
17292 + void redraw (bool resize=false);
17293 +
17294 + // XFocusListener
17295 + virtual void SAL_CALL disposing (css::lang::EventObject const&) throw (css::uno::RuntimeException);
17296 +};
17297 +
17298 +class ControlImpl : public WindowImpl
17299 + , public ::cppu::WeakImplHelper1 <css::awt::XFocusListener>
17300 +{
17301 +public:
17302 + Link mGetFocusHdl;
17303 + Link mLoseFocusHdl;
17304 +
17305 + ControlImpl( Context *context, PeerHandle const& peer, Window *window );
17306 + ~ControlImpl ();
17307 +
17308 + virtual void SetGetFocusHdl (Link const& link);
17309 + Link& GetGetFocusHdl ();
17310 + virtual void SetLoseFocusHdl (Link const& link);
17311 + Link& GetLoseFocusHdl ();
17312 + virtual void UpdateListening (Link const& link);
17313 +
17314 + // XFocusListener
17315 + virtual void SAL_CALL disposing (css::lang::EventObject const&) throw (css::uno::RuntimeException);
17316 + void SAL_CALL focusGained (css::awt::FocusEvent const& e) throw (css::uno::RuntimeException);
17317 + void SAL_CALL focusLost (css::awt::FocusEvent const& e) throw (css::uno::RuntimeException);
17318 +};
17319 +
17320 +inline WindowImpl &Window::getImpl() const{ return *(static_cast< WindowImpl * >( mpImpl )); }
17321 +
17322 +// Helpers for defining boiler-plate constructors ...
17323 +// Could in-line in top-level but not with safe static_casts.
17324 +#define IMPL_GET_IMPL(t) \
17325 + inline t##Impl &t::getImpl() const \
17326 + { \
17327 + return *(static_cast<t##Impl *>(mpImpl)); \
17328 + }
17329 +#define IMPL_CONSTRUCTORS_BODY(t,par,unoName,body) \
17330 + t::t( Context *context, const char *pId, sal_uInt32 nId ) \
17331 + : par( new t##Impl( context, context->GetPeerHandle( pId, nId ), this ) ) \
17332 + { \
17333 + Window *parent = dynamic_cast<Window*> (context);\
17334 + body;\
17335 + if (parent)\
17336 + SetParent (parent);\
17337 + } \
17338 + t::t( Window *parent, WinBits bits) \
17339 + : par( new t##Impl( parent->getContext(), Window::CreatePeer( parent, bits, unoName ), this ) ) \
17340 + { \
17341 + body;\
17342 + if ( parent )\
17343 + SetParent (parent);\
17344 + } \
17345 + t::t( Window *parent, ResId const& res) \
17346 + : par( new t##Impl( parent->getContext(), Window::CreatePeer( parent, 0, unoName ), this ) ) \
17347 + { \
17348 + body;\
17349 + setRes (res);\
17350 + if (parent)\
17351 + SetParent (parent);\
17352 + }
17353 +#define IMPL_CONSTRUCTORS(t,par,unoName) IMPL_CONSTRUCTORS_BODY(t, par, unoName, )
17354 +#define IMPL_CONSTRUCTORS_2(t,win_par,other_par,unoName) \
17355 + t::t( Context *context, const char *pId, sal_uInt32 nId ) \
17356 + : win_par( new t##Impl( context, context->GetPeerHandle( pId, nId ), this ) ) \
17357 + , other_par( new other_par##Impl( Window::GetPeer() ) ) \
17358 + { \
17359 + } \
17360 + t::t( Window *parent, WinBits bits) \
17361 + : win_par( new t##Impl( parent->getContext(), Window::CreatePeer( parent, bits, unoName ), this ) ) \
17362 + , other_par( new other_par##Impl( Window::GetPeer() ) ) \
17363 + { \
17364 + }
17365 +
17366 +} // namespace layout
17367 +
17368 +#endif /* LAYOUT_VCL_WRAPPER_HXX */
17369 --- toolkit/source/vclcompat/makefile.mk.old 2009-04-02 10:49:35.000000000 +0000
17370 +++ toolkit/source/vclcompat/makefile.mk 1970-01-01 00:00:00.000000000 +0000
17371 @@ -1,55 +0,0 @@
17372 -#*************************************************************************
17373 -#
17374 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17375 -#
17376 -# Copyright 2008 by Sun Microsystems, Inc.
17377 -#
17378 -# OpenOffice.org - a multi-platform office productivity suite
17379 -#
17380 -# $RCSfile: makefile.mk,v $
17381 -#
17382 -# $Revision: 1.3 $
17383 -#
17384 -# This file is part of OpenOffice.org.
17385 -#
17386 -# OpenOffice.org is free software: you can redistribute it and/or modify
17387 -# it under the terms of the GNU Lesser General Public License version 3
17388 -# only, as published by the Free Software Foundation.
17389 -#
17390 -# OpenOffice.org is distributed in the hope that it will be useful,
17391 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
17392 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17393 -# GNU Lesser General Public License version 3 for more details
17394 -# (a copy is included in the LICENSE file that accompanied this code).
17395 -#
17396 -# You should have received a copy of the GNU Lesser General Public License
17397 -# version 3 along with OpenOffice.org. If not, see
17398 -# <http://www.openoffice.org/license.html>
17399 -# for a copy of the LGPLv3 License.
17400 -#
17401 -#*************************************************************************
17402 -
17403 -PRJ=..$/..
17404 -PRJNAME=toolkit
17405 -TARGET=vclcompat
17406 -ENABLE_EXCEPTIONS=true
17407 -
17408 -# --- Settings -----------------------------------------------------
17409 -
17410 -.INCLUDE : settings.mk
17411 -.INCLUDE : $(PRJ)$/util$/makefile.pmk
17412 -
17413 -# --- Files --------------------------------------------------------
17414 -
17415 -# FIXME: This is bad, hmkay
17416 -CFLAGS+= -I$(PRJ)/source
17417 -
17418 -SLOFILES= \
17419 - $(SLO)$/wrapper.obj \
17420 - $(SLO)$/wbutton.obj \
17421 - $(SLO)$/wcontainer.obj \
17422 - $(SLO)$/wfield.obj
17423 -
17424 -# --- Targets ------------------------------------------------------
17425 -
17426 -.INCLUDE : target.mk
17427 --- toolkit/source/vclcompat/wbutton.cxx.old 2009-04-06 16:42:11.000000000 +0000
17428 +++ toolkit/source/vclcompat/wbutton.cxx 1970-01-01 00:00:00.000000000 +0000
17429 @@ -1,582 +0,0 @@
17430 -/*************************************************************************
17431 - *
17432 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17433 - *
17434 - * Copyright 2008 by Sun Microsystems, Inc.
17435 - *
17436 - * OpenOffice.org - a multi-platform office productivity suite
17437 - *
17438 - * $RCSfile: wbutton.cxx,v $
17439 - *
17440 - * $Revision: 1.3 $
17441 - *
17442 - * This file is part of OpenOffice.org.
17443 - *
17444 - * OpenOffice.org is free software: you can redistribute it and/or modify
17445 - * it under the terms of the GNU Lesser General Public License version 3
17446 - * only, as published by the Free Software Foundation.
17447 - *
17448 - * OpenOffice.org is distributed in the hope that it will be useful,
17449 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
17450 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17451 - * GNU Lesser General Public License version 3 for more details
17452 - * (a copy is included in the LICENSE file that accompanied this code).
17453 - *
17454 - * You should have received a copy of the GNU Lesser General Public License
17455 - * version 3 along with OpenOffice.org. If not, see
17456 - * <http://www.openoffice.org/license.html>
17457 - * for a copy of the LGPLv3 License.
17458 - *
17459 - ************************************************************************/
17460 -
17461 -#include "wrapper.hxx"
17462 -
17463 -#include <com/sun/star/awt/PosSize.hpp>
17464 -#include <com/sun/star/awt/XActionListener.hpp>
17465 -#include <com/sun/star/awt/XButton.hpp>
17466 -#include <com/sun/star/awt/XCheckBox.hpp>
17467 -#include <com/sun/star/awt/XRadioButton.hpp>
17468 -#include <com/sun/star/graphic/XGraphic.hpp>
17469 -#include <cppuhelper/implbase1.hxx>
17470 -#include <toolkit/awt/vclxwindow.hxx>
17471 -#include <toolkit/helper/convert.hxx>
17472 -#include <vcl/button.hxx>
17473 -#include <vcl/event.hxx>
17474 -#include <vcl/msgbox.hxx>
17475 -#include <vcl/svapp.hxx>
17476 -#include <vcl/window.hxx>
17477 -
17478 -#include <list>
17479 -
17480 -#include "layout/layoutcore.hxx"
17481 -
17482 -using namespace ::com::sun::star;
17483 -
17484 -namespace layout
17485 -{
17486 -
17487 -class ImageImpl
17488 -{
17489 - public:
17490 - css::uno::Reference< css::graphic::XGraphic > mxGraphic;
17491 - ImageImpl( const char *pName )
17492 - : mxGraphic( layoutimpl::loadGraphic( pName ) )
17493 - {
17494 - if ( !mxGraphic.is() )
17495 - {
17496 - DBG_ERROR1( "ERROR: failed to load image: `%s'\n", pName );
17497 - }
17498 - }
17499 -};
17500 -
17501 -Image::Image( const char *pName )
17502 - : pImpl( new ImageImpl( pName ) )
17503 -{
17504 -}
17505 -
17506 -Image::~Image()
17507 -{
17508 - delete pImpl;
17509 -}
17510 -
17511 -class ButtonImpl : public ControlImpl
17512 - , public ::cppu::WeakImplHelper1< awt::XActionListener >
17513 - , public ::cppu::WeakImplHelper1< awt::XItemListener >
17514 -{
17515 - Link maClickHdl;
17516 -protected:
17517 - // we add toggle hooks here to cut on code
17518 - Link maToggleHdl;
17519 -public:
17520 - uno::Reference< awt::XButton > mxButton;
17521 - ButtonImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
17522 - : ControlImpl( pCtx, xPeer, pWindow )
17523 - , mxButton( xPeer, uno::UNO_QUERY )
17524 - {
17525 - mxButton->addActionListener( this );
17526 - }
17527 -
17528 - ~ButtonImpl()
17529 - {
17530 - }
17531 -
17532 - virtual void Click() { /* make me pure virtual? */ };
17533 -
17534 - void SetClickHdl( const Link& rLink )
17535 - {
17536 - maClickHdl = rLink;
17537 - if ( !rLink )
17538 - mxButton->removeActionListener( this );
17539 - else
17540 - mxButton->addActionListener( this );
17541 - }
17542 -
17543 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
17544 - throw (css::uno::RuntimeException)
17545 - { mxButton.clear(); }
17546 -
17547 - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& /* rEvent */ )
17548 - throw (css::uno::RuntimeException)
17549 - {
17550 - if ( !maClickHdl )
17551 - Click();
17552 - else
17553 - maClickHdl.Call( static_cast<Window *>( mpWindow ) );
17554 - }
17555 -
17556 - virtual // HACK: doesn't need to be virtual... remove in future...
17557 - void SAL_CALL itemStateChanged( const css::awt::ItemEvent& /* rEvent */ )
17558 - throw (css::uno::RuntimeException)
17559 - {
17560 - maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
17561 - }
17562 -
17563 - BOOL SetModeImage( css::uno::Reference< css::graphic::XGraphic > xGraph )
17564 - {
17565 - setProperty( "Graphic", uno::Any( xGraph ) );
17566 - return true;
17567 - }
17568 -};
17569 -
17570 -void Button::SetText( String const& rStr )
17571 -{
17572 - if ( !getImpl().mxButton.is() )
17573 - return;
17574 - getImpl().mxButton->setLabel( rStr );
17575 -}
17576 -
17577 -void Button::SetClickHdl( const Link& rLink )
17578 -{
17579 - getImpl().SetClickHdl( rLink );
17580 -}
17581 -
17582 -BOOL Button::SetModeImage( const Image& rImage )
17583 -{
17584 - return getImpl().SetModeImage( rImage.getImpl().mxGraphic );
17585 -}
17586 -
17587 -void Button::SetImageAlign( ImageAlign eAlign )
17588 -{
17589 - getImpl().setProperty( "ImageAlign", uno::Any( (sal_Int16) eAlign ) );
17590 -}
17591 -
17592 -void Button::Click()
17593 -{
17594 -}
17595 -
17596 -IMPL_GET_IMPL( Button );
17597 -IMPL_CONSTRUCTORS( Button, Control, "button" );
17598 -
17599 -class PushButtonImpl : public ButtonImpl
17600 -{
17601 - public:
17602 - PushButtonImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
17603 - : ButtonImpl( pCtx, xPeer, pWindow ) {}
17604 -
17605 - void SetToggleHdl( const Link& rLink )
17606 - {
17607 - // XButton doesn't have an explicit event for Toggle. Anyway, it is a
17608 - // superset of the clicks: all clicks, and explicit toggles
17609 - maToggleHdl = rLink;
17610 - if ( !rLink )
17611 - mxButton->removeActionListener( this );
17612 - else
17613 - mxButton->addActionListener( this );
17614 - }
17615 -
17616 - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& rEvent )
17617 - throw (css::uno::RuntimeException)
17618 - {
17619 - ButtonImpl::actionPerformed( rEvent );
17620 - fireToggle();
17621 - }
17622 -
17623 - inline void fireToggle()
17624 - {
17625 - maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
17626 - }
17627 -};
17628 -
17629 -void PushButton::Check( BOOL bCheck )
17630 -{
17631 - getImpl().setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
17632 - // XButton doesn't have explicit toggle event
17633 - getImpl().fireToggle();
17634 -}
17635 -
17636 -BOOL PushButton::IsChecked() const
17637 -{
17638 - return !!( getImpl().getProperty( "State" ).get< sal_Int16 >() );
17639 -}
17640 -
17641 -void PushButton::Toggle()
17642 -{
17643 - Check( true );
17644 -}
17645 -
17646 -void PushButton::SetToggleHdl( const Link& rLink )
17647 -{
17648 - getImpl().SetToggleHdl( rLink );
17649 -}
17650 -
17651 -IMPL_GET_IMPL( PushButton );
17652 -IMPL_CONSTRUCTORS( PushButton, Button, "pushbutton" );
17653 -
17654 - // HACK: put every radio button into a group :/
17655 -static std::list< RadioButtonImpl*> mpRadioGroup;
17656 -
17657 -class RadioButtonImpl : public ButtonImpl
17658 -{
17659 -public:
17660 - uno::Reference< awt::XRadioButton > mxRadioButton;
17661 - RadioButtonImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
17662 - : ButtonImpl( pCtx, xPeer, pWindow )
17663 - , mxRadioButton( xPeer, uno::UNO_QUERY )
17664 - {
17665 - // TEMP:
17666 - mpRadioGroup.push_back( this );
17667 - mxRadioButton->addItemListener( this );
17668 - }
17669 -
17670 - ~RadioButtonImpl()
17671 - {
17672 - //mxRadioButton->removeItemListener( this );
17673 - mpRadioGroup.pop_front();
17674 - }
17675 -
17676 - void Check( BOOL bCheck )
17677 - {
17678 - if ( !mxRadioButton.is() )
17679 - return;
17680 - mxRadioButton->setState( !!bCheck );
17681 - fireToggle();
17682 -
17683 - if ( bCheck )
17684 - unsetOthersGroup( this );
17685 - }
17686 -
17687 - BOOL IsChecked()
17688 - {
17689 - if ( !mxRadioButton.is() )
17690 - return FALSE;
17691 - return mxRadioButton->getState();
17692 - }
17693 -
17694 - static void unsetOthersGroup( RadioButtonImpl* current )
17695 - {
17696 - // set all others to false
17697 - for ( std::list< RadioButtonImpl*>::iterator i = mpRadioGroup.begin();
17698 - i != mpRadioGroup.end(); i++ )
17699 - {
17700 - if ( *i != current )
17701 - ( *i )->Check( false );
17702 - }
17703 - }
17704 -
17705 - void SetToggleHdl( const Link& rLink )
17706 - {
17707 - maToggleHdl = rLink;
17708 -#if 0
17709 - if ( !rLink )
17710 - mxRadioButton->removeItemListener( this );
17711 - else
17712 - mxRadioButton->addItemListener( this );
17713 -#endif
17714 - }
17715 -
17716 - inline void fireToggle()
17717 - {
17718 - maToggleHdl.Call( static_cast<Window *>( mpWindow ) );
17719 - }
17720 -
17721 -//HACK: temp
17722 - virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent )
17723 - throw (css::uno::RuntimeException)
17724 - {
17725 - if ( !!maToggleHdl )
17726 - ButtonImpl::itemStateChanged( rEvent );
17727 -
17728 - if ( IsChecked() )
17729 - unsetOthersGroup( this );
17730 - }
17731 -};
17732 -
17733 -void RadioButton::Check( BOOL bCheck )
17734 -{
17735 - getImpl().Check( bCheck );
17736 -}
17737 -
17738 -BOOL RadioButton::IsChecked() const
17739 -{
17740 - return getImpl().IsChecked();
17741 -}
17742 -
17743 -void RadioButton::SetToggleHdl( const Link& rLink )
17744 -{
17745 - getImpl().SetToggleHdl( rLink );
17746 -}
17747 -
17748 -IMPL_GET_IMPL( RadioButton );
17749 -#if 1
17750 -IMPL_CONSTRUCTORS( RadioButton, Button, "radiobutton" );
17751 -#else //debugging aid
17752 -RadioButton::RadioButton( Context *pCtx, const char *pId, sal_uInt32 nId )
17753 - : Button( new RadioButtonImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
17754 -{
17755 - printf( "%s: name=%s\n", __PRETTY_FUNCTION__, pId );
17756 -}
17757 -
17758 -RadioButton::RadioButton( Window *pParent, WinBits nBits )
17759 - : Button( new RadioButtonImpl( pParent->getContext(), Window::CreatePeer( pParent, nBits, "radiobutton" ), this ) )
17760 -{
17761 -}
17762 -#endif
17763 -
17764 -class CheckBoxImpl : public ButtonImpl
17765 -{
17766 - public:
17767 - uno::Reference< awt::XCheckBox > mxCheckBox;
17768 - CheckBoxImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
17769 - : ButtonImpl( pCtx, xPeer, pWindow )
17770 - , mxCheckBox( xPeer, uno::UNO_QUERY ) {}
17771 -
17772 - void SetToggleHdl( const Link& rLink )
17773 - {
17774 - maToggleHdl = rLink;
17775 - if ( !rLink )
17776 - mxCheckBox->removeItemListener( this );
17777 - else
17778 - mxCheckBox->addItemListener( this );
17779 - }
17780 -};
17781 -
17782 -void CheckBox::Check( BOOL bCheck )
17783 -{
17784 - if ( !getImpl().mxCheckBox.is() )
17785 - return;
17786 - getImpl().mxCheckBox->setState( !!bCheck );
17787 -}
17788 -
17789 -BOOL CheckBox::IsChecked() const
17790 -{
17791 - if ( !getImpl().mxCheckBox.is() )
17792 - return FALSE;
17793 - return getImpl().mxCheckBox->getState() != 0;
17794 -}
17795 -
17796 -void CheckBox::SetToggleHdl( const Link& rLink )
17797 -{
17798 - getImpl().SetToggleHdl( rLink );
17799 -}
17800 -
17801 -IMPL_GET_IMPL( CheckBox );
17802 -IMPL_CONSTRUCTORS( CheckBox, Button, "checkbox" );
17803 -
17804 -#define BUTTON_IMPL(t, parent, response) \
17805 - class t##Impl : public parent##Impl \
17806 - { \
17807 - public: \
17808 - t##Impl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow ) \
17809 - : parent##Impl( pCtx, xPeer, pWindow ) \
17810 - { \
17811 - } \
17812 - void Click() \
17813 - { \
17814 - Dialog *d = static_cast<Dialog *>( mpCtx ); \
17815 - d->EndDialog( response ); \
17816 - } \
17817 - }
17818 -
17819 -/* Common button types currently unavailable in OOo: */
17820 -/* mpReset */
17821 -/* mpApply */
17822 -/* mpAction */
17823 -#define RET_RESET 6
17824 -#define RET_APPLY 7
17825 -#define BUTTONID_RESET RET_RESET
17826 -#define BUTTONID_APPLY RET_APPLY
17827 -
17828 -BUTTON_IMPL( OKButton, PushButton, BUTTONID_OK );
17829 -BUTTON_IMPL( CancelButton, PushButton, BUTTONID_CANCEL );
17830 -BUTTON_IMPL( YesButton, PushButton, BUTTONID_YES );
17831 -BUTTON_IMPL( NoButton, PushButton, BUTTONID_NO );
17832 -BUTTON_IMPL( RetryButton, PushButton, BUTTONID_RETRY );
17833 -BUTTON_IMPL( IgnoreButton, PushButton, BUTTONID_IGNORE );
17834 -BUTTON_IMPL( ResetButton, PushButton, BUTTONID_RESET );
17835 -BUTTON_IMPL( ApplyButton, PushButton, BUTTONID_APPLY ); /* Deprecated? */
17836 -BUTTON_IMPL( HelpButton, PushButton, BUTTONID_HELP );
17837 -
17838 -IMPL_CONSTRUCTORS( OKButton, PushButton, "okbutton" );
17839 -IMPL_CONSTRUCTORS( CancelButton, PushButton, "cancelbutton" );
17840 -IMPL_CONSTRUCTORS( YesButton, PushButton, "yesbutton" );
17841 -IMPL_CONSTRUCTORS( NoButton, PushButton, "nobutton" );
17842 -IMPL_CONSTRUCTORS( RetryButton, PushButton, "retrybutton" );
17843 -IMPL_CONSTRUCTORS( IgnoreButton, PushButton, "ignorebutton" );
17844 -IMPL_CONSTRUCTORS( ResetButton, PushButton, "resetbutton" );
17845 -IMPL_CONSTRUCTORS( ApplyButton, PushButton, "applybutton" ); /* Deprecated? */
17846 -IMPL_CONSTRUCTORS( HelpButton, PushButton, "helpbutton" );
17847 -
17848 -class AdvancedButtonImpl : public PushButtonImpl
17849 -{
17850 -protected:
17851 - bool bAdvancedMode;
17852 - std::list< Window*> maAdvanced;
17853 - std::list< Window*> maSimple;
17854 - rtl::OUString mSimpleLabel;
17855 - rtl::OUString mAdvancedLabel;
17856 -
17857 - Window* Remove( std::list< Window*> lst, Window* w )
17858 - {
17859 - for ( std::list< Window*>::iterator it = maAdvanced.begin();
17860 - it != maAdvanced.end(); it++ )
17861 - if ( *it == w )
17862 - {
17863 - lst.erase( it );
17864 - return *it;
17865 - }
17866 - return 0;
17867 - }
17868 - void redraw()
17869 - {
17870 - uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
17871 - ::Window* window = VCLXWindow::GetImplementation( ref )->GetWindow();
17872 - ::Window* parent = window->GetParent();
17873 -
17874 - ::Rectangle r = Rectangle( parent->GetPosPixel(),
17875 - parent->GetSizePixel() );
17876 -
17877 - parent->Invalidate( r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
17878 - parent->SetPosSizePixel( 0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
17879 - awt::PosSize::SIZE );
17880 - }
17881 -
17882 -public:
17883 - AdvancedButtonImpl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow )
17884 - : PushButtonImpl( pCtx, xPeer, pWindow )
17885 - , bAdvancedMode( false )
17886 - // TODO: i18n
17887 - // Button::GetStandardText( BUTTON_ADVANCED );
17888 - // Button::GetStandardText( BUTTON_SIMPLE );
17889 - , mSimpleLabel( rtl::OUString::createFromAscii( "Advanced..." ) )
17890 - , mAdvancedLabel( rtl::OUString::createFromAscii( "Simple..." ) )
17891 - {
17892 - }
17893 - void Click()
17894 - {
17895 - bAdvancedMode = !bAdvancedMode;
17896 - if ( bAdvancedMode )
17897 - advancedMode();
17898 - else
17899 - simpleMode();
17900 - }
17901 - void advancedMode()
17902 - {
17903 - // TODO: set symbol/image?
17904 - // SYMBOL_PAGEUP, SYMBOL_PAGEDOWN
17905 -#if 0
17906 - // How to set images from here?
17907 - // XImageConsumer looks like a disaster
17908 - // Should move all this switching functionality to VCLXAdvancedButton?
17909 - /biek/home/janneke/vc/layout-cws/default_images/res/commandimagelist/
17910 - sc_arrowshapes_down.png
17911 - sch_flowchartshapes.flowchart-extract.png
17912 - sch_flowchartshapes.flowchart-merge.png
17913 -#endif
17914 - mxButton->setLabel( mAdvancedLabel );
17915 - for ( std::list< Window*>::iterator it = maAdvanced.begin();
17916 - it != maAdvanced.end(); it++ )
17917 - ( *it )->Show();
17918 - for ( std::list< Window*>::iterator it = maSimple.begin();
17919 - it != maSimple.end(); it++ )
17920 - ( *it )->Hide();
17921 -
17922 - redraw();
17923 - }
17924 -
17925 - void simpleMode()
17926 - {
17927 - mxButton->setLabel( mSimpleLabel );
17928 - for ( std::list< Window*>::iterator it = maAdvanced.begin();
17929 - it != maAdvanced.end(); it++ )
17930 - ( *it )->Hide();
17931 - for ( std::list< Window*>::iterator it = maSimple.begin();
17932 - it != maSimple.end(); it++ )
17933 - ( *it )->Show();
17934 -
17935 - redraw();
17936 - }
17937 - void AddAdvanced( Window* w )
17938 - {
17939 - maAdvanced.push_back( w );
17940 - if ( !bAdvancedMode )
17941 - w->Hide();
17942 - }
17943 - void AddSimple( Window* w )
17944 - {
17945 - maSimple.push_back( w );
17946 - if ( bAdvancedMode )
17947 - w->Hide();
17948 - }
17949 - void RemoveAdvanced( Window* w )
17950 - {
17951 - Remove( maAdvanced, w );
17952 - }
17953 - void RemoveSimple( Window* w )
17954 - {
17955 - Remove( maSimple, w );
17956 - }
17957 -};
17958 -
17959 -void AdvancedButton::AddAdvanced( Window* w )
17960 -{
17961 - getImpl().AddAdvanced( w );
17962 -}
17963 -
17964 -void AdvancedButton::AddSimple( Window* w )
17965 -{
17966 - getImpl().AddSimple( w );
17967 -}
17968 -
17969 -void AdvancedButton::RemoveAdvanced( Window* w )
17970 -{
17971 - getImpl().RemoveAdvanced( w );
17972 -}
17973 -
17974 -void AdvancedButton::RemoveSimple( Window* w )
17975 -{
17976 - getImpl().RemoveSimple( w );
17977 -}
17978 -
17979 -IMPL_CONSTRUCTORS( AdvancedButton, PushButton, "advancedbutton" );
17980 -IMPL_GET_IMPL( AdvancedButton );
17981 -
17982 -
17983 -class MoreButtonImpl : public AdvancedButtonImpl
17984 -{
17985 -public:
17986 - MoreButtonImpl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow )
17987 - : AdvancedButtonImpl( pCtx, xPeer, pWindow)
17988 - {
17989 - mAdvancedLabel = ::Button::GetStandardText( BUTTON_LESS );
17990 - mSimpleLabel = ::Button::GetStandardText( BUTTON_MORE );
17991 - }
17992 - void AddWindow( Window* w ) { AddAdvanced( w ); }
17993 - void RemoveWindow( Window* w ) { RemoveAdvanced( w ); }
17994 -};
17995 -
17996 -// TODO
17997 -//BUTTON_IMPL( MoreButton, PushButton, 0 );
17998 -IMPL_CONSTRUCTORS( MoreButton, AdvancedButton, "morebutton" );
17999 -IMPL_GET_IMPL( MoreButton );
18000 -
18001 -void MoreButton::AddWindow( Window* w )
18002 -{
18003 - getImpl().AddWindow( w );
18004 -}
18005 -
18006 -void MoreButton::RemoveWindow( Window* w )
18007 -{
18008 - getImpl().RemoveWindow( w );
18009 -}
18010 -
18011 -} // namespace layout
18012 --- toolkit/source/vclcompat/wcontainer.cxx.old 2009-04-02 10:49:35.000000000 +0000
18013 +++ toolkit/source/vclcompat/wcontainer.cxx 1970-01-01 00:00:00.000000000 +0000
18014 @@ -1,272 +0,0 @@
18015 -/*************************************************************************
18016 - *
18017 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18018 - *
18019 - * Copyright 2008 by Sun Microsystems, Inc.
18020 - *
18021 - * OpenOffice.org - a multi-platform office productivity suite
18022 - *
18023 - * $RCSfile: wcontainer.cxx,v $
18024 - *
18025 - * $Revision: 1.3 $
18026 - *
18027 - * This file is part of OpenOffice.org.
18028 - *
18029 - * OpenOffice.org is free software: you can redistribute it and/or modify
18030 - * it under the terms of the GNU Lesser General Public License version 3
18031 - * only, as published by the Free Software Foundation.
18032 - *
18033 - * OpenOffice.org is distributed in the hope that it will be useful,
18034 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
18035 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18036 - * GNU Lesser General Public License version 3 for more details
18037 - * (a copy is included in the LICENSE file that accompanied this code).
18038 - *
18039 - * You should have received a copy of the GNU Lesser General Public License
18040 - * version 3 along with OpenOffice.org. If not, see
18041 - * <http://www.openoffice.org/license.html>
18042 - * for a copy of the LGPLv3 License.
18043 - *
18044 - ************************************************************************/
18045 -
18046 -#include "wrapper.hxx"
18047 -
18048 -#include "layout/layoutcore.hxx"
18049 -#include <com/sun/star/awt/XLayoutRoot.hpp>
18050 -#include <com/sun/star/awt/XLayoutContainer.hpp>
18051 -
18052 -#include <comphelper/processfactory.hxx>
18053 -
18054 -#include <tools/debug.hxx>
18055 -
18056 -using namespace ::com::sun::star;
18057 -
18058 -namespace layout
18059 -{
18060 -
18061 -Container::Container( Context const* pCtx, char const* pId )
18062 - : mxContainer( pCtx->GetPeerHandle( pId ), uno::UNO_QUERY )
18063 -{
18064 - if ( !mxContainer.is() )
18065 - {
18066 - DBG_ERROR1( "Error: failed to associate container with '%s'", pId );
18067 - }
18068 -}
18069 -
18070 -Container::Container( rtl::OUString const& rName, sal_Int32 nBorder )
18071 -{
18072 - mxContainer = layoutimpl::createContainer( rName );
18073 -
18074 - uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
18075 - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Border" ) ),
18076 - uno::Any( nBorder ) );
18077 -}
18078 -
18079 -void Container::Add( Window *pChild )
18080 -{
18081 - if ( pChild )
18082 - {
18083 - uno::Reference< awt::XLayoutConstrains > xChild( pChild->GetPeer(), uno::UNO_QUERY );
18084 - mxContainer->addChild( xChild );
18085 - }
18086 -}
18087 -
18088 -void Container::Add( Container *pChild )
18089 -{
18090 - if ( pChild )
18091 - {
18092 - uno::Reference< awt::XLayoutConstrains > xChild( pChild->getImpl(), uno::UNO_QUERY );
18093 - mxContainer->addChild( xChild );
18094 - }
18095 -}
18096 -
18097 -void Container::Remove( Window *pChild )
18098 -{
18099 - if ( pChild )
18100 - {
18101 - uno::Reference< awt::XLayoutConstrains > xChild( pChild->GetPeer(), uno::UNO_QUERY );
18102 - mxContainer->removeChild( xChild );
18103 - }
18104 -}
18105 -
18106 -void Container::Remove( Container *pChild )
18107 -{
18108 - if ( pChild )
18109 - {
18110 - uno::Reference< awt::XLayoutConstrains > xChild( pChild->getImpl(), uno::UNO_QUERY );
18111 - mxContainer->removeChild( xChild );
18112 - }
18113 -}
18114 -
18115 -void Container::Clear()
18116 -{
18117 - css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > children;
18118 - children = mxContainer->getChildren();
18119 - for ( int i = 0; i < children.getLength(); i++ )
18120 - mxContainer->removeChild( children[ i ] );
18121 -}
18122 -
18123 -void Container::ShowAll( bool bShow )
18124 -{
18125 - struct inner
18126 - {
18127 - static void setChildrenVisible( uno::Reference < awt::XLayoutContainer > xCont,
18128 - bool bVisible ) /* auxiliary */
18129 - {
18130 - if ( xCont.is() )
18131 - {
18132 - uno::Sequence< uno::Reference < awt::XLayoutConstrains > > aChildren;
18133 - aChildren = xCont->getChildren();
18134 - for ( int i = 0; i < aChildren.getLength(); i++ )
18135 - {
18136 - uno::Reference < awt::XLayoutConstrains > xChild( aChildren[ i ] );
18137 -
18138 - uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY);
18139 - if ( xWin.is() )
18140 - xWin->setVisible( bVisible );
18141 -
18142 - uno::Reference < awt::XLayoutContainer > xChildCont(
18143 - xChild, uno::UNO_QUERY );
18144 - setChildrenVisible( xChildCont, bVisible );
18145 - }
18146 - }
18147 - }
18148 - };
18149 -
18150 - inner::setChildrenVisible( mxContainer, bShow );
18151 -}
18152 -
18153 -void Container::Show()
18154 -{
18155 - ShowAll( true );
18156 -}
18157 -
18158 -void Container::Hide()
18159 -{
18160 - ShowAll( false );
18161 -}
18162 -
18163 -Table::Table( sal_Int32 nBorder, sal_Int32 nColumns )
18164 - : Container( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ), nBorder )
18165 -{
18166 - uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
18167 - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" ) ),
18168 - uno::Any( nColumns ) );
18169 -}
18170 -
18171 -void Table::Add( Window *pWindow, bool bXExpand, bool bYExpand,
18172 - sal_Int32 nXSpan, sal_Int32 nYSpan )
18173 -{
18174 - if ( !pWindow )
18175 - return;
18176 - WindowImpl &rImpl = pWindow->getImpl();
18177 - uno::Reference< awt::XLayoutConstrains > xChild( rImpl.mxWindow,
18178 - uno::UNO_QUERY );
18179 - mxContainer->addChild( xChild );
18180 - setProps( xChild, bXExpand, bYExpand, nXSpan, nYSpan );
18181 -}
18182 -
18183 -void Table::Add( Container *pContainer, bool bXExpand, bool bYExpand,
18184 - sal_Int32 nXSpan, sal_Int32 nYSpan )
18185 -{
18186 - if ( !pContainer )
18187 - return;
18188 - uno::Reference< awt::XLayoutConstrains > xChild( pContainer->getImpl(),
18189 - uno::UNO_QUERY );
18190 - mxContainer->addChild( xChild );
18191 - setProps( xChild, bXExpand, bYExpand, nXSpan, nYSpan );
18192 -}
18193 -
18194 -void Table::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
18195 - bool bXExpand, bool bYExpand, sal_Int32 nXSpan, sal_Int32 nYSpan )
18196 -{
18197 - uno::Reference< beans::XPropertySet > xProps
18198 - ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
18199 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ) ),
18200 - uno::Any( bXExpand ) );
18201 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ) ),
18202 - uno::Any( bYExpand ) );
18203 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ) ),
18204 - uno::Any( nXSpan ) );
18205 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ) ),
18206 - uno::Any( nYSpan ) );
18207 -}
18208 -
18209 -Box::Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous )
18210 - : Container( rName, nBorder )
18211 -{
18212 - uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
18213 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ) ),
18214 - uno::Any( bHomogeneous ) );
18215 -}
18216 -
18217 -void Box::Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding)
18218 -{
18219 - if ( !pWindow )
18220 - return;
18221 - WindowImpl &rImpl = pWindow->getImpl();
18222 - uno::Reference< awt::XLayoutConstrains > xChild( rImpl.mxWindow,
18223 - uno::UNO_QUERY );
18224 -
18225 - mxContainer->addChild( xChild );
18226 - setProps( xChild, bExpand, bFill, nPadding );
18227 -}
18228 -
18229 -void Box::Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding)
18230 -{
18231 - if ( !pContainer )
18232 - return;
18233 -
18234 - uno::Reference< awt::XLayoutConstrains > xChild( pContainer->getImpl(),
18235 - uno::UNO_QUERY );
18236 - mxContainer->addChild( xChild );
18237 - setProps( xChild, bExpand, bFill, nPadding );
18238 -}
18239 -
18240 -void Box::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
18241 - bool bExpand, bool bFill, sal_Int32 nPadding )
18242 -{
18243 - uno::Reference< beans::XPropertySet > xProps
18244 - ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
18245 -
18246 - xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Expand" ) ),
18247 - uno::Any( bExpand ) );
18248 - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Fill" ) ),
18249 - uno::Any( bFill ) );
18250 - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Padding" ) ),
18251 - uno::Any( nPadding ) );
18252 -}
18253 -
18254 -Table::Table( Context const* pCtx, char const* pId )
18255 - : Container( pCtx, pId )
18256 -{
18257 -}
18258 -
18259 -Box::Box( Context const* pCtx, char const* pId )
18260 - : Container( pCtx, pId )
18261 -{
18262 -}
18263 -
18264 -HBox::HBox( sal_Int32 nBorder, bool bHomogeneous )
18265 - : Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hbox" ) ),
18266 - nBorder, bHomogeneous )
18267 -{
18268 -}
18269 -
18270 -HBox::HBox( Context const* pCtx, char const* pId )
18271 - : Box( pCtx, pId )
18272 -{
18273 -}
18274 -
18275 -VBox::VBox( sal_Int32 nBorder, bool bHomogeneous )
18276 - : Box( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vbox" ) ),
18277 - nBorder, bHomogeneous )
18278 -{
18279 -}
18280 -
18281 -VBox::VBox( Context const* pCtx, char const* pId )
18282 - : Box( pCtx, pId )
18283 -{
18284 -}
18285 -
18286 -} // namespace layout
18287 --- toolkit/source/vclcompat/wfield.cxx.old 2009-04-06 16:42:11.000000000 +0000
18288 +++ toolkit/source/vclcompat/wfield.cxx 1970-01-01 00:00:00.000000000 +0000
18289 @@ -1,635 +0,0 @@
18290 -/*************************************************************************
18291 - *
18292 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18293 - *
18294 - * Copyright 2008 by Sun Microsystems, Inc.
18295 - *
18296 - * OpenOffice.org - a multi-platform office productivity suite
18297 - *
18298 - * $RCSfile: wfield.cxx,v $
18299 - *
18300 - * $Revision: 1.3 $
18301 - *
18302 - * This file is part of OpenOffice.org.
18303 - *
18304 - * OpenOffice.org is free software: you can redistribute it and/or modify
18305 - * it under the terms of the GNU Lesser General Public License version 3
18306 - * only, as published by the Free Software Foundation.
18307 - *
18308 - * OpenOffice.org is distributed in the hope that it will be useful,
18309 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
18310 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18311 - * GNU Lesser General Public License version 3 for more details
18312 - * (a copy is included in the LICENSE file that accompanied this code).
18313 - *
18314 - * You should have received a copy of the GNU Lesser General Public License
18315 - * version 3 along with OpenOffice.org. If not, see
18316 - * <http://www.openoffice.org/license.html>
18317 - * for a copy of the LGPLv3 License.
18318 - *
18319 - ************************************************************************/
18320 -
18321 -#include "wrapper.hxx"
18322 -
18323 -#include <comphelper/processfactory.hxx>
18324 -#include <com/sun/star/awt/XMetricField.hpp>
18325 -#include <com/sun/star/awt/XCurrencyField.hpp>
18326 -#include <com/sun/star/awt/XTextComponent.hpp>
18327 -#include <com/sun/star/awt/XListBox.hpp>
18328 -#include <com/sun/star/awt/XComboBox.hpp>
18329 -#include <cppuhelper/implbase1.hxx>
18330 -#include <com/sun/star/awt/XActionListener.hpp>
18331 -#include <com/sun/star/awt/XItemListener.hpp>
18332 -
18333 -using namespace ::com::sun::star;
18334 -
18335 -namespace layout
18336 -{
18337 -
18338 -class EditImpl : public ControlImpl,
18339 - public ::cppu::WeakImplHelper1< awt::XTextListener >
18340 -{
18341 - Link maModifyHdl;
18342 -public:
18343 - uno::Reference< awt::XTextComponent > mxEdit;
18344 - EditImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18345 - : ControlImpl( pCtx, xPeer, pWindow )
18346 - , mxEdit( xPeer, uno::UNO_QUERY )
18347 - {
18348 - }
18349 -
18350 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
18351 - throw (css::uno::RuntimeException)
18352 - {
18353 - SetModifyHdl( Link() );
18354 - mxEdit.clear();
18355 - }
18356 -
18357 - void SetModifyHdl( const Link& rLink )
18358 - {
18359 - if ( !mxEdit.is() )
18360 - return;
18361 - maModifyHdl = rLink;
18362 - if ( !rLink )
18363 - mxEdit->removeTextListener( this );
18364 - else
18365 - mxEdit->addTextListener( this );
18366 - }
18367 -
18368 - void SAL_CALL textChanged( const css::awt::TextEvent& /* rEvent */ )
18369 - throw (css::uno::RuntimeException)
18370 - {
18371 - maModifyHdl.Call( mpWindow );
18372 - }
18373 -};
18374 -
18375 -void Edit::SetSelection( Selection const& rSelection )
18376 -{
18377 - if ( !getImpl().mxEdit.is() )
18378 - return;
18379 - getImpl().mxEdit->setSelection( awt::Selection( rSelection.Min(), rSelection.Max() ) );
18380 -}
18381 -
18382 -void Edit::SetText( XubString const& rStr ) const
18383 -{
18384 - if ( !getImpl().mxEdit.is() )
18385 - return;
18386 - getImpl().mxEdit->setText( rStr );
18387 -}
18388 -
18389 -XubString Edit::GetText() const
18390 -{
18391 - if ( !getImpl().mxEdit.is() )
18392 - return XubString();
18393 - return XubString( getImpl().mxEdit->getText());
18394 -}
18395 -
18396 -void Edit::SetModifyHdl( const Link& rLink )
18397 -{
18398 - getImpl().SetModifyHdl( rLink );
18399 -}
18400 -
18401 -IMPL_CONSTRUCTORS( Edit, Control, "edit" );
18402 -IMPL_GET_IMPL( Edit );
18403 -
18404 -// Window/Control/Edit/MultiLineEdit
18405 -class MultiLineEditImpl : public EditImpl
18406 -{
18407 -public:
18408 - MultiLineEditImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18409 - : EditImpl( pCtx, xPeer, pWindow )
18410 - {
18411 - }
18412 -};
18413 -
18414 -IMPL_CONSTRUCTORS( MultiLineEdit, Edit, "multilineedit" );
18415 -IMPL_GET_IMPL( MultiLineEdit );
18416 -
18417 -// Window/Control/Edit/SpinField
18418 -class SpinFieldImpl : public EditImpl
18419 -{
18420 -public:
18421 - SpinFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18422 - : EditImpl( pCtx, xPeer, pWindow )
18423 - {
18424 - }
18425 -};
18426 -
18427 -IMPL_CONSTRUCTORS( SpinField, Edit, "spinfield" );
18428 -
18429 -// Window/Control/Edit/SpinField/NumericField
18430 -class NumericFieldImpl : public SpinFieldImpl
18431 -{
18432 -public:
18433 - NumericFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18434 - : SpinFieldImpl( pCtx, xPeer, pWindow )
18435 - {
18436 - }
18437 -};
18438 -
18439 -// Window/Control/Edit/SpinField/MetricField
18440 -class MetricFieldImpl : public SpinFieldImpl
18441 -{
18442 -public:
18443 - MetricFieldImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18444 - : SpinFieldImpl( pCtx, xPeer, pWindow )
18445 - {
18446 - }
18447 -};
18448 -
18449 -IMPL_GET_IMPL( SpinField );
18450 -IMPL_GET_IMPL( NumericField );
18451 -IMPL_GET_IMPL( MetricField );
18452 -
18453 -// FormatterBase
18454 -class FormatterBaseImpl
18455 -{
18456 -protected:
18457 - PeerHandle mxPeer;
18458 -public:
18459 - explicit FormatterBaseImpl( const PeerHandle &xPeer )
18460 - : mxPeer( xPeer )
18461 - {
18462 - };
18463 -};
18464 -
18465 -class NumericFormatterImpl : public FormatterBaseImpl
18466 -{
18467 -public:
18468 - uno::Reference< awt::XCurrencyField > mxField;
18469 - explicit NumericFormatterImpl( const PeerHandle &xPeer )
18470 - : FormatterBaseImpl( xPeer )
18471 - , mxField( xPeer, uno::UNO_QUERY )
18472 - {
18473 - }
18474 -
18475 - // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
18476 - double valueToDouble( sal_Int64 nValue )
18477 - {
18478 - sal_Int16 nDigits = mxField->getDecimalDigits();
18479 - double n = (double)nValue;
18480 - for ( sal_uInt16 d = 0; d < nDigits; d++ )
18481 - n /= 10;
18482 - return n;
18483 - } // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
18484 - sal_Int64 doubleToValue( double nValue )
18485 - {
18486 - sal_Int16 nDigits = mxField->getDecimalDigits();
18487 - double n = nValue;
18488 - for ( sal_uInt16 d = 0; d < nDigits; d++ )
18489 - n *= 10;
18490 - return (sal_Int64) n;
18491 - }
18492 -};
18493 -
18494 -class MetricFormatterImpl : public FormatterBaseImpl
18495 -{
18496 -public:
18497 - uno::Reference< awt::XMetricField > mxField;
18498 - explicit MetricFormatterImpl( const PeerHandle &xPeer )
18499 - : FormatterBaseImpl( xPeer )
18500 - , mxField( xPeer, uno::UNO_QUERY )
18501 - {
18502 - }
18503 -};
18504 -
18505 -// NumericFormatter
18506 -
18507 -NumericFormatter::NumericFormatter( FormatterBaseImpl *pImpl )
18508 - : FormatterBase( pImpl )
18509 -{
18510 -}
18511 -
18512 -NumericFormatterImpl& NumericFormatter::getFormatImpl() const
18513 -{
18514 - return *( static_cast<NumericFormatterImpl *>( mpFormatImpl ) );
18515 -}
18516 -
18517 -#define SET_IMPL(vclmethod, idlmethod) \
18518 - void NumericFormatter::vclmethod( sal_Int64 nValue ) \
18519 - { \
18520 - if ( !getFormatImpl().mxField.is() ) \
18521 - return; \
18522 - getFormatImpl().mxField->idlmethod( getFormatImpl().valueToDouble( nValue ) ); \
18523 - }
18524 -
18525 -SET_IMPL( SetMin, setMin )
18526 -SET_IMPL( SetMax, setMax )
18527 -SET_IMPL( SetLast, setLast )
18528 -SET_IMPL( SetFirst, setFirst )
18529 -SET_IMPL( SetValue, setValue )
18530 -SET_IMPL( SetSpinSize, setSpinSize )
18531 -
18532 -sal_Int64 NumericFormatter::GetValue() const
18533 -{
18534 - if ( !getFormatImpl().mxField.is() )
18535 - return 0;
18536 - return getFormatImpl().doubleToValue( getFormatImpl().mxField->getValue() );
18537 -}
18538 -
18539 -#undef SET_IMPL
18540 -
18541 -IMPL_CONSTRUCTORS_2( NumericField, SpinField, NumericFormatter, "numericfield" );
18542 -
18543 -// MetricFormatter
18544 -
18545 -MetricFormatter::MetricFormatter( FormatterBaseImpl *pImpl )
18546 - : FormatterBase( pImpl )
18547 -{
18548 -}
18549 -MetricFormatterImpl& MetricFormatter::getFormatImpl() const
18550 -{ return *( static_cast<MetricFormatterImpl *>( mpFormatImpl ) ); }
18551 -
18552 -#define MetricUnitVclToUno(a) ((sal_uInt16)(a))
18553 -
18554 -#define SET_IMPL(vclmethod, idlmethod) \
18555 - void MetricFormatter::vclmethod( sal_Int64 nValue, FieldUnit nUnit ) \
18556 - { \
18557 - if ( !getFormatImpl().mxField.is() ) \
18558 - return; \
18559 - getFormatImpl().mxField->idlmethod( nValue, MetricUnitVclToUno( nUnit ) ); \
18560 - }
18561 -
18562 -SET_IMPL( SetMin, setMin )
18563 -SET_IMPL( SetMax, setMax )
18564 -SET_IMPL( SetLast, setLast )
18565 -SET_IMPL( SetFirst, setFirst )
18566 -SET_IMPL( SetValue, setValue )
18567 -
18568 -#undef SET_IMPL
18569 -
18570 -void MetricFormatter::SetSpinSize( sal_Int64 nValue )
18571 -{
18572 - if ( !getFormatImpl().mxField.is() )
18573 - return;
18574 - getFormatImpl().mxField->setSpinSize( nValue );
18575 -}
18576 -
18577 -sal_Int64 MetricFormatter::GetValue( FieldUnit nUnit ) const
18578 -{
18579 - if ( !getFormatImpl().mxField.is() )
18580 - return 0;
18581 - return getFormatImpl().mxField->getValue( MetricUnitVclToUno( nUnit ) );
18582 -}
18583 -
18584 -IMPL_CONSTRUCTORS_2( MetricField, SpinField, MetricFormatter, "metricfield" );
18585 -
18586 -// Window/Control/Edit/ComboBox
18587 -class ComboBoxImpl : public EditImpl,
18588 - public ::cppu::WeakImplHelper1< awt::XActionListener >,
18589 - public ::cppu::WeakImplHelper1< awt::XItemListener >
18590 -{
18591 - Link maClickHdl, maSelectHdl;
18592 -public:
18593 - uno::Reference< awt::XComboBox > mxComboBox;
18594 - ComboBoxImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18595 - : EditImpl( pCtx, xPeer, pWindow ),
18596 - mxComboBox( xPeer, uno::UNO_QUERY )
18597 - {
18598 - }
18599 -
18600 - USHORT InsertEntry( XubString const& rStr, USHORT nPos )
18601 - {
18602 - if ( nPos == COMBOBOX_APPEND )
18603 - nPos = GetEntryCount();
18604 - mxComboBox->addItem( rtl::OUString( rStr ), nPos );
18605 - return nPos;
18606 - }
18607 -
18608 - void RemoveEntry( USHORT nPos )
18609 - {
18610 - mxComboBox->removeItems( nPos, 1 );
18611 - }
18612 -
18613 - USHORT GetEntryPos( const XubString& rStr ) const
18614 - {
18615 - uno::Sequence< rtl::OUString> aItems( mxComboBox->getItems() );
18616 - rtl::OUString rKey( rStr );
18617 - for ( unsigned int i = 0; aItems.getLength(); i++ )
18618 - {
18619 - if ( aItems[ i ] == rKey )
18620 - return sal::static_int_cast< USHORT >( i );
18621 - }
18622 - return COMBOBOX_ENTRY_NOTFOUND;
18623 - }
18624 -
18625 - XubString GetEntry( USHORT nPos ) const
18626 - {
18627 - return XubString( mxComboBox->getItem( nPos ) );
18628 - }
18629 -
18630 - USHORT GetEntryCount() const
18631 - {
18632 - return mxComboBox->getItemCount();
18633 - }
18634 -
18635 - void SetClickHdl( const Link& rLink )
18636 - {
18637 - maClickHdl = rLink;
18638 - if ( !rLink )
18639 - mxComboBox->removeActionListener( this );
18640 - else
18641 - mxComboBox->addActionListener( this );
18642 - }
18643 -
18644 - void SetSelectHdl( const Link& rLink )
18645 - {
18646 - maSelectHdl = rLink;
18647 - if ( !rLink )
18648 - mxComboBox->removeItemListener( this );
18649 - else
18650 - mxComboBox->addItemListener( this );
18651 - }
18652 -
18653 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
18654 - throw (css::uno::RuntimeException)
18655 - {
18656 - mxComboBox.clear();
18657 - }
18658 -
18659 - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& /* rEvent */ )
18660 - throw (css::uno::RuntimeException)
18661 - {
18662 - ComboBox* pComboBox = static_cast<ComboBox*>( mpWindow );
18663 - if ( !pComboBox )
18664 - return;
18665 - maClickHdl.Call( pComboBox );
18666 - }
18667 -
18668 - virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& /* rEvent */ )
18669 - throw (css::uno::RuntimeException)
18670 - {
18671 - ComboBox* pComboBox = static_cast<ComboBox*>( mpWindow );
18672 - if ( !pComboBox )
18673 - return;
18674 - maSelectHdl.Call( pComboBox );
18675 - }
18676 -};
18677 -
18678 -USHORT ComboBox::InsertEntry( const XubString &rStr, USHORT nPos )
18679 -{
18680 - return getImpl().InsertEntry( rStr, nPos );
18681 -}
18682 -
18683 -void ComboBox::RemoveEntry( const XubString& rStr )
18684 -{
18685 - getImpl().RemoveEntry( GetEntryPos( rStr ) );
18686 -}
18687 -
18688 -void ComboBox::RemoveEntry( USHORT nPos )
18689 -{
18690 - getImpl().RemoveEntry( nPos );
18691 -}
18692 -
18693 -void ComboBox::Clear()
18694 -{
18695 - uno::Sequence< rtl::OUString> aNoItems;
18696 - getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
18697 -}
18698 -
18699 -USHORT ComboBox::GetEntryPos( const XubString& rStr ) const
18700 -{
18701 - return getImpl().GetEntryPos( rStr );
18702 -}
18703 -
18704 -XubString ComboBox::GetEntry( USHORT nPos ) const
18705 -{
18706 - rtl::OUString rItem = getImpl().mxComboBox->getItem( nPos );
18707 - return XubString( rItem );
18708 -}
18709 -
18710 -USHORT ComboBox::GetEntryCount() const
18711 -{
18712 - return getImpl().GetEntryCount();
18713 -}
18714 -
18715 -void ComboBox::SetClickHdl( const Link& rLink )
18716 -{
18717 - getImpl().SetClickHdl( rLink );
18718 -}
18719 -
18720 -void ComboBox::SetSelectHdl( const Link& rLink )
18721 -{
18722 - getImpl().SetSelectHdl( rLink );
18723 -}
18724 -
18725 -IMPL_CONSTRUCTORS( ComboBox, Edit, "combobox" );
18726 -IMPL_GET_IMPL( ComboBox );
18727 -
18728 -// Window/Control/ListBox
18729 -class ListBoxImpl : public ControlImpl,
18730 - public ::cppu::WeakImplHelper1< awt::XActionListener >,
18731 - public ::cppu::WeakImplHelper1< awt::XItemListener >
18732 -{
18733 - Link maClickHdl, maSelectHdl;
18734 -public:
18735 - uno::Reference< awt::XListBox > mxListBox;
18736 - ListBoxImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
18737 - : ControlImpl( pCtx, xPeer, pWindow ),
18738 - mxListBox( xPeer, uno::UNO_QUERY )
18739 - {
18740 - SelectEntryPos( 0, true );
18741 - }
18742 -
18743 - USHORT InsertEntry(const XubString& rStr, USHORT nPos)
18744 - {
18745 - if ( nPos == LISTBOX_APPEND )
18746 - nPos = mxListBox->getItemCount();
18747 - mxListBox->addItem( rtl::OUString( rStr ), nPos );
18748 - return nPos;
18749 - }
18750 -
18751 - void RemoveEntry( USHORT nPos )
18752 - {
18753 - mxListBox->removeItems( nPos, 1 );
18754 - }
18755 -
18756 - USHORT RemoveEntry(const XubString& rStr, USHORT nPos)
18757 - {
18758 - if ( nPos == LISTBOX_APPEND )
18759 - nPos = mxListBox->getItemCount();
18760 - mxListBox->addItem( rtl::OUString( rStr ), nPos );
18761 - return nPos;
18762 - }
18763 -
18764 - USHORT GetEntryPos( const XubString& rStr ) const
18765 - {
18766 - uno::Sequence< rtl::OUString> aItems( mxListBox->getItems() );
18767 - rtl::OUString rKey( rStr );
18768 - for ( unsigned int i = 0; aItems.getLength(); i++ )
18769 - {
18770 - if ( aItems[ i ] == rKey )
18771 - return sal::static_int_cast< USHORT >( i );
18772 - }
18773 - return LISTBOX_ENTRY_NOTFOUND;
18774 - }
18775 -
18776 - XubString GetEntry( USHORT nPos ) const
18777 - {
18778 - return mxListBox->getItem( nPos );
18779 - }
18780 -
18781 - USHORT GetEntryCount() const
18782 - {
18783 - return mxListBox->getItemCount();
18784 - }
18785 -
18786 - void SelectEntryPos( USHORT nPos, BOOL bSelect )
18787 - {
18788 - mxListBox->selectItemPos( nPos, bSelect );
18789 - }
18790 -
18791 - USHORT GetSelectEntryCount() const
18792 - {
18793 - return sal::static_int_cast< USHORT >( mxListBox->getSelectedItems().getLength() );
18794 - }
18795 -
18796 - USHORT GetSelectEntryPos( USHORT nSelIndex ) const
18797 - {
18798 - USHORT nSelected = 0;
18799 - if ( mxListBox->isMutipleMode() )
18800 - {
18801 - uno::Sequence< short > aItems( mxListBox->getSelectedItemsPos() );
18802 - if ( nSelIndex < aItems.getLength() )
18803 - nSelected = aItems[ nSelIndex ];
18804 - }
18805 - else
18806 - nSelected = mxListBox->getSelectedItemPos();
18807 - return nSelected;
18808 - }
18809 -
18810 - void SetClickHdl( const Link& rLink )
18811 - {
18812 - maClickHdl = rLink;
18813 - if ( !rLink )
18814 - mxListBox->removeActionListener( this );
18815 - else
18816 - mxListBox->addActionListener( this );
18817 - }
18818 -
18819 - void SetSelectHdl( const Link& rLink )
18820 - {
18821 - maSelectHdl = rLink;
18822 - if ( !rLink )
18823 - mxListBox->removeItemListener( this );
18824 - else
18825 - mxListBox->addItemListener( this );
18826 - }
18827 -
18828 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
18829 - throw (css::uno::RuntimeException)
18830 - {
18831 - mxListBox.clear();
18832 - }
18833 -
18834 - void SAL_CALL actionPerformed( const css::awt::ActionEvent& /* rEvent */ )
18835 - throw (css::uno::RuntimeException)
18836 - {
18837 - maClickHdl.Call( mpWindow );
18838 - }
18839 -
18840 - void SAL_CALL itemStateChanged( const css::awt::ItemEvent& /* rEvent */ )
18841 - throw (css::uno::RuntimeException)
18842 - {
18843 - ListBox* pListBox = static_cast<ListBox*>( mpWindow );
18844 - if ( !pListBox )
18845 - return;
18846 - maSelectHdl.Call( pListBox );
18847 - }
18848 -};
18849 -
18850 -USHORT ListBox::InsertEntry(const XubString& rStr, USHORT nPos)
18851 -{
18852 - return getImpl().InsertEntry(rStr, nPos);
18853 -}
18854 -
18855 -void ListBox::RemoveEntry( USHORT nPos )
18856 -{
18857 - return getImpl().RemoveEntry( nPos );
18858 -}
18859 -
18860 -void ListBox::RemoveEntry( const XubString& rStr )
18861 -{
18862 - return getImpl().RemoveEntry( GetEntryPos( rStr ) );
18863 -}
18864 -
18865 -void ListBox::Clear()
18866 -{
18867 - uno::Sequence< rtl::OUString> aNoItems;
18868 - getImpl().setProperty( "StringItemList", uno::Any( aNoItems ) );
18869 -}
18870 -
18871 -USHORT ListBox::GetEntryPos( const XubString& rStr ) const
18872 -{
18873 - return getImpl().GetEntryPos( rStr );
18874 -}
18875 -
18876 -XubString ListBox::GetEntry( USHORT nPos ) const
18877 -{
18878 - return getImpl().GetEntry( nPos );
18879 -}
18880 -
18881 -USHORT ListBox::GetEntryCount() const
18882 -{
18883 - return getImpl().GetEntryCount();
18884 -}
18885 -
18886 -void ListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
18887 -{
18888 - getImpl().SelectEntryPos( nPos, bSelect );
18889 -}
18890 -
18891 -void ListBox::SelectEntry( const XubString& rStr, BOOL bSelect )
18892 -{
18893 - SelectEntryPos( GetEntryPos( rStr ), bSelect );
18894 -}
18895 -
18896 -USHORT ListBox::GetSelectEntryCount() const
18897 -{
18898 - return getImpl().GetSelectEntryCount();
18899 -}
18900 -
18901 -USHORT ListBox::GetSelectEntryPos( USHORT nSelIndex ) const
18902 -{
18903 - return getImpl().GetSelectEntryPos( nSelIndex );
18904 -}
18905 -
18906 -XubString ListBox::GetSelectEntry( USHORT nSelIndex ) const
18907 -{
18908 - return GetEntry( GetSelectEntryPos( nSelIndex ) );
18909 -}
18910 -
18911 -void ListBox::SetSelectHdl( const Link& rLink )
18912 -{
18913 - getImpl().SetSelectHdl( rLink );
18914 -}
18915 -
18916 -void ListBox::SetClickHdl( const Link& rLink )
18917 -{
18918 - getImpl().SetClickHdl( rLink );
18919 -}
18920 -
18921 -IMPL_CONSTRUCTORS( ListBox, Control, "listbox" );
18922 -IMPL_GET_IMPL( ListBox );
18923 -
18924 -} // namespace layout
18925 --- toolkit/source/vclcompat/wrapper.cxx.old 2009-04-06 16:42:11.000000000 +0000
18926 +++ toolkit/source/vclcompat/wrapper.cxx 1970-01-01 00:00:00.000000000 +0000
18927 @@ -1,763 +0,0 @@
18928 -/*************************************************************************
18929 - *
18930 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18931 - *
18932 - * Copyright 2008 by Sun Microsystems, Inc.
18933 - *
18934 - * OpenOffice.org - a multi-platform office productivity suite
18935 - *
18936 - * $RCSfile: wrapper.cxx,v $
18937 - *
18938 - * $Revision: 1.3 $
18939 - *
18940 - * This file is part of OpenOffice.org.
18941 - *
18942 - * OpenOffice.org is free software: you can redistribute it and/or modify
18943 - * it under the terms of the GNU Lesser General Public License version 3
18944 - * only, as published by the Free Software Foundation.
18945 - *
18946 - * OpenOffice.org is distributed in the hope that it will be useful,
18947 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
18948 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18949 - * GNU Lesser General Public License version 3 for more details
18950 - * (a copy is included in the LICENSE file that accompanied this code).
18951 - *
18952 - * You should have received a copy of the GNU Lesser General Public License
18953 - * version 3 along with OpenOffice.org. If not, see
18954 - * <http://www.openoffice.org/license.html>
18955 - * for a copy of the LGPLv3 License.
18956 - *
18957 - ************************************************************************/
18958 -
18959 -#include "wrapper.hxx"
18960 -
18961 -#include <awt/vclxplugin.hxx>
18962 -#include <com/sun/star/awt/PosSize.hpp>
18963 -#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
18964 -#include <com/sun/star/awt/WindowAttribute.hpp>
18965 -#include <com/sun/star/awt/XDialog2.hpp>
18966 -#include <com/sun/star/awt/XProgressBar.hpp>
18967 -#include <com/sun/star/graphic/XGraphic.hpp>
18968 -#include <comphelper/processfactory.hxx>
18969 -#include <cstdio>
18970 -#include <layout/factory.hxx>
18971 -#include <layout/layoutcore.hxx>
18972 -#include <layout/root.hxx>
18973 -#include <layout/localized-string.hxx>
18974 -#include <toolkit/awt/vclxwindow.hxx>
18975 -#include <vcl/ctrl.hxx>
18976 -#include <vcl/image.hxx>
18977 -#include <vcl/tabpage.hxx>
18978 -#include <vcl/window.hxx>
18979 -
18980 -
18981 -#if 0
18982 -/* FIXME: move to sfx2 or svtools/layout.hxx */
18983 -#include <svtools/itempool.hxx>
18984 -#include <svtools/itemset.hxx>
18985 -#include <svtools/poolitem.hxx>
18986 -#endif
18987 -
18988 -using namespace ::com::sun::star;
18989 -using rtl::OUString;
18990 -
18991 -namespace layout
18992 -{
18993 -
18994 -// Context bits ...
18995 -class ContextImpl
18996 -{
18997 - uno::Reference< awt::XLayoutRoot > mxRoot;
18998 - uno::Reference< container::XNameAccess > mxNameAccess;
18999 - PeerHandle mxTopLevel;
19000 -
19001 -public:
19002 - ContextImpl( char const *pPath )
19003 - {
19004 - uno::Sequence< uno::Any > aParams( 1 );
19005 - aParams[0] <<= OUString( pPath, strlen( pPath ), RTL_TEXTENCODING_UTF8 );
19006 -
19007 - uno::Reference< lang::XSingleServiceFactory > xFactory(
19008 - comphelper::createProcessComponent(
19009 - OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
19010 - uno::UNO_QUERY );
19011 - if ( !xFactory.is() )
19012 - {
19013 - throw uno::RuntimeException(
19014 - OUString( RTL_CONSTASCII_USTRINGPARAM( "Layout engine not installed" ) ),
19015 - uno::Reference< uno::XInterface >() );
19016 - }
19017 - mxRoot = uno::Reference< awt::XLayoutRoot >(
19018 - xFactory->createInstanceWithArguments( aParams ),
19019 - uno::UNO_QUERY );
19020 -
19021 - mxNameAccess = uno::Reference< container::XNameAccess >( mxRoot, uno::UNO_QUERY );
19022 - }
19023 -
19024 - ~ContextImpl()
19025 - {
19026 - }
19027 -
19028 - PeerHandle getByName( const OUString &rName )
19029 - {
19030 - uno::Any val = mxNameAccess->getByName( rName );
19031 - PeerHandle xRet;
19032 - val >>= xRet;
19033 - return xRet;
19034 - }
19035 - PeerHandle getTopLevel() { return mxTopLevel; }
19036 - void setTopLevel( PeerHandle xToplevel ) { mxTopLevel = xToplevel; }
19037 - PeerHandle getRoot() { return mxRoot; }
19038 -};
19039 -
19040 -Context::Context( const char *pPath )
19041 - : pImpl( new ContextImpl( pPath ) )
19042 -{
19043 -}
19044 -Context::~Context()
19045 -{
19046 - delete pImpl;
19047 - pImpl = NULL;
19048 -}
19049 -
19050 -void Context::setToplevel( PeerHandle xToplevel )
19051 -{
19052 - pImpl->setTopLevel( xToplevel );
19053 -}
19054 -
19055 -PeerHandle Context::getToplevel()
19056 -{
19057 - return pImpl->getTopLevel();
19058 -}
19059 -PeerHandle Context::getRoot()
19060 -{
19061 - return pImpl->getRoot();
19062 -}
19063 -
19064 -PeerHandle Context::GetPeerHandle( const char *pId, sal_uInt32 nId ) const
19065 -{
19066 - PeerHandle xHandle;
19067 - xHandle = pImpl->getByName( OUString( pId, strlen( pId ), RTL_TEXTENCODING_UTF8 ) );
19068 - if ( !xHandle.is() )
19069 - {
19070 - DBG_ERROR1( "Failed to fetch widget '%s'", pId );
19071 - }
19072 -
19073 - if ( nId != 0 )
19074 - {
19075 - rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId );
19076 - xHandle = GetPeerHandle( aStr, 0 );
19077 - }
19078 - return xHandle;
19079 -}
19080 -
19081 -IMPL_GET_IMPL( Control );
19082 -
19083 -Window::Window( WindowImpl *pImpl )
19084 - : mpImpl( pImpl )
19085 -{
19086 -}
19087 -
19088 -Window::~Window()
19089 -{
19090 - /* likely to be an UNO object - with floating references */
19091 - mpImpl->wrapperGone();
19092 - mpImpl = NULL;
19093 -}
19094 -
19095 -void Window::SetParent( ::Window *pParent )
19096 -{
19097 - uno::Reference <awt::XWindow> ref( GetPeer(), uno::UNO_QUERY );
19098 - ::Window *window = VCLXWindow::GetImplementation( ref )->GetWindow();
19099 - window->SetParent( pParent );
19100 -}
19101 -
19102 -void Window::SetParent( Window *pParent )
19103 -{
19104 - uno::Reference <awt::XWindow> parentRef( pParent->GetPeer(), uno::UNO_QUERY );
19105 - ::Window *parentWindow = VCLXWindow::GetImplementation( parentRef )->GetWindow();
19106 - SetParent( parentWindow );
19107 -}
19108 -
19109 -Context *Window::getContext()
19110 -{
19111 - return this && mpImpl ? mpImpl->mpCtx : NULL;
19112 -}
19113 -
19114 -PeerHandle Window::GetPeer()
19115 -{
19116 - if ( !mpImpl )
19117 - return PeerHandle();
19118 - return mpImpl->mxWindow;
19119 -}
19120 -
19121 -uno::Reference<awt::XWindow> Window::GetRef()
19122 -{
19123 - return uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY );
19124 -}
19125 -
19126 -VCLXWindow* Window::GetVCLXWindow()
19127 -{
19128 - return VCLXWindow::GetImplementation( GetRef() );
19129 -}
19130 -
19131 -::Window* Window::GetWindow()
19132 -{
19133 - return GetVCLXWindow()->GetWindow();
19134 -}
19135 -
19136 -::Window* Window::GetParent()
19137 -{
19138 - return GetWindow()->GetParent();
19139 -}
19140 -
19141 -struct ToolkitVclPropsMap
19142 -{
19143 - WinBits vclStyle;
19144 - long initAttr;
19145 - const char *propName;
19146 -
19147 - // the value to give the prop to enable/disable it -- not the most brilliant
19148 - // type declaration and storage, but does the work... properties are
19149 - // either a boolean or a short since they are either a directly wrappers for
19150 - // a WinBit, or aggregates related (like Align for WB_LEFT, _RIGHT and _CENTER).
19151 - bool isBoolean;
19152 - short enableProp, disableProp;
19153 -};
19154 -
19155 -#define TYPE_BOOL true
19156 -#define TYPE_SHORT false
19157 -#define NOTYPE 0
19158 -static const ToolkitVclPropsMap toolkitVclPropsMap[] =
19159 -{
19160 - { WB_BORDER, awt::WindowAttribute::BORDER, "Border", TYPE_SHORT, 1, 0 },
19161 - { WB_NOBORDER, awt::VclWindowPeerAttribute::NOBORDER, "Border", TYPE_SHORT, 0, 1 },
19162 - { WB_SIZEABLE, awt::WindowAttribute::SIZEABLE, NULL, NOTYPE, 0, 0 },
19163 - { WB_MOVEABLE, awt::WindowAttribute::MOVEABLE, NULL, NOTYPE, 0, 0 },
19164 - { WB_CLOSEABLE, awt::WindowAttribute::CLOSEABLE, NULL, NOTYPE, 0, 0 },
19165 -
19166 - { WB_HSCROLL, awt::VclWindowPeerAttribute::HSCROLL, NULL, NOTYPE, 0, 0 },
19167 - { WB_VSCROLL, awt::VclWindowPeerAttribute::VSCROLL, NULL, NOTYPE, 0, 0 },
19168 - { WB_LEFT, awt::VclWindowPeerAttribute::LEFT, "Align", TYPE_SHORT, 0, 0 },
19169 - { WB_CENTER, awt::VclWindowPeerAttribute::CENTER, "Align", TYPE_SHORT, 1, 0 },
19170 - { WB_RIGHT, awt::VclWindowPeerAttribute::RIGHT, "Align", TYPE_SHORT, 2, 0 },
19171 - { WB_SPIN, awt::VclWindowPeerAttribute::SPIN, NULL, NOTYPE, 0, 0 },
19172 - { WB_SORT, awt::VclWindowPeerAttribute::SORT, NULL, NOTYPE, 0, 0 },
19173 - { WB_DROPDOWN, awt::VclWindowPeerAttribute::DROPDOWN, "Dropdown", TYPE_BOOL, 1, 0 },
19174 - { WB_DEFBUTTON, awt::VclWindowPeerAttribute::DEFBUTTON, "DefaultButton", TYPE_BOOL, 1, 0 },
19175 - { WB_READONLY, awt::VclWindowPeerAttribute::READONLY, NULL, NOTYPE, 0, 0 },
19176 - { WB_CLIPCHILDREN, awt::VclWindowPeerAttribute::CLIPCHILDREN, NULL, NOTYPE, 0, 0 },
19177 - { WB_GROUP, awt::VclWindowPeerAttribute::GROUP, NULL, NOTYPE, 0, 0 },
19178 -
19179 - { WB_OK, awt::VclWindowPeerAttribute::OK, NULL, NOTYPE, 0, 0 },
19180 - { WB_OK_CANCEL, awt::VclWindowPeerAttribute::OK_CANCEL, NULL, NOTYPE, 0, 0 },
19181 - { WB_YES_NO, awt::VclWindowPeerAttribute::YES_NO, NULL, NOTYPE, 0, 0 },
19182 - { WB_YES_NO_CANCEL, awt::VclWindowPeerAttribute::YES_NO_CANCEL, NULL, NOTYPE, 1, 0 },
19183 - { WB_RETRY_CANCEL, awt::VclWindowPeerAttribute::RETRY_CANCEL, NULL, NOTYPE, 1, 0 },
19184 - { WB_DEF_OK, awt::VclWindowPeerAttribute::DEF_OK, NULL, NOTYPE, 0, 0 },
19185 - { WB_DEF_CANCEL, awt::VclWindowPeerAttribute::DEF_CANCEL, NULL, NOTYPE, 1, 0 },
19186 - { WB_DEF_RETRY, awt::VclWindowPeerAttribute::DEF_RETRY, NULL, NOTYPE, 0, 0 },
19187 - { WB_DEF_YES, awt::VclWindowPeerAttribute::DEF_YES, NULL, NOTYPE, 0, 0 },
19188 - { WB_DEF_NO, awt::VclWindowPeerAttribute::DEF_NO, NULL, NOTYPE, 0, 0 },
19189 -
19190 - { WB_AUTOHSCROLL, awt::VclWindowPeerAttribute::AUTOHSCROLL, "AutoHScroll", TYPE_BOOL, 1, 0 },
19191 - { WB_AUTOVSCROLL, awt::VclWindowPeerAttribute::AUTOVSCROLL, "AutoVScroll", TYPE_BOOL, 1, 0 },
19192 -
19193 - { WB_WORDBREAK, 0, "MultiLine", TYPE_BOOL, 1, 0 },
19194 - { WB_NOPOINTERFOCUS, 0, "FocusOnClick", TYPE_BOOL, 1, 0 },
19195 - { WB_TOGGLE, 0, "Toggle", TYPE_BOOL, 1, 0 },
19196 - { WB_REPEAT, 0, "Repeat", TYPE_BOOL, 1, 0 },
19197 - { WB_NOHIDESELECTION, 0, "HideInactiveSelection", TYPE_BOOL, 1, 0 },
19198 -};
19199 -#undef TYPE_BOOL
19200 -#undef TYPE_SHORT
19201 -#undef NOTYPE
19202 -
19203 -static const int toolkitVclPropsMapLen =
19204 - sizeof( toolkitVclPropsMap ) / sizeof( ToolkitVclPropsMap );
19205 -
19206 -void Window::SetStyle( WinBits nStyle )
19207 -{
19208 - uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
19209 - for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
19210 - {
19211 - if ( toolkitVclPropsMap[ i ].propName )
19212 - {
19213 - short nValue;
19214 - if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
19215 - nValue = toolkitVclPropsMap[ i ].enableProp;
19216 - else
19217 - nValue = toolkitVclPropsMap[ i ].disableProp;
19218 - uno::Any aValue;
19219 - if ( toolkitVclPropsMap[ i ].isBoolean )
19220 - aValue = uno::makeAny( (bool) nValue );
19221 - else
19222 - aValue = uno::makeAny( (short) nValue );
19223 - mpImpl->setProperty( toolkitVclPropsMap[ i ].propName, aValue );
19224 - }
19225 - }
19226 -}
19227 -
19228 -WinBits Window::GetStyle()
19229 -{
19230 - uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
19231 - WinBits ret = 0;
19232 - for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
19233 - {
19234 - if ( toolkitVclPropsMap[ i ].propName )
19235 - {
19236 - short nValue = 0;
19237 - if ( toolkitVclPropsMap[ i ].isBoolean )
19238 - {
19239 - bool bValue = false;
19240 - mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= bValue;
19241 - nValue = bValue ? 1 : 0;
19242 - }
19243 - else
19244 - mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= nValue;
19245 - if ( nValue == toolkitVclPropsMap[ i ].enableProp )
19246 - ret |= toolkitVclPropsMap[i].vclStyle;
19247 - }
19248 - }
19249 - return ret;
19250 -}
19251 -
19252 -/* Unpleasant way to get an xToolkit pointer ... */
19253 -uno::Reference< awt::XToolkit > getToolkit()
19254 -{
19255 - static uno::Reference< awt::XToolkit > xToolkit;
19256 - if (!xToolkit.is())
19257 - {
19258 - // Urgh ...
19259 - xToolkit = uno::Reference< awt::XToolkit >(
19260 - ::comphelper::getProcessServiceFactory()->createInstance(
19261 - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ),
19262 - uno::UNO_QUERY );
19263 - if ( !xToolkit.is() )
19264 - throw uno::RuntimeException(
19265 - OUString( RTL_CONSTASCII_USTRINGPARAM( "failed to create toolkit!") ),
19266 - uno::Reference< uno::XInterface >() );
19267 - }
19268 - return xToolkit;
19269 -}
19270 -
19271 -PeerHandle Window::CreatePeer( Window *pParent, WinBits nStyle, const char *pName)
19272 -{
19273 -
19274 - long nWinAttrbs = 0;
19275 - for ( int i = 0; i < toolkitVclPropsMapLen; i++ )
19276 - if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
19277 - nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
19278 -
19279 - return layoutimpl::createWidget( getToolkit(), pParent->GetPeer(),
19280 - OUString::createFromAscii( pName ), nWinAttrbs );
19281 -}
19282 -
19283 -void Window::Enable( bool bEnable )
19284 -{
19285 - if ( !getImpl().mxWindow.is() )
19286 - return;
19287 - getImpl().mxWindow->setEnable( bEnable );
19288 -}
19289 -
19290 -void Window::Show( BOOL bVisible )
19291 -{
19292 - if ( !getImpl().mxWindow.is() )
19293 - return;
19294 - getImpl().mxWindow->setVisible( bVisible );
19295 -}
19296 -
19297 -void Window::GrabFocus()
19298 -{
19299 - if ( !getImpl().mxWindow.is() )
19300 - return;
19301 - getImpl().mxWindow->setFocus();
19302 -}
19303 -
19304 -class DialogImpl : public WindowImpl
19305 -{
19306 -public:
19307 - uno::Reference< awt::XDialog2 > mxDialog;
19308 - DialogImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19309 - : WindowImpl( pCtx, xPeer, pWindow )
19310 - , mxDialog( xPeer, uno::UNO_QUERY )
19311 - {
19312 - }
19313 -};
19314 -
19315 -IMPL_GET_IMPL( Dialog )
19316 -
19317 -Dialog::Dialog( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
19318 - : Context( pXMLPath )
19319 - , Window( new DialogImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
19320 -{
19321 - if ( pParent )
19322 - SetParent( pParent );
19323 -}
19324 -
19325 -Dialog::Dialog( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
19326 - : Context( pXMLPath )
19327 - , Window( new DialogImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
19328 -{
19329 - if ( pParent )
19330 - SetParent( pParent );
19331 -}
19332 -
19333 -short Dialog::Execute()
19334 -{
19335 - if ( !getImpl().mxDialog.is() )
19336 - return -1;
19337 - return getImpl().mxDialog->execute();
19338 -}
19339 -
19340 -void Dialog::EndDialog( long nResult )
19341 -{
19342 - if ( !getImpl().mxDialog.is() )
19343 - return;
19344 - getImpl().mxDialog->endDialog( nResult );
19345 -}
19346 -
19347 -void Dialog::SetText( String const& rStr )
19348 -{
19349 - if ( !getImpl().mxDialog.is() )
19350 - return;
19351 - getImpl().mxDialog->setTitle( rStr );
19352 -}
19353 -
19354 -class TabPageImpl : public WindowImpl
19355 -{
19356 -public:
19357 - uno::Reference< awt::XWindow > mxTabPage;
19358 - TabPageImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19359 - : WindowImpl( pCtx, xPeer, pWindow )
19360 - , mxTabPage( xPeer, uno::UNO_QUERY )
19361 - {
19362 - }
19363 -};
19364 -
19365 -::Window* TabPage::global_parent = 0;
19366 -
19367 -IMPL_GET_IMPL( TabPage )
19368 -
19369 -TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
19370 - : Context( pXMLPath )
19371 - , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
19372 - , bHasExchangeSupport( false )
19373 - , pSet( set )
19374 -{
19375 - if ( pParent )
19376 - SetParent( pParent );
19377 -}
19378 -
19379 -TabPage::TabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
19380 - : Context( pXMLPath )
19381 - , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
19382 - , bHasExchangeSupport( false )
19383 - , pSet( set )
19384 -{
19385 - if ( pParent )
19386 - SetParent( pParent );
19387 -}
19388 -
19389 -TabPage::~TabPage()
19390 -{
19391 - delete GetTabPage();
19392 -}
19393 -
19394 -IMPL_GET_WINDOW( TabPage );
19395 -
19396 -void TabPage::ActivatePage()
19397 -{
19398 -}
19399 -
19400 -void TabPage::DeactivatePage()
19401 -{
19402 -}
19403 -
19404 -#if 0
19405 -SfxTabPage::SfxTabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
19406 - : TabPage( pParent, pXMLPath, pId, nId )
19407 - , bHasExchangeSupport( false )
19408 - , pSet( set )
19409 -{
19410 -}
19411 -
19412 -SfxTabPage::SfxTabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
19413 - : TabPage( pParent, pXMLPath, pId, nId )
19414 -{
19415 -}
19416 -
19417 -/* FIXME: static method, full c&p from sfx2/source/dialog/tabdlg.cxx */
19418 -//const SfxPoolItem* TabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot )
19419 -const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot )
19420 -
19421 -{
19422 - const SfxItemPool* pPool = rSet.GetPool();
19423 - USHORT nWh = pPool->GetWhich( nSlot );
19424 - const SfxPoolItem* pItem = 0;
19425 -#ifdef DEBUG
19426 - SfxItemState eState;
19427 - eState =
19428 -#endif
19429 - rSet.GetItemState( nWh, TRUE, &pItem ); // -Wall required??
19430 -
19431 - if ( !pItem && nWh != nSlot )
19432 - pItem = &pPool->GetDefaultItem( nWh );
19433 - return pItem;
19434 -}
19435 -#else
19436 -
19437 -#define SfxTabPage TabPage
19438 -
19439 -#endif
19440 -
19441 -void SfxTabPage::Reset( SfxItemSet const& )
19442 -{
19443 -}
19444 -
19445 -class FixedLineImpl : public ControlImpl
19446 -{
19447 -public:
19448 - FixedLineImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19449 - : ControlImpl( pCtx, xPeer, pWindow )
19450 - {
19451 - }
19452 -};
19453 -
19454 -IMPL_CONSTRUCTORS( FixedLine, Control, "hfixedline" );
19455 -IMPL_GET_IMPL( FixedLine )
19456 -
19457 -bool FixedLine::IsEnabled()
19458 -{
19459 - //FIXME
19460 - return true;
19461 -}
19462 -
19463 -class FixedTextImpl : public ControlImpl
19464 -{
19465 -public:
19466 - uno::Reference< awt::XFixedText > mxFixedText;
19467 - FixedTextImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19468 - : ControlImpl( pCtx, xPeer, pWindow )
19469 - , mxFixedText( xPeer, uno::UNO_QUERY )
19470 - {
19471 - }
19472 -
19473 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
19474 - throw (css::uno::RuntimeException)
19475 - {
19476 - mxFixedText.clear();
19477 - }
19478 -};
19479 -
19480 -IMPL_CONSTRUCTORS( FixedText, Control, "fixedtext" );
19481 -IMPL_GET_IMPL( FixedText )
19482 -
19483 -void FixedText::SetText( String const& rStr )
19484 -{
19485 - if ( !getImpl().mxFixedText.is() )
19486 - return;
19487 - getImpl().mxFixedText->setText( rStr );
19488 -}
19489 -
19490 -class FixedInfoImpl : public FixedTextImpl
19491 -{
19492 -public:
19493 - FixedInfoImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19494 - : FixedTextImpl( pCtx, xPeer, pWindow )
19495 - {
19496 - }
19497 -};
19498 -
19499 -IMPL_CONSTRUCTORS( FixedInfo, FixedText, "fixedinfo" );
19500 -IMPL_GET_IMPL( FixedInfo );
19501 -
19502 -class ProgressBarImpl : public ControlImpl
19503 -{
19504 -public:
19505 - uno::Reference< awt::XProgressBar > mxProgressBar;
19506 - ProgressBarImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19507 - : ControlImpl( pCtx, xPeer, pWindow )
19508 - , mxProgressBar( xPeer, uno::UNO_QUERY )
19509 - {
19510 - }
19511 -
19512 - virtual void SAL_CALL disposing( const css::lang::EventObject& /* Source */ )
19513 - throw (css::uno::RuntimeException)
19514 - {
19515 - mxProgressBar.clear();
19516 - }
19517 -};
19518 -
19519 -
19520 -class FixedImageImpl: public ControlImpl
19521 -{
19522 -public:
19523 - uno::Reference< graphic::XGraphic > mxGraphic;
19524 - FixedImageImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow)
19525 -// const char *pName )
19526 - : ControlImpl( pCtx, xPeer, pWindow )
19527 - //, mxGraphic( layoutimpl::loadGraphic( pName ) )
19528 - , mxGraphic( xPeer, uno::UNO_QUERY )
19529 - {
19530 - if ( !mxGraphic.is() )
19531 - {
19532 - DBG_ERROR( "ERROR: failed to load image: `%s'" /*, pName*/ );
19533 - }
19534 -#if 0
19535 - else
19536 - getImpl().mxGraphic->...();
19537 -#endif
19538 - }
19539 -};
19540 -
19541 -IMPL_CONSTRUCTORS( FixedImage, Control, "fixedimage" );
19542 -IMPL_GET_IMPL( FixedImage )
19543 -
19544 -void FixedImage::setImage( ::Image const& i )
19545 -{
19546 - (void) i;
19547 - if ( !getImpl().mxGraphic.is() )
19548 - return;
19549 - //FIXME: hack moved to proplist
19550 - //getImpl().mxGraphic =
19551 -}
19552 -
19553 -#if 0
19554 -
19555 - FixedImage::FixedImage( const char *pName )
19556 - : pImpl( new FixedImageImpl( pName ) )
19557 -{
19558 -}
19559 -
19560 -FixedImage::~FixedImage()
19561 -{
19562 - delete pImpl;
19563 -}
19564 -
19565 -#endif
19566 -
19567 -
19568 -IMPL_CONSTRUCTORS( ProgressBar, Control, "ProgressBar" );
19569 -#if 0
19570 -ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
19571 - : Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
19572 -{
19573 -}
19574 -ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
19575 -// : Control( new ProgressBarImpl( pParent->getContext(), Window::CreatePeer( pParent, nBits, "ProgressBar" ), this ) )
19576 - : Control( new ProgressBarImpl( pParent->getContext(), Window::CreatePeer( pParent, nBits, "progressbar" ), this ) )
19577 -{
19578 -}
19579 -#endif
19580 -
19581 -IMPL_GET_IMPL( ProgressBar );
19582 -
19583 -
19584 -void ProgressBar::SetForegroundColor( css::util::Color color )
19585 -{
19586 - if ( !getImpl().mxProgressBar.is() )
19587 - return;
19588 - getImpl().mxProgressBar->setForegroundColor( color );
19589 -}
19590 -
19591 -void ProgressBar::SetBackgroundColor( css::util::Color color )
19592 -{
19593 - if ( !getImpl().mxProgressBar.is() )
19594 - return;
19595 - getImpl().mxProgressBar->setBackgroundColor( color );
19596 -}
19597 -
19598 -void ProgressBar::SetValue( sal_Int32 i )
19599 -{
19600 - if ( !getImpl().mxProgressBar.is() )
19601 - return;
19602 - getImpl().mxProgressBar->setValue( i );
19603 -}
19604 -
19605 -void ProgressBar::SetRange( sal_Int32 min, sal_Int32 max )
19606 -{
19607 - if ( !getImpl().mxProgressBar.is() )
19608 - return;
19609 - getImpl().mxProgressBar->setRange( min, max );
19610 -}
19611 -
19612 -sal_Int32 ProgressBar::GetValue()
19613 -{
19614 - if ( !getImpl().mxProgressBar.is() )
19615 - return 0;
19616 - return getImpl().mxProgressBar->getValue();
19617 -}
19618 -
19619 -class PluginImpl: public ControlImpl
19620 -{
19621 -public:
19622 - ::Control *mpPlugin;
19623 -
19624 - PluginImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow, :: Control *plugin )
19625 - : ControlImpl( pCtx, xPeer, pWindow )
19626 - , mpPlugin( plugin )
19627 - {
19628 - uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
19629 - layoutimpl::VCLXPlugin *vcl
19630 - = static_cast<layoutimpl::VCLXPlugin*>( VCLXWindow::GetImplementation( ref ) );
19631 - ::Window *parent = vcl->mpWindow->GetParent();
19632 - vcl->SetWindow( plugin );
19633 - vcl->SetPlugin( mpPlugin );
19634 - plugin->SetParent( parent );
19635 - plugin->SetStyle( vcl->mStyle );
19636 - plugin->SetCreatedWithToolkit( TRUE );
19637 - plugin->SetComponentInterface( vcl );
19638 - plugin->Show();
19639 - }
19640 -};
19641 -
19642 -Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
19643 - : Control( new PluginImpl( pCtx, pCtx->GetPeerHandle( pId, 0 ), this, plugin ) )
19644 - , mpPlugin( plugin )
19645 -{
19646 -}
19647 -
19648 -IMPL_GET_IMPL( Plugin );
19649 -
19650 -class LocalizedStringImpl : public WindowImpl
19651 -{
19652 -public:
19653 - layoutimpl::LocalizedString *mpString;
19654 - LocalizedStringImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19655 - : WindowImpl( pCtx, xPeer, pWindow )
19656 - , mpString( static_cast<layoutimpl::LocalizedString*>( VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( mxWindow, uno::UNO_QUERY ) ) ) )
19657 - {
19658 - }
19659 - OUString getText()
19660 - {
19661 - if ( mpString )
19662 - return mpString->getText();
19663 - return OUString();
19664 - }
19665 - void setText( OUString const& s )
19666 - {
19667 - if ( mpString )
19668 - mpString->setText( s );
19669 - }
19670 -};
19671 -
19672 -IMPL_GET_IMPL( LocalizedString );
19673 -
19674 -LocalizedString::LocalizedString( Context *pCtx, char const* pId )
19675 - : Window( new LocalizedStringImpl( pCtx, pCtx->GetPeerHandle( pId, 0 ), this ) )
19676 -{
19677 -}
19678 -
19679 -LocalizedString::operator String ()
19680 -{
19681 - return getImpl().getText();
19682 -}
19683 -
19684 -String LocalizedString::operator= (String const& s)
19685 -{
19686 - getImpl().setText( s );
19687 - return getImpl().getText();
19688 -}
19689 -
19690 -} // namespace layout
19691 --- toolkit/source/vclcompat/wrapper.hxx.old 2009-04-06 16:42:11.000000000 +0000
19692 +++ toolkit/source/vclcompat/wrapper.hxx 1970-01-01 00:00:00.000000000 +0000
19693 @@ -1,138 +0,0 @@
19694 -/*************************************************************************
19695 - *
19696 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19697 - *
19698 - * Copyright 2008 by Sun Microsystems, Inc.
19699 - *
19700 - * OpenOffice.org - a multi-platform office productivity suite
19701 - *
19702 - * $RCSfile: wrapper.hxx,v $
19703 - *
19704 - * $Revision: 1.3 $
19705 - *
19706 - * This file is part of OpenOffice.org.
19707 - *
19708 - * OpenOffice.org is free software: you can redistribute it and/or modify
19709 - * it under the terms of the GNU Lesser General Public License version 3
19710 - * only, as published by the Free Software Foundation.
19711 - *
19712 - * OpenOffice.org is distributed in the hope that it will be useful,
19713 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
19714 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19715 - * GNU Lesser General Public License version 3 for more details
19716 - * (a copy is included in the LICENSE file that accompanied this code).
19717 - *
19718 - * You should have received a copy of the GNU Lesser General Public License
19719 - * version 3 along with OpenOffice.org. If not, see
19720 - * <http://www.openoffice.org/license.html>
19721 - * for a copy of the LGPLv3 License.
19722 - *
19723 - ************************************************************************/
19724 -
19725 -#ifndef WRAPPER_HXX
19726 -#define WRAPPER_HXX
19727 -
19728 -#include <layout/layout.hxx>
19729 -#include <com/sun/star/uno/Reference.hxx>
19730 -#include <com/sun/star/awt/XWindow.hpp>
19731 -#include <com/sun/star/awt/XVclWindowPeer.hpp>
19732 -
19733 -#include <cstring>
19734 -
19735 -namespace layout
19736 -{
19737 -
19738 -namespace css = com::sun::star;
19739 -
19740 -class WindowImpl
19741 -{
19742 - public:
19743 - Window *mpWindow;
19744 - Context *mpCtx;
19745 - css::uno::Reference< css::awt::XWindow > mxWindow;
19746 - css::uno::Reference< css::awt::XVclWindowPeer > mxVclPeer;
19747 -
19748 - WindowImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19749 - : mpWindow( pWindow )
19750 - , mpCtx( pCtx )
19751 - , mxWindow( xPeer, css::uno::UNO_QUERY )
19752 - , mxVclPeer( xPeer, css::uno::UNO_QUERY )
19753 - {
19754 - }
19755 -
19756 - virtual ~WindowImpl()
19757 - {
19758 - }
19759 -
19760 - void wrapperGone()
19761 - {
19762 - mpWindow = NULL;
19763 - mpCtx = NULL;
19764 - if ( mxWindow.is() )
19765 - {
19766 - css::uno::Reference< css::lang::XComponent > xComp( mxWindow, css::uno::UNO_QUERY );
19767 - mxWindow.clear();
19768 - if ( xComp.is() )
19769 - xComp->dispose();
19770 - }
19771 - }
19772 -
19773 - css::uno::Any getProperty( const char *pName )
19774 - {
19775 - if ( !this || !mxVclPeer.is() )
19776 - return css::uno::Any();
19777 - return mxVclPeer->getProperty
19778 - ( rtl::OUString( pName, strlen( pName ), RTL_TEXTENCODING_ASCII_US ) );
19779 - }
19780 - void setProperty( const char *pName, css::uno::Any aAny )
19781 - {
19782 - if ( !this || !mxVclPeer.is() )
19783 - return;
19784 - mxVclPeer->setProperty
19785 - ( rtl::OUString( pName, strlen( pName ), RTL_TEXTENCODING_ASCII_US ), aAny );
19786 - }
19787 -};
19788 -
19789 -class ControlImpl : public WindowImpl
19790 -{
19791 - public:
19792 - ControlImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow )
19793 - : WindowImpl( pCtx, xPeer, pWindow )
19794 - {
19795 - }
19796 -};
19797 -
19798 -inline WindowImpl &Window::getImpl() const
19799 -{ return *(static_cast< WindowImpl * >( mpImpl )); }
19800 -
19801 -// Helpers for defining boiler-plate constructors ...
19802 -// Could in-line in top-level but not with safe static_casts.
19803 -#define IMPL_GET_IMPL(t) \
19804 - inline t##Impl &t::getImpl() const \
19805 - { \
19806 - return *(static_cast<t##Impl *>(mpImpl)); \
19807 - }
19808 -#define IMPL_CONSTRUCTORS(t,par,unoName) \
19809 - t::t( Context *pCtx, const char *pId, sal_uInt32 nId ) \
19810 - : par( new t##Impl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) ) \
19811 - { \
19812 - } \
19813 - t::t( Window *pParent, WinBits nBits) \
19814 - : par( new t##Impl( pParent->getContext(), Window::CreatePeer( pParent, nBits, unoName ), this ) ) \
19815 - { \
19816 - }
19817 -#define IMPL_CONSTRUCTORS_2(t,win_par,other_par,unoName) \
19818 - t::t( Context *pCtx, const char *pId, sal_uInt32 nId ) \
19819 - : win_par( new t##Impl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) ) \
19820 - , other_par( new other_par##Impl( Window::GetPeer() ) ) \
19821 - { \
19822 - } \
19823 - t::t( Window *pParent, WinBits nBits ) \
19824 - : win_par( new t##Impl( pParent->getContext(), Window::CreatePeer( pParent, nBits, unoName ), this ) ) \
19825 - , other_par( new other_par##Impl( Window::GetPeer() ) ) \
19826 - { \
19827 - }
19828 -
19829 -} // namespace layout
19830 -
19831 -#endif // WRAPPER_HXX
19832 --- toolkit/src2xml/source/boxer.py.old 2009-04-02 10:49:37.000000000 +0000
19833 +++ toolkit/src2xml/source/boxer.py 2009-04-06 16:42:13.000000000 +0000
19834 @@ -9,11 +9,11 @@ class DlgLayoutBuilder(object):
19836 def addWidget (self, elem):
19837 x, y = int(elem.getAttr('x')), int(elem.getAttr('y'))
19838 - if self.rows.has_key(y):
19839 - self.rows[y][x] = elem
19840 - else:
19841 - self.rows[y] = {}
19842 - self.rows[y][x] = elem
19843 + self.rows[y] = self.rows.get (y, {})
19844 + while self.rows[y].has_key(x):
19845 + y += 1
19846 + self.rows[y] = self.rows.get (y, {})
19847 + self.rows[y][x] = elem
19849 def build (self):
19850 root = Element('vbox')
19851 @@ -53,6 +53,8 @@ class Boxer(object):
19853 newnode = Element(dlgnode.name)
19854 newnode.clone(dlgnode)
19855 + if dlgnode.name == 'string':
19856 + return newnode
19857 newnode.setAttr("xmlns", "http://openoffice.org/2007/layout")
19858 newnode.setAttr("xmlns:cnt", "http://openoffice.org/2007/layout/container")
19859 mx = DlgLayoutBuilder(newnode)
19860 --- toolkit/src2xml/source/src2xml.py.old 2009-04-06 16:42:11.000000000 +0000
19861 +++ toolkit/src2xml/source/src2xml.py 2009-04-06 16:42:13.000000000 +0000
19862 @@ -127,7 +127,6 @@ def convert (file_name, options):
19863 lexer.includeDirs = options.include_path
19864 lexer.stopOnHeader = options.stopOnHeader
19865 lexer.debugMacro = options.debug_macro
19866 -# lexer.debug = True
19867 if options.debug_lexer:
19868 lexer.debug = True
19869 lexer.tokenize()
19870 @@ -145,8 +144,8 @@ def convert (file_name, options):
19871 if options.debug_parser:
19872 parser.debug = True
19873 root = parser.parse()
19874 - print root.dump()
19875 - return
19876 + s = root.dump()
19877 + return s
19879 # Parse the tokens.
19880 root = parser.parse()
19881 @@ -174,9 +173,11 @@ def post_process (s):
19882 """Make output directly usable by layout module."""
19883 s = re.sub ('(</?)([a-z]+)-([a-z]+)-([a-z]+)', r'\1\2\3\4', s)
19884 s = re.sub ('(</?)([a-z]+)-([a-z]+)', r'\1\2\3', s)
19885 - s = re.sub ('(<(checkbox|radiobutton|(fixed(info|text)))[^>]*) text=', r'\1 label=', s)
19886 + s = re.sub ('(<(checkbox|(cancel|help|ignore|ok|push|more|no|radio|reset|retry|yes)button|(fixed(info|text)))[^>]*) text=', r'\1 label=', s)
19887 s = re.sub (' (height|width|x|y)="[0-9]*"', '', s)
19888 s = re.sub (' (label|text|title)="', r' _\1="', s)
19889 + s = re.sub ('&([^m][^p]*[^;]*)', r'&\1', s)
19890 + s = re.sub (' hide="(TRUE|true|1)"', ' show="false"', s)
19892 s = s.replace ('<modaldialog', '<modaldialog sizeable="true"')
19893 s = s.replace (' rid=', ' id=')
19894 --- toolkit/uiconfig/layout/delzip.old 1970-01-01 00:00:00.000000000 +0000
19895 +++ toolkit/uiconfig/layout/delzip 2009-04-06 16:42:13.000000000 +0000
19896 @@ -0,0 +1 @@
19897 +empty
19898 \ No newline at end of file
19899 --- toolkit/uiconfig/layout/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
19900 +++ toolkit/uiconfig/layout/makefile.mk 2009-04-06 16:42:13.000000000 +0000
19901 @@ -0,0 +1,62 @@
19902 +#*************************************************************************
19903 +#
19904 +# OpenOffice.org - a multi-platform office productivity suite
19905 +#
19906 +# $RCSfile$
19907 +#
19908 +# $Revision$
19909 +#
19910 +# last change: $Author$ $Date$
19911 +#
19912 +# The Contents of this file are made available subject to
19913 +# the terms of GNU Lesser General Public License Version 2.1.
19914 +#
19915 +#
19916 +# GNU Lesser General Public License Version 2.1
19917 +# =============================================
19918 +# Copyright 2005 by Sun Microsystems, Inc.
19919 +# 901 San Antonio Road, Palo Alto, CA 94303, USA
19920 +#
19921 +# This library is free software; you can redistribute it and/or
19922 +# modify it under the terms of the GNU Lesser General Public
19923 +# License version 2.1, as published by the Free Software Foundation.
19924 +#
19925 +# This library is distributed in the hope that it will be useful,
19926 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
19927 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19928 +# Lesser General Public License for more details.
19929 +#
19930 +# You should have received a copy of the GNU Lesser General Public
19931 +# License along with this library; if not, write to the Free Software
19932 +# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
19933 +# MA 02110-1301 USA
19934 +#
19935 +#*************************************************************************
19936 +
19937 +PRJ=../..
19938 +PRJNAME=toolkit
19939 +TARGET=layout
19940 +
19941 +.INCLUDE : settings.mk
19942 +
19943 +.IF "$(ENABLE_LAYOUT)" == "TRUE"
19944 +
19945 +all: ALLTAR
19946 +
19947 +XML_FILES=\
19948 + message-box.xml\
19949 + tab-dialog.xml\
19950 +
19951 +#
19952 +
19953 +.INCLUDE : layout.mk
19954 +
19955 +.ELSE # ENABLE_LAYOUT != TRUE
19956 +all .PHONY:
19957 +.ENDIF # ENABLE_LAYOUT != TRUE
19958 +
19959 +.INCLUDE : target.mk
19960 +
19961 +localize.sdf:
19962 + echo '#empty' | cat - > $@
19963 + rm -f *-$@
19964 --- toolkit/uiconfig/layout/message-box.xml.old 1970-01-01 00:00:00.000000000 +0000
19965 +++ toolkit/uiconfig/layout/message-box.xml 2009-04-06 16:42:13.000000000 +0000
19966 @@ -0,0 +1,41 @@
19967 +<?xml version="1.0" encoding="UTF-8"?>
19968 +<!-- This is a template. i18n translation is not performed in-place;
19969 + i18n translated xml files are generated from this template by
19970 + transex3/layout/tralay. !-->
19971 +
19972 +<modaldialog xmlns="http://openoffice.org/2007/layout"
19973 + xmlns:cnt="http://openoffice.org/2007/layout/container"
19974 + id="message-box" _title="" optimumsize="true"
19975 + has_border="true" sizeable="true" moveable="true" closeable="true">
19976 + <vbox border="5" spacing="5">
19977 + <hbox border="5" spacing="20">
19978 + <align cnt:expand="false" cnt:fill="true">
19979 + <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-error.png" />
19980 + </align>
19981 + <align cnt:expand="false" cnt:fill="true">
19982 + <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-info.png" />
19983 + </align>
19984 + <align cnt:expand="false" cnt:fill="true">
19985 + <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-query.png" />
19986 + </align>
19987 + <align cnt:expand="false" cnt:fill="true">
19988 + <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-warning.png" />
19989 + </align>
19990 + <align cnt:expand="false" cnt:fill="true">
19991 + <fixedtext id="FT_MESSAGE" _label="FT-LABEL" cnt:v-align="0.5" cnt:v-fill="0" />
19992 + </align>
19993 + <flow/>
19994 + </hbox>
19995 + <dialogbuttonhbox border="0" spacing="5">
19996 + <flow/>
19997 + <!-- deprecoted vcl/MsgBox compatibility !-->
19998 + <retrybutton id="BTN_RETRY" />
19999 + <ignorebutton id="BTN_IGNORE" />
20000 +
20001 + <yesbutton id="BTN_YES"/>
20002 + <cancelbutton id="BTN_CANCEL"/>
20003 + <helpbutton id="BTN_HELP"/>
20004 + <nobutton id="BTN_NO" xlabel="~Alternate"/>
20005 + </dialogbuttonhbox>
20006 + </vbox>
20007 +</modaldialog>
20008 --- toolkit/uiconfig/layout/tab-dialog.xml.old 1970-01-01 00:00:00.000000000 +0000
20009 +++ toolkit/uiconfig/layout/tab-dialog.xml 2009-04-06 16:42:13.000000000 +0000
20010 @@ -0,0 +1,20 @@
20011 +<?xml version="1.0" encoding="UTF-8"?>
20012 +
20013 +<dialog xmlns="http://openoffice.org/2007/layout"
20014 + xmlns:cnt="http://openoffice.org/2007/layout/container"
20015 + _title="layout::TabDialog" optimumsize="true"
20016 + id="tab-dialog"
20017 + has_border="true" sizeable="true" moveable="true">
20018 + <vbox spacing="5" border="5">
20019 + <tabcontrol id="ID_TABCONTROL"/>
20020 + <dialogbuttonhbox border="5" spacing="5" cnt:expand="false">
20021 + <flow/>
20022 + <okbutton id="BTN_OK" show="false"/>
20023 + <pushbutton id="BTN_USER" _label="<User>" show="false"/>
20024 + <cancelbutton id="BTN_CANCEL" show="false"/>
20025 + <helpbutton id="BTN_HELP" show="false"/>
20026 + <resetbutton id="BTN_RESET" show="false"/>
20027 + <pushbutton id="BTN_BASEFMT" _label="<Base Format>" show="false"/>
20028 + </dialogbuttonhbox>
20029 + </vbox>
20030 +</dialog>
20031 --- toolkit/util/makefile.mk.old 2009-04-02 10:49:37.000000000 +0000
20032 +++ toolkit/util/makefile.mk 2009-04-06 16:42:13.000000000 +0000
20033 @@ -54,8 +54,8 @@ LIB1FILES= $(SLB)$/awt.lib \
20034 $(SLB)$/tree.lib \
20035 $(SLB)$/controls.lib \
20036 $(SLB)$/helper.lib\
20037 - $(SLB)$/layoutcore.lib \
20038 - $(SLB)$/vclcompat.lib
20039 + $(SLB)$/layout-core.lib \
20040 + $(SLB)$/layout-vcl.lib
20042 SHL1TARGET= tk$(DLLPOSTFIX)
20043 SHL1IMPLIB= itk
20044 --- toolkit/util/makefile.pmk.old 2009-04-02 10:49:37.000000000 +0000
20045 +++ toolkit/util/makefile.pmk 2009-04-06 16:42:13.000000000 +0000
20046 @@ -33,11 +33,8 @@
20047 CDEFS += -DTOOLKIT_DLLIMPLEMENTATION
20048 VISIBILITY_HIDDEN=TRUE
20050 -# FIXME: sprinkle some TOOLKIT_DLLPUBLIC
20051 +CFLAGS+=-I$(PRJ)/source
20053 -CFLAGS+=-I$(PRJ)/inc/layout
20054 .IF "$(ENABLE_LAYOUT)" == "TRUE"
20055 -CFLAGS+=-DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
20056 -.ELSE
20057 -CFLAGS+=-DENABLE_LAYOUT=0
20058 +CFLAGS+=-DTEST_LAYOUT=1
20059 .ENDIF # ENABLE_LAYOUT == TRUE
20060 --- toolkit/workben/layout/.gitignore.old 2009-04-06 16:42:11.000000000 +0000
20061 +++ toolkit/workben/layout/.gitignore 2009-04-06 16:42:13.000000000 +0000
20062 @@ -1,3 +1,4 @@
20063 /de
20064 /en-US
20065 /nl
20066 +/ja
20067 \ No newline at end of file
20068 --- toolkit/workben/layout/TEST.old 1970-01-01 00:00:00.000000000 +0000
20069 +++ toolkit/workben/layout/TEST 2009-04-06 16:42:13.000000000 +0000
20070 @@ -0,0 +1,3 @@
20071 +export OOO_INSTALL_PREFIX=$(cd ../../../../.. && pwd)/ooo-svn
20072 +test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
20073 +LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib ../../unxlngx6.pro/bin/test "$@"
20074 --- toolkit/workben/layout/editor.cxx.old 2009-04-06 16:42:11.000000000 +0000
20075 +++ toolkit/workben/layout/editor.cxx 2009-04-06 16:42:13.000000000 +0000
20076 @@ -57,10 +57,9 @@ using rtl::OUString;
20077 // FIXME:
20078 //#define FILEDLG
20080 -// somewhat of a hack unfortunately ...
20081 -#include "layout/layoutcore.hxx"
20082 -#include "root.hxx"
20083 -#include "helper.hxx"
20084 +#include <layout/core/helper.hxx>
20085 +#include <layout/core/root.hxx>
20086 +#include <layout/core/helper.hxx>
20088 // TODO: automatically generated
20089 struct WidgetSpec {
20090 @@ -86,19 +85,6 @@ static const WidgetSpec WIDGETS_SPECS[]
20091 };
20092 const int WIDGETS_SPECS_LEN = sizeof (WIDGETS_SPECS) / sizeof (WidgetSpec);
20094 -// TEMP: from helper
20095 -namespace layoutimpl {
20096 -
20097 - typedef std::list< std::pair< rtl::OUString, rtl::OUString > > PropList;
20098 -
20099 - css::uno::Reference< css::awt::XLayoutConstrains >
20100 - createWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
20101 - css::uno::Reference< css::uno::XInterface > xParent,
20102 - const rtl::OUString &rName, long nProps, bool bToplevel );
20103 -
20104 - uno::Any anyFromString (const rtl::OUString &value, const uno::Type &type);
20105 -}
20106 -
20107 using namespace layout;
20108 using namespace layoutimpl;
20109 namespace css = ::com::sun::star;
20110 @@ -128,9 +114,9 @@ static rtl::OUString anyToString (uno::A
20111 bool val = value.get<sal_Bool>();
20112 return rtl::OUString( val ? "1" : "0", 1, RTL_TEXTENCODING_ASCII_US );
20113 /* if ( val )
20114 - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
20115 - else
20116 - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );*/
20117 + return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
20118 + else
20119 + return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );*/
20120 }
20121 default:
20122 break;
20123 @@ -147,8 +133,9 @@ static inline double anyToDecimal (uno::
20125 /* XLayoutContainer/XLayoutConstrains are a bit of a hasle to work with.
20126 Let's wrap them. */
20127 -class Widget : public layoutimpl::LayoutWidget {
20128 -friend class EditorRoot;
20129 +class Widget : public layoutimpl::LayoutWidget
20130 +{
20131 + friend class EditorRoot;
20133 Widget *mpParent;
20134 std::vector< Widget *> maChildren;
20135 @@ -165,7 +152,7 @@ public:
20137 // to be used to wrap the root
20138 Widget( uno::Reference< awt::XLayoutConstrains > xImport, const char *label )
20139 - : mpParent( 0 ), mbForeign( true )
20140 + : mpParent( 0 ), mbForeign( true )
20141 {
20142 mxWidget = xImport;
20143 mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
20144 @@ -189,20 +176,20 @@ public:
20145 Widget( rtl::OUString id, uno::Reference< awt::XToolkit > xToolkit,
20146 uno::Reference< awt::XLayoutContainer > xParent,
20147 rtl::OUString unoName, long nAttrbs )
20148 - : mpParent( 0 ), mbForeign( false ), mrId( id ),
20149 - mnOriAttrbs( nAttrbs )
20150 + : mpParent( 0 ), mbForeign( false ), mrId( id ),
20151 + mnOriAttrbs( nAttrbs )
20152 {
20153 - while ( xParent.is() && !uno::Reference< awt::XWindow >( xParent, uno::UNO_QUERY ).is() )
20154 - {
20155 - uno::Reference< awt::XLayoutContainer > xContainer( xParent, uno::UNO_QUERY );
20156 - assert( xContainer.is() );
20157 - xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
20158 - }
20159 -
20160 - mxWidget = layoutimpl::createWidget( xToolkit, xParent, unoName, nAttrbs );
20161 + while ( xParent.is() && !uno::Reference< awt::XWindow >( xParent, uno::UNO_QUERY ).is() )
20162 + {
20163 + uno::Reference< awt::XLayoutContainer > xContainer( xParent, uno::UNO_QUERY );
20164 + assert( xContainer.is() );
20165 + xParent = uno::Reference< awt::XLayoutContainer >( xContainer->getParent(), uno::UNO_QUERY );
20166 + }
20167 +
20168 + mxWidget = WidgetFactory::createWidget( xToolkit, xParent, unoName, nAttrbs );
20169 assert( mxWidget.is() );
20170 mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
20171 -
20172 +
20173 mrLabel = mrUnoName = unoName;
20174 // try to get a nicer label for the widget
20175 for ( int i = 0; i < WIDGETS_SPECS_LEN; i++ )
20176 @@ -212,21 +199,21 @@ public:
20177 mrLabel = rtl::OUString( label, strlen( label ), RTL_TEXTENCODING_UTF8 );
20178 break;
20179 }
20180 -
20181 +
20182 // set default Text property
20183 // TODO: disable editing of text fields, check boxes selected, etc...
20184 #if 0
20185 uno::Reference< awt::XVclWindowPeer> xVclPeer( mxWidget, uno::UNO_QUERY )
20186 - if ( xVclPeer.is() ) // XVclWindowPeer ignores missing / incorrect properties
20187 + if ( xVclPeer.is() ) // XVclWindowPeer ignores missing / incorrect properties
20189 //FIXME: it looks odd on widgets like NumericField seeing text which is deleted
20190 // when you interact with it... We can avoid it for those widgets, by doing a getProp
20191 // of "Text" and check if it is empty or not.
20192 -
20193 - xVclPeer->setProperty( rtl::OUString::createFromAscii( "Text" ),
20194 - uno::makeAny( rtl::OUString::createFromAscii( "new widget" ) ) );
20195 +
20196 + xVclPeer->setProperty( rtl::OUString::createFromAscii( "Text" ),
20197 + uno::makeAny( rtl::OUString::createFromAscii( "new widget" ) ) );
20198 #endif
20199 -
20200 +
20201 // store original properties
20202 {
20203 PropertyIterator it( this, WINDOW_PROPERTY );
20204 @@ -394,7 +381,7 @@ public:
20205 std::vector< Widget *> aChildChildren = pChild->maChildren;
20207 for ( std::vector< Widget *>::const_iterator it = aChildChildren.begin();
20208 - it != aChildChildren.end(); it++ )
20209 + it != aChildChildren.end(); it++ )
20210 pChild->removeChild( *it );
20212 for ( std::vector< Widget *>::const_iterator it = aChildChildren.begin();
20213 @@ -402,10 +389,10 @@ public:
20214 if ( !addChild( *it ) )
20215 { // failure
20216 for ( std::vector< Widget *>::const_iterator jt = aChildChildren.begin();
20217 - jt != it; jt++ )
20218 + jt != it; jt++ )
20219 removeChild( *jt );
20220 for ( std::vector< Widget *>::const_iterator jt = aChildChildren.begin();
20221 - jt != aChildChildren.end(); jt++ )
20222 + jt != aChildChildren.end(); jt++ )
20223 pChild->addChild( *jt );
20224 return false;
20225 }
20226 @@ -425,7 +412,7 @@ public:
20227 {
20228 int i = 0;
20229 for ( std::vector< Widget *>::const_iterator it = maChildren.begin();
20230 - it != maChildren.end(); it++, i++ )
20231 + it != maChildren.end(); it++, i++ )
20232 if ( *it == pChild )
20233 break;
20234 return i;
20235 @@ -499,7 +486,7 @@ public:
20236 case CONTAINER_PROPERTY:
20237 if ( mpParent )
20238 rValue = anyToString( layoutimpl::prophlp::getProperty(
20239 - mpParent->mxContainer->getChildProperties( mxWidget ), rPropName ) );
20240 + mpParent->mxContainer->getChildProperties( mxWidget ), rPropName ) );
20241 break;
20242 case WINBITS_PROPERTY:
20243 // TODO
20244 @@ -546,7 +533,7 @@ public:
20245 int nPropIt;
20247 PropertyIterator( Widget *pWidget, PropertyKind rKind )
20248 - : mrKind( rKind ), nPropIt( 0 )
20249 + : mrKind( rKind ), nPropIt( 0 )
20250 {
20251 switch ( rKind )
20252 {
20253 @@ -588,10 +575,10 @@ public:
20254 beans::Property next()
20255 {
20256 /* rtl::OUString propName, propValue;
20257 - propName = maProps[ nPropIt ];
20258 - propValue = getProperty( propName, mrKind, false);
20259 - nPropIt++;
20260 - return std::pair< rtl::OUString, rtl::OUString > propPair( propName, propValue );*/
20261 + propName = maProps[ nPropIt ];
20262 + propValue = getProperty( propName, mrKind, false);
20263 + nPropIt++;
20264 + return std::pair< rtl::OUString, rtl::OUString > propPair( propName, propValue );*/
20265 return maProps[ nPropIt++ ];
20266 }
20267 };
20268 @@ -603,13 +590,13 @@ class EditorRoot : public layoutimpl::La
20269 public:
20270 EditorRoot( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
20271 Widget *pParent )
20272 - : layoutimpl::LayoutRoot( xFactory ), mpParent( pParent )
20273 + : layoutimpl::LayoutRoot( xFactory ), mpParent( pParent )
20274 {
20275 }
20277 // generation
20278 virtual layoutimpl::LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName,
20279 - long attrbs, uno::Reference< awt::XLayoutContainer > xParent )
20280 + long attrbs, uno::Reference< awt::XLayoutContainer > xParent )
20281 {
20282 if ( unoName.compareToAscii( "dialog" ) == 0 )
20283 return mpParent;
20284 @@ -629,126 +616,126 @@ public:
20285 /* Working with the layout in 1D, as if it was a flat list. */
20286 namespace FlatLayout
20287 {
20288 - Widget *next( Widget *pWidget )
20289 - {
20290 - Widget *pNext;
20291 - pNext = pWidget->down();
20292 - if ( pNext ) return pNext;
20293 - pNext = pWidget->next();
20294 - if ( pNext ) return pNext;
20295 - for ( Widget *pUp = pWidget->up(); pUp != NULL; pUp = pUp->up() )
20296 - if ( (pNext = pUp->next()) != NULL )
20297 - return pNext;
20298 - return NULL;
20299 - }
20300 +Widget *next( Widget *pWidget )
20301 +{
20302 + Widget *pNext;
20303 + pNext = pWidget->down();
20304 + if ( pNext ) return pNext;
20305 + pNext = pWidget->next();
20306 + if ( pNext ) return pNext;
20307 + for ( Widget *pUp = pWidget->up(); pUp != NULL; pUp = pUp->up() )
20308 + if ( (pNext = pUp->next()) != NULL )
20309 + return pNext;
20310 + return NULL;
20311 +}
20313 /*
20314 - Widget *prev( Widget *pWidget )
20315 - {
20316 - Widget *pPrev;
20317 - pPrev = pWidget->prev();
20318 - if ( !pPrev )
20319 - return pWidget->up();
20320 -
20321 - Widget *pBottom = pPrev->down();
20322 - if ( pBottom )
20323 - {
20324 - while ( pBottom->down() || pBottom->next() )
20325 - {
20326 - for ( Widget *pNext = pBottom->next(); pNext; pNext = pNext->next() )
20327 - pBottom = pNext;
20328 - Widget *pDown = pBottom->down();
20329 - if ( pDown )
20330 - pBottom = pDown;
20331 - }
20332 - return pBottom;
20333 - }
20334 - return pPrev;
20335 - }
20336 + Widget *prev( Widget *pWidget )
20337 + {
20338 + Widget *pPrev;
20339 + pPrev = pWidget->prev();
20340 + if ( !pPrev )
20341 + return pWidget->up();
20342 +
20343 + Widget *pBottom = pPrev->down();
20344 + if ( pBottom )
20345 + {
20346 + while ( pBottom->down() || pBottom->next() )
20347 + {
20348 + for ( Widget *pNext = pBottom->next(); pNext; pNext = pNext->next() )
20349 + pBottom = pNext;
20350 + Widget *pDown = pBottom->down();
20351 + if ( pDown )
20352 + pBottom = pDown;
20353 + }
20354 + return pBottom;
20355 + }
20356 + return pPrev;
20357 + }
20358 */
20360 - bool moveWidget( Widget *pWidget, bool up /*or down*/ )
20361 - {
20362 - // Keep child parent&pos for in case of failure
20363 - Widget *pOriContainer = pWidget->up();
20364 - unsigned int oriChildPos = pOriContainer->getChildPos( pWidget );
20365 -
20366 - // Get parent&sibling before removing it, since relations get cut
20367 - Widget *pSibling = up ? pWidget->prev() : pWidget->next();
20368 - Widget *pContainer = pWidget->up();
20369 - if ( !pContainer )
20370 - return false;
20371 +bool moveWidget( Widget *pWidget, bool up /*or down*/ )
20372 +{
20373 + // Keep child parent&pos for in case of failure
20374 + Widget *pOriContainer = pWidget->up();
20375 + unsigned int oriChildPos = pOriContainer->getChildPos( pWidget );
20376 +
20377 + // Get parent&sibling before removing it, since relations get cut
20378 + Widget *pSibling = up ? pWidget->prev() : pWidget->next();
20379 + Widget *pContainer = pWidget->up();
20380 + if ( !pContainer )
20381 + return false;
20383 - // try to swap with parent or child
20384 - // We need to allow for this at least for the root node...
20385 - if ( !pSibling )
20386 + // try to swap with parent or child
20387 + // We need to allow for this at least for the root node...
20388 + if ( !pSibling )
20389 + {
20390 + if ( up )
20391 + {
20392 + if ( pContainer->swapWithChild( pWidget ) )
20393 + return true;
20394 + }
20395 + else
20396 {
20397 - if ( up )
20398 - {
20399 - if ( pContainer->swapWithChild( pWidget ) )
20400 - return true;
20401 - }
20402 - else
20403 - {
20404 // TODO: this is a nice feature, but we probably want to do it explicitely...
20405 #if 0
20406 - if ( pWidget->down() && pWidget->swapWithChild( pWidget->down() ) )
20407 - return true;
20408 + if ( pWidget->down() && pWidget->swapWithChild( pWidget->down() ) )
20409 + return true;
20410 #endif
20411 - }
20412 }
20413 + }
20415 - pContainer->removeChild( pWidget );
20416 -
20417 - // if has up sibling -- append to it, else swap with it
20418 - if ( pSibling )
20419 - {
20420 - if ( pSibling->addChild( pWidget, up ? 0xffff : 0 ) )
20421 - return true;
20422 + pContainer->removeChild( pWidget );
20424 - unsigned int childPos = pContainer->getChildPos( pSibling );
20425 - if ( pContainer->addChild( pWidget, childPos + (up ? 0 : 1) ) )
20426 - return true; // should always be succesful
20427 - }
20428 - // go through parents -- try to get prepended to them
20429 - else
20430 - {
20431 - for ( ; pContainer && pContainer->up(); pContainer = pContainer->up() )
20432 - {
20433 - unsigned int childPos = pContainer->up()->getChildPos( pContainer );
20434 - if ( pContainer->up()->addChild( pWidget, childPos + (up ? 0 : 1) ) )
20435 - return true;
20436 - }
20437 - }
20438 + // if has up sibling -- append to it, else swap with it
20439 + if ( pSibling )
20440 + {
20441 + if ( pSibling->addChild( pWidget, up ? 0xffff : 0 ) )
20442 + return true;
20444 - // failed -- try to get it to its old position
20445 - if ( !pOriContainer->addChild( pWidget, oriChildPos ) )
20446 + unsigned int childPos = pContainer->getChildPos( pSibling );
20447 + if ( pContainer->addChild( pWidget, childPos + (up ? 0 : 1) ) )
20448 + return true; // should always be succesful
20449 + }
20450 + // go through parents -- try to get prepended to them
20451 + else
20452 + {
20453 + for ( ; pContainer && pContainer->up(); pContainer = pContainer->up() )
20454 {
20455 - // a parent should never reject a child back. but if it ever
20456 - // happens, just kill it, we don't run an orphanate here ;P
20457 - delete pWidget;
20458 - return true;
20459 + unsigned int childPos = pContainer->up()->getChildPos( pContainer );
20460 + if ( pContainer->up()->addChild( pWidget, childPos + (up ? 0 : 1) ) )
20461 + return true;
20462 }
20463 - return false;
20464 }
20466 - // NOTE: root is considered to be number -1
20467 - Widget *get( Widget *pRoot, int nb )
20468 + // failed -- try to get it to its old position
20469 + if ( !pOriContainer->addChild( pWidget, oriChildPos ) )
20470 {
20471 - Widget *it;
20472 - for ( it = pRoot; it != NULL && nb >= 0; it = next( it ) )
20473 - nb--;
20474 - return it;
20475 - }
20476 -
20477 - int get( Widget *pRoot, Widget *pWidget )
20478 - {
20479 - int nRet = -1;
20480 - Widget *it;
20481 - for ( it = pRoot; it != NULL && it != pWidget; it = next( it ) )
20482 - nRet++;
20483 - return nRet;
20484 + // a parent should never reject a child back. but if it ever
20485 + // happens, just kill it, we don't run an orphanate here ;P
20486 + delete pWidget;
20487 + return true;
20488 }
20489 + return false;
20490 +}
20491 +
20492 +// NOTE: root is considered to be number -1
20493 +Widget *get( Widget *pRoot, int nb )
20494 +{
20495 + Widget *it;
20496 + for ( it = pRoot; it != NULL && nb >= 0; it = next( it ) )
20497 + nb--;
20498 + return it;
20499 +}
20500 +
20501 +int get( Widget *pRoot, Widget *pWidget )
20502 +{
20503 + int nRet = -1;
20504 + Widget *it;
20505 + for ( it = pRoot; it != NULL && it != pWidget; it = next( it ) )
20506 + nRet++;
20507 + return nRet;
20508 +}
20509 }
20511 //** PropertiesList widget
20512 @@ -766,7 +753,7 @@ class PropertiesList : public layout::Ta
20513 DECL_LINK( FlagToggledHdl, layout::CheckBox* );
20515 AnyWidget( Widget *pWidget, rtl::OUString aPropName, Widget::PropertyKind aPropKind )
20516 - : mpWidget( pWidget ), maPropName( aPropName ), maPropKind( aPropKind )
20517 + : mpWidget( pWidget ), maPropName( aPropName ), maPropKind( aPropKind )
20518 {
20519 mpFlag = 0;
20520 mbBlockFlagCallback = false;
20521 @@ -844,7 +831,7 @@ class PropertiesList : public layout::Ta
20523 AnyEdit( Widget *pWidget, rtl::OUString aPropName,
20524 Widget::PropertyKind aPropKind, layout::Window *pWinParent )
20525 - : AnyWidget( pWidget, aPropName, aPropKind ), layout::HBox( 0, false ), mpWinParent( pWinParent )
20526 + : AnyWidget( pWidget, aPropName, aPropKind ), layout::HBox( 0, false ), mpWinParent( pWinParent )
20527 {
20528 mpEdit = NULL;
20529 mpExpand = new layout::PushButton( pWinParent, WB_TOGGLE );
20530 @@ -872,7 +859,7 @@ class PropertiesList : public layout::Ta
20531 if ( mpEdit )
20532 {
20533 text = mpEdit->GetText();
20534 -printf("Remove mpEdit and expand\n");
20535 + printf("Remove mpEdit and expand\n");
20536 Remove( mpEdit );
20537 Remove( mpExpand );
20538 delete mpEdit;
20539 @@ -966,7 +953,7 @@ printf("Remove mpEdit and expand\n");
20540 {
20541 AnyInteger( Widget *pWidget, rtl::OUString aPropName,
20542 Widget::PropertyKind aPropKind, Window *pWinParent )
20543 - : AnyWidget( pWidget, aPropName, aPropKind ), NumericField( pWinParent, WB_SPIN|WB_BORDER )
20544 + : AnyWidget( pWidget, aPropName, aPropKind ), NumericField( pWinParent, WB_SPIN|WB_BORDER )
20545 {
20546 load();
20547 SetModifyHdl( LINK( this, AnyInteger, ApplyPropertyHdl ) );
20548 @@ -995,7 +982,7 @@ printf("Remove mpEdit and expand\n");
20549 {
20550 AnyFloat( Widget *pWidget, rtl::OUString aPropName,
20551 Widget::PropertyKind aPropKind, Window *pWinParent )
20552 - : AnyInteger( pWidget, aPropName, aPropKind, pWinParent )
20553 + : AnyInteger( pWidget, aPropName, aPropKind, pWinParent )
20554 {}
20556 virtual void store()
20557 @@ -1008,7 +995,7 @@ printf("Remove mpEdit and expand\n");
20558 {
20559 AnyCheckBox( Widget *pWidget, rtl::OUString aPropName,
20560 Widget::PropertyKind aPropKind, layout::Window *pWinParent )
20561 - : AnyWidget( pWidget, aPropName, aPropKind ), layout::CheckBox( pWinParent )
20562 + : AnyWidget( pWidget, aPropName, aPropKind ), layout::CheckBox( pWinParent )
20563 {
20564 // adding some whitespaces to make the hit area larger
20565 // SetText( String::CreateFromAscii( "" ) );
20566 @@ -1052,7 +1039,7 @@ printf("Remove mpEdit and expand\n");
20567 {
20568 AnyListBox( Widget *pWidget, rtl::OUString aPropName,
20569 Widget::PropertyKind aPropKind, Window *pWinParent )
20570 - : AnyWidget( pWidget, aPropName, aPropKind ), layout::ListBox( pWinParent, WB_DROPDOWN )
20571 + : AnyWidget( pWidget, aPropName, aPropKind ), layout::ListBox( pWinParent, WB_DROPDOWN )
20572 {
20573 SetSelectHdl( LINK( this, AnyWidget, ApplyPropertyHdl ) );
20574 }
20575 @@ -1076,7 +1063,7 @@ printf("Remove mpEdit and expand\n");
20576 {
20577 AnyAlign( Widget *pWidget, rtl::OUString aPropName,
20578 Widget::PropertyKind aPropKind, Window *pWinParent )
20579 - : AnyListBox( pWidget, aPropName, aPropKind, pWinParent )
20580 + : AnyListBox( pWidget, aPropName, aPropKind, pWinParent )
20581 {
20582 InsertEntry( XubString::CreateFromAscii( "Left" ) );
20583 InsertEntry( XubString::CreateFromAscii( "Center" ) );
20584 @@ -1092,7 +1079,7 @@ printf("Remove mpEdit and expand\n");
20585 {
20586 AnyComboBox( Widget *pWidget, rtl::OUString aPropName,
20587 Widget::PropertyKind aPropKind, Window *pWinParent )
20588 - : AnyWidget( pWidget, aPropName, aPropKind ), layout::ComboBox( pWinParent, WB_DROPDOWN )
20589 + : AnyWidget( pWidget, aPropName, aPropKind ), layout::ComboBox( pWinParent, WB_DROPDOWN )
20590 {
20591 SetModifyHdl( LINK( this, AnyComboBox, ApplyPropertyHdl ) );
20592 }
20593 @@ -1116,7 +1103,7 @@ printf("Remove mpEdit and expand\n");
20594 {
20595 AnyFontStyle( Widget *pWidget, rtl::OUString aPropName,
20596 Widget::PropertyKind aPropKind, Window *pWinParent )
20597 - : AnyComboBox( pWidget, aPropName, aPropKind, pWinParent )
20598 + : AnyComboBox( pWidget, aPropName, aPropKind, pWinParent )
20599 {
20600 InsertEntry( XubString::CreateFromAscii( "Bold" ) );
20601 InsertEntry( XubString::CreateFromAscii( "Italic" ) );
20602 @@ -1130,71 +1117,71 @@ printf("Remove mpEdit and expand\n");
20603 layout::CheckBox *mpFlag;
20604 AnyWidget *mpValue;
20606 - public:
20607 - PropertyEntry( layout::Window *pWinParent, AnyWidget *pAnyWidget )
20608 + public:
20609 + PropertyEntry( layout::Window *pWinParent, AnyWidget *pAnyWidget )
20610 + {
20611 + mpLabel = new layout::FixedText( pWinParent );
20612 {
20613 - mpLabel = new layout::FixedText( pWinParent );
20614 - {
20615 - // append ':' to aPropName
20616 - rtl::OUStringBuffer buf( pAnyWidget->maPropName );
20617 - buf.append( sal_Unicode (':') );
20618 - mpLabel->SetText( buf.makeStringAndClear() );
20619 - }
20620 - mpValue = pAnyWidget;
20621 - mpFlag = new layout::CheckBox( pWinParent );
20622 - mpFlag->SetToggleHdl( LINK( mpValue, AnyWidget, FlagToggledHdl ) );
20623 - mpValue->mpFlag = mpFlag;
20624 + // append ':' to aPropName
20625 + rtl::OUStringBuffer buf( pAnyWidget->maPropName );
20626 + buf.append( sal_Unicode (':') );
20627 + mpLabel->SetText( buf.makeStringAndClear() );
20628 }
20629 + mpValue = pAnyWidget;
20630 + mpFlag = new layout::CheckBox( pWinParent );
20631 + mpFlag->SetToggleHdl( LINK( mpValue, AnyWidget, FlagToggledHdl ) );
20632 + mpValue->mpFlag = mpFlag;
20633 + }
20635 - ~PropertyEntry()
20636 - {
20637 + ~PropertyEntry()
20638 + {
20639 #if DEBUG_PRINT
20640 fprintf(stderr, "REMOVING label, flag and value\n");
20641 #endif
20642 - delete mpLabel;
20643 - delete mpFlag;
20644 - delete mpValue;
20645 - }
20646 + delete mpLabel;
20647 + delete mpFlag;
20648 + delete mpValue;
20649 + }
20651 - // Use this factory rather than the constructor -- check for NULL
20652 - static PropertyEntry *construct( Widget *pWidget, rtl::OUString aPropName,
20653 - Widget::PropertyKind aPropKind, sal_uInt16 nType,
20654 - layout::Window *pWinParent )
20655 - {
20656 - AnyWidget *pAnyWidget;
20657 - switch (nType) {
20658 - case uno::TypeClass_STRING:
20659 - if ( aPropName.compareToAscii( "FontStyleName" ) == 0 )
20660 - {
20661 - pAnyWidget = new AnyFontStyle( pWidget, aPropName, aPropKind, pWinParent );
20662 - break;
20663 - }
20664 - pAnyWidget = new AnyEdit( pWidget, aPropName, aPropKind, pWinParent );
20665 - break;
20666 - case uno::TypeClass_SHORT:
20667 - if ( aPropName.compareToAscii( "Align" ) == 0 )
20668 - {
20669 - pAnyWidget = new AnyAlign( pWidget, aPropName, aPropKind, pWinParent );
20670 - break;
20671 - }
20672 - // otherwise, treat as any other number...
20673 - case uno::TypeClass_LONG:
20674 - case uno::TypeClass_UNSIGNED_LONG:
20675 - pAnyWidget = new AnyInteger( pWidget, aPropName, aPropKind, pWinParent );
20676 - break;
20677 - case uno::TypeClass_FLOAT:
20678 - case uno::TypeClass_DOUBLE:
20679 - pAnyWidget = new AnyFloat( pWidget, aPropName, aPropKind, pWinParent );
20680 + // Use this factory rather than the constructor -- check for NULL
20681 + static PropertyEntry *construct( Widget *pWidget, rtl::OUString aPropName,
20682 + Widget::PropertyKind aPropKind, sal_uInt16 nType,
20683 + layout::Window *pWinParent )
20684 + {
20685 + AnyWidget *pAnyWidget;
20686 + switch (nType) {
20687 + case uno::TypeClass_STRING:
20688 + if ( aPropName.compareToAscii( "FontStyleName" ) == 0 )
20689 + {
20690 + pAnyWidget = new AnyFontStyle( pWidget, aPropName, aPropKind, pWinParent );
20691 break;
20692 - case uno::TypeClass_BOOLEAN:
20693 - pAnyWidget = new AnyCheckBox( pWidget, aPropName, aPropKind, pWinParent );
20694 + }
20695 + pAnyWidget = new AnyEdit( pWidget, aPropName, aPropKind, pWinParent );
20696 + break;
20697 + case uno::TypeClass_SHORT:
20698 + if ( aPropName.compareToAscii( "Align" ) == 0 )
20699 + {
20700 + pAnyWidget = new AnyAlign( pWidget, aPropName, aPropKind, pWinParent );
20701 break;
20702 - default:
20703 - return NULL;
20704 - }
20705 - return new PropertyEntry( pWinParent, pAnyWidget );
20706 + }
20707 + // otherwise, treat as any other number...
20708 + case uno::TypeClass_LONG:
20709 + case uno::TypeClass_UNSIGNED_LONG:
20710 + pAnyWidget = new AnyInteger( pWidget, aPropName, aPropKind, pWinParent );
20711 + break;
20712 + case uno::TypeClass_FLOAT:
20713 + case uno::TypeClass_DOUBLE:
20714 + pAnyWidget = new AnyFloat( pWidget, aPropName, aPropKind, pWinParent );
20715 + break;
20716 + case uno::TypeClass_BOOLEAN:
20717 + pAnyWidget = new AnyCheckBox( pWidget, aPropName, aPropKind, pWinParent );
20718 + break;
20719 + default:
20720 + return NULL;
20721 }
20722 - };
20723 + return new PropertyEntry( pWinParent, pAnyWidget );
20724 + }
20725 + };
20727 layout::Window *mpParentWindow;
20729 @@ -1241,12 +1228,12 @@ printf("Remove mpEdit and expand\n");
20730 return true;
20731 } while ( min <= max );
20732 return false;
20733 - }
20734 + }
20736 public:
20737 PropertiesList( layout::Dialog *dialog )
20738 - : layout::Table( dialog, "properties-box" )
20739 - , mpParentWindow( dialog ), mpSeparator( 0 )
20740 + : layout::Table( dialog, "properties-box" )
20741 + , mpParentWindow( dialog ), mpSeparator( 0 )
20742 {
20743 }
20745 @@ -1310,7 +1297,7 @@ public:
20746 Container::Clear();
20748 for ( std::list< PropertyEntry* >::iterator it = maPropertiesList.begin();
20749 - it != maPropertiesList.end(); it++)
20750 + it != maPropertiesList.end(); it++)
20751 delete *it;
20752 maPropertiesList.clear();
20754 @@ -1370,14 +1357,14 @@ IMPL_LINK( PropertiesList::PropertyEntry
20755 class SortListBox
20756 { // For a manual sort ListBox; asks for a ListBox and Up/Down/Remove
20757 // buttons to wrap
20758 -DECL_LINK( ItemSelectedHdl, layout::ListBox* );
20759 -DECL_LINK( UpPressedHdl, layout::Button* );
20760 -DECL_LINK( DownPressedHdl, layout::Button* );
20761 -DECL_LINK( RemovePressedHdl, layout::Button* );
20762 -layout::PushButton *mpUpButton, *mpDownButton, *mpRemoveButton;
20763 + DECL_LINK( ItemSelectedHdl, layout::ListBox* );
20764 + DECL_LINK( UpPressedHdl, layout::Button* );
20765 + DECL_LINK( DownPressedHdl, layout::Button* );
20766 + DECL_LINK( RemovePressedHdl, layout::Button* );
20767 + layout::PushButton *mpUpButton, *mpDownButton, *mpRemoveButton;
20769 protected:
20770 -layout::ListBox *mpListBox;
20771 + layout::ListBox *mpListBox;
20773 virtual void upPressed( USHORT nPos )
20774 {
20775 @@ -1423,8 +1410,8 @@ layout::ListBox *mpListBox;
20776 public:
20777 SortListBox( layout::ListBox *pListBox, layout::PushButton *pUpButton, layout::PushButton *pDownButton,
20778 layout::PushButton *pRemoveButton )
20779 - : mpUpButton( pUpButton), mpDownButton( pDownButton), mpRemoveButton( pRemoveButton ),
20780 - mpListBox( pListBox )
20781 + : mpUpButton( pUpButton), mpDownButton( pDownButton), mpRemoveButton( pRemoveButton ),
20782 + mpListBox( pListBox )
20783 {
20784 mpListBox->SetSelectHdl( LINK( this, SortListBox, ItemSelectedHdl ) );
20786 @@ -1508,10 +1495,10 @@ public:
20787 Widget *mpRootWidget;
20789 LayoutTree( layout::Dialog *dialog )
20790 - : SortListBox( new layout::ListBox( dialog, "layout-tree" ),
20791 - new layout::PushButton( dialog, "layout-up-button" ),
20792 - new layout::PushButton( dialog, "layout-down-button" ),
20793 - new layout::PushButton( dialog, "layout-remove-button" ) )
20794 + : SortListBox( new layout::ListBox( dialog, "layout-tree" ),
20795 + new layout::PushButton( dialog, "layout-up-button" ),
20796 + new layout::PushButton( dialog, "layout-down-button" ),
20797 + new layout::PushButton( dialog, "layout-remove-button" ) )
20798 {
20799 layout::PeerHandle handle = dialog->GetPeerHandle( "preview-box" );
20800 uno::Reference< awt::XLayoutConstrains > xWidget( handle, uno::UNO_QUERY );
20801 @@ -1609,7 +1596,7 @@ public:
20802 for ( int kind = 0; kind < 2; kind++ )
20803 {
20804 Widget::PropertyKind wKind = kind == 0 ? Widget::WINDOW_PROPERTY
20805 - : Widget::CONTAINER_PROPERTY;
20806 + : Widget::CONTAINER_PROPERTY;
20807 Widget::PropertyIterator it( i, wKind );
20808 while ( it.hasNext() )
20809 {
20810 @@ -1621,16 +1608,16 @@ public:
20811 if ( prop.Type.getTypeClass() == uno::TypeClass_BOOLEAN )
20812 {
20813 if ( value.compareToAscii( "0" ) )
20814 - value = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("false") );
20815 + value = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("false") );
20816 else
20817 - value = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("true") );
20818 + value = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("true") );
20819 }
20821 if ( value.getLength() > 0 )
20822 printf("%s%s=\"%s\" ",
20823 - kind == 0 ? "" : "cnt:",
20824 - OUSTRING_CSTR( toXMLNaming( prop.Name ) ), OUSTRING_CSTR( value )
20825 - );
20826 + kind == 0 ? "" : "cnt:",
20827 + OUSTRING_CSTR( toXMLNaming( prop.Name ) ), OUSTRING_CSTR( value )
20828 + );
20830 }
20831 }
20832 @@ -1711,7 +1698,7 @@ class EditorImpl : public LayoutTree::Li
20833 public:
20835 EditorImpl( layout::Dialog *dialog,
20836 - // we should probable open this channel (or whatever its called) ourselves
20837 + // we should probable open this channel (or whatever its called) ourselves
20838 uno::Reference< lang::XMultiServiceFactory > xMSF );
20839 virtual ~EditorImpl();
20841 @@ -1746,7 +1733,7 @@ EditorImpl::EditorImpl( layout::Dialog *
20842 mpLayoutTree->setListener( this );
20844 /* if ( xImport.is() )
20845 - mpLayoutTree->getWidget( -1 )->addChild( new Widget( xImport, "import" ) );*/
20846 + mpLayoutTree->getWidget( -1 )->addChild( new Widget( xImport, "import" ) );*/
20848 // create buttons
20849 layout::Container aWidgets( dialog, "create-widget" );
20850 @@ -1789,7 +1776,7 @@ EditorImpl::~EditorImpl()
20851 delete mpPropertiesList;
20852 delete mpLayoutTree;
20853 for ( std::list< layout::PushButton * >::const_iterator i = maCreateButtons.begin();
20854 - i != maCreateButtons.end(); i++)
20855 + i != maCreateButtons.end(); i++)
20856 delete *i;
20857 delete pImportButton;
20858 delete pExportButton;
20859 @@ -1869,13 +1856,13 @@ void EditorImpl::widgetSelected( Widget
20860 if ( !pWidget || pWidget->isContainer() )
20861 {
20862 for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
20863 - it != maCreateButtons.end(); it++)
20864 + it != maCreateButtons.end(); it++)
20865 (*it)->Enable();
20866 }
20867 else
20868 {
20869 for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
20870 - it != maCreateButtons.end(); it++)
20871 + it != maCreateButtons.end(); it++)
20872 (*it)->Disable();
20873 }
20875 @@ -1886,7 +1873,7 @@ IMPL_LINK( EditorImpl, CreateWidgetHdl,
20876 {
20877 int i = 0;
20878 for ( std::list< layout::PushButton *>::const_iterator it = maCreateButtons.begin();
20879 - it != maCreateButtons.end(); it++, i++ )
20880 + it != maCreateButtons.end(); it++, i++ )
20881 {
20882 if ( pBtn == *it )
20883 break;
20884 --- toolkit/workben/layout/insert-sheet.xml.old 1970-01-01 00:00:00.000000000 +0000
20885 +++ toolkit/workben/layout/insert-sheet.xml 2009-04-06 16:42:13.000000000 +0000
20886 @@ -0,0 +1,57 @@
20887 +<?xml version="1.0" encoding="UTF-8"?>
20888 +<!-- This is a template. i18n translation is not performed in-place;
20889 + i18n translated XML files are generated from this template by
20890 + transex3/layout/tralay. !-->
20891 +
20892 +<modaldialog sizeable="true" closeable="true" moveable="true" output-size="true" id="RID_SCDLG_INSERT_TABLE" sv-look="true" _title="Insert Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
20893 + <vbox spacing="5" border="5">
20894 + <fixedline id="FL_POSITION" _text="Position"/>
20895 + <hbox>
20896 + <vbox cnt:padding="13" spacing="5">
20897 + <radiobutton radiogroup="insert-sheet-position" id="RB_BEFORE" tabstop="true" _label="B~efore current sheet"/>
20898 + <radiobutton radiogroup="insert-sheet-position" id="RB_BEHIND" tabstop="true" _label="~After current sheet"/>
20899 + </vbox>
20900 + </hbox>
20901 + <fixedline id="FL_TABLE" _text="Sheet"/>
20902 + <hbox>
20903 + <vbox cnt:padding="13" spacing="5">
20904 + <radiobutton radiogroup="insert-sheet-source" id="RB_NEW" _label="~New sheet"/>
20905 + <hbox>
20906 + <vbox cnt:padding="13" spacing="5" cnt:fill="false" cnt:expand="false">
20907 + <fixedtext id="FT_COUNT" _label="N~o. of sheets"/>
20908 + <fixedtext id="FT_NAME" _label="Na~me"/>
20909 + </vbox>
20910 + <vbox>
20911 + <hbox>
20912 + <numericfield has_border="true" maximum="256" minimum="1" repeat="true" id="NF_COUNT" spin="true" spin-size="1" tabstop="true" value="1" cnt:fill="true" cnt:expand="false"/>
20913 + </hbox>
20914 + <edit has_border="true" id="ED_TABNAME" cnt:fill="true" cnt:expand="true"/>
20915 + </vbox>
20916 + </hbox>
20917 + </vbox>
20918 + </hbox>
20919 + <hbox>
20920 + <vbox cnt:padding="13" spacing="5">
20921 + <radiobutton radiogroup="insert-sheet-source" id="RB_FROMFILE" _label="~From file"/>
20922 + <hbox>
20923 + <vbox cnt:padding="13" spacing="5">
20924 + <hbox>
20925 + <multilistbox auto-hscroll="true" has_border="true" id="LB_TABLES" simple-mode="true" string-item-list=" : : : : " cnt:fill="true" cnt:expand="true"/>
20926 + <vbox cnt:fill="false" cnt:expand="false" spacing="5">
20927 + <pushbutton id="BTN_BROWSE" _label="~Browse..." cnt:expand="false"/>
20928 + <checkbox id="CB_LINK" _label="Lin~k" cnt:expand="false"/>
20929 + <flow/>
20930 + </vbox>
20931 + </hbox>
20932 + <fixedtext id="FT_PATH" label="FT-PATH"/>
20933 + </vbox>
20934 + </hbox>
20935 + </vbox>
20936 + </hbox>
20937 + <dialogbuttonhbox border="5" spacing="5">
20938 + <okbutton default="true" id="BTN_OK"/>
20939 + <cancelbutton id="BTN_CANCEL"/>
20940 + <helpbutton id="BTN_HELP"/>
20941 + </dialogbuttonhbox>
20942 + </vbox>
20943 +</modaldialog>
20944 --- toolkit/workben/layout/makefile.mk.old 2009-04-06 16:42:11.000000000 +0000
20945 +++ toolkit/workben/layout/makefile.mk 2009-04-06 16:42:13.000000000 +0000
20946 @@ -40,15 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
20948 .IF "$(ENABLE_LAYOUT)" == "TRUE"
20950 -CFLAGS += -I$(PRJ)/source/layout
20951 -
20952 # Allow zoom and wordcount to be built without depending on svx,sv,sfx2
20953 -CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc
20954 +CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc -I../$(PRJ)/sw/inc
20956 .INCLUDE : $(PRJ)$/util$/makefile.pmk
20958 -CFLAGS += -DENABLE_LAYOUT=1 -DTEST_LAYOUT=1
20959 -
20960 .IF "$(COMNAME)" == "gcc3"
20961 CFLAGS+=-Wall -Wno-non-virtual-dtor
20962 .ENDIF
20963 @@ -92,15 +88,20 @@ default: ALLTAR
20964 .INCLUDE : target.mk
20966 XML_FILES=\
20967 + insert-sheet.xml\
20968 + message-box.xml\
20969 + move-copy-sheet.xml\
20970 recover.xml\
20971 sort-options.xml\
20972 + string-input.xml\
20973 + tab-dialog.xml\
20974 wordcount.xml\
20975 zoom.xml\
20977 TRALAY=tralay
20978 XML_LANGS=$(alllangiso)
20980 -ALLTAR: $(BIN)/testrc $(svtools) $(foreach,i,$(XML_FILES) en-US/$i)
20981 +ALLTAR: localize.sdf $(BIN)/testrc $(svtools) $(foreach,i,$(XML_FILES) en-US/$i)
20983 $(XML_LANGS:f:t"/%.xml ")/%.xml: %.xml
20984 $(TRALAY) -m localize.sdf -o . -l $(XML_LANGS:f:t" -l ") $<
20985 @@ -119,12 +120,16 @@ $(svtools):
20986 ln -sf ..$/$(PRJ)$/svtools$/inc $(INCCOM)$/svtools
20988 dist .PHONY :
20989 + cp -pv message-box.xml $(PRJ)/uiconfig/layout
20990 + cp -pv tab-dialog.xml $(PRJ)/uiconfig/layout
20991 $(SHELL) ./un-test.sh zoom.cxx > ../$(PRJ)/svx/source/dialog/zoom.cxx
20992 $(SHELL) ./un-test.sh zoom.hxx > ../$(PRJ)/svx/source/dialog/zoom.hxx
20993 touch ../$(PRJ)/svx/source/dialog/dlgfact.cxx
20994 + cp -pv zoom.xml ../$(PRJ)/svx/uiconfig/layout
20995 $(SHELL) ./un-test.sh wordcountdialog.cxx > ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.cxx
20996 $(SHELL) ./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
20997 touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
20998 + cp -pv wordcount.xml ../$(PRJ)/sw/uiconfig/layout
20999 # FIXME: broken setup
21000 ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx
21001 $(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
21002 @@ -133,6 +138,17 @@ dist .PHONY :
21003 $(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
21004 touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
21005 touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
21006 + cp -pv insert-sheet.xml ../$(PRJ)/sc/uiconfig/layout
21007 + cp -pv move-copy-sheet.xml ../$(PRJ)/sc/uiconfig/layout
21008 + cp -pv sort-options.xml ../$(PRJ)/sc/uiconfig/layout
21009 + cp -pv string-input.xml ../$(PRJ)/sc/uiconfig/layout
21010 +
21011 +localize.sdf: $(PRJ)/../svx/source/dialog/localize.sdf $(PRJ)/../sw/source/ui/dialog/localize.sdf $(PRJ)/../sc/source/ui/src/localize.sdf
21012 + grep sortdlg.src $(PRJ)/../sc/source/ui/src/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sort-options-$@
21013 + grep wordcountdialog.src $(PRJ)/../sw/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
21014 + grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
21015 + echo '#empty' | cat - sort-options-$@ wordcount-$@ zoom-$@ > $@
21016 + rm -f *-$@
21018 .ELSE # ENABLE_LAYOUT != TRUE
21019 all .PHONY:
21020 --- toolkit/workben/layout/message-box.xml.old 1970-01-01 00:00:00.000000000 +0000
21021 +++ toolkit/workben/layout/message-box.xml 2009-04-06 16:42:13.000000000 +0000
21022 @@ -0,0 +1,41 @@
21023 +<?xml version="1.0" encoding="UTF-8"?>
21024 +<!-- This is a template. i18n translation is not performed in-place;
21025 + i18n translated xml files are generated from this template by
21026 + transex3/layout/tralay. !-->
21027 +
21028 +<modaldialog xmlns="http://openoffice.org/2007/layout"
21029 + xmlns:cnt="http://openoffice.org/2007/layout/container"
21030 + id="message-box" _title="" optimumsize="true"
21031 + has_border="true" sizeable="true" moveable="true" closeable="true">
21032 + <vbox border="5" spacing="5">
21033 + <hbox border="5" spacing="20">
21034 + <align cnt:expand="false" cnt:fill="true">
21035 + <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-error.png" />
21036 + </align>
21037 + <align cnt:expand="false" cnt:fill="true">
21038 + <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-info.png" />
21039 + </align>
21040 + <align cnt:expand="false" cnt:fill="true">
21041 + <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-query.png" />
21042 + </align>
21043 + <align cnt:expand="false" cnt:fill="true">
21044 + <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-warning.png" />
21045 + </align>
21046 + <align cnt:expand="false" cnt:fill="true">
21047 + <fixedtext id="FT_MESSAGE" _label="FT-LABEL" cnt:v-align="0.5" cnt:v-fill="0" />
21048 + </align>
21049 + <flow/>
21050 + </hbox>
21051 + <dialogbuttonhbox border="0" spacing="5">
21052 + <flow/>
21053 + <!-- deprecoted vcl/MsgBox compatibility !-->
21054 + <retrybutton id="BTN_RETRY" />
21055 + <ignorebutton id="BTN_IGNORE" />
21056 +
21057 + <yesbutton id="BTN_YES"/>
21058 + <cancelbutton id="BTN_CANCEL"/>
21059 + <helpbutton id="BTN_HELP"/>
21060 + <nobutton id="BTN_NO" xlabel="~Alternate"/>
21061 + </dialogbuttonhbox>
21062 + </vbox>
21063 +</modaldialog>
21064 --- toolkit/workben/layout/move-copy-sheet.xml.old 1970-01-01 00:00:00.000000000 +0000
21065 +++ toolkit/workben/layout/move-copy-sheet.xml 2009-04-06 16:42:13.000000000 +0000
21066 @@ -0,0 +1,21 @@
21067 +<?xml version="1.0" encoding="UTF-8"?>
21068 +<!-- This is a template. i18n translation is not performed in-place;
21069 + i18n translated XML files are generated from this template by
21070 + transex3/layout/tralay. !-->
21071 +
21072 +<modaldialog sizeable="true" closeable="true" help-id="FID_TAB_MOVE" moveable="true" output-size="true" id="RID_SCDLG_MOVETAB" sv-look="true" _title="Move/Copy Sheet" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container">
21073 + <vbox spacing="5" border="5">
21074 + <string id="STR_NEWDOC" _text="- new document -"/>
21075 + <fixedtext id="FT_DEST" _label="To ~document"/>
21076 + <listbox has_border="true" dropdown="true" id="LB_DEST" tabstop="true"/>
21077 + <fixedtext id="FT_INSERT" _label="~Insert before"/>
21078 + <listbox has_border="true" id="LB_INSERT" tabstop="true" string-item-list=" : : : : " />
21079 + <checkbox id="BTN_COPY" tabstop="true" _label="~Copy"/>
21080 + <dialogbuttonhbox border="5" spacing="5">
21081 + <flow/>
21082 + <cancelbutton id="BTN_CANCEL" tabstop="true"/>
21083 + <helpbutton id="BTN_HELP" tabstop="true"/>
21084 + <okbutton default="true" id="BTN_OK" tabstop="true"/>
21085 + </dialogbuttonhbox>
21086 + </vbox>
21087 +</modaldialog>
21088 --- toolkit/workben/layout/recover.cxx.old 2009-04-02 10:49:37.000000000 +0000
21089 +++ toolkit/workben/layout/recover.cxx 2009-04-06 16:42:13.000000000 +0000
21090 @@ -55,6 +55,13 @@ using namespace com::sun::star;
21092 #include <layout/layout-pre.hxx>
21094 +#if ENABLE_LAYOUT
21095 +#undef SVX_RES
21096 +#define SVX_RES(x) #x
21097 +#undef SfxModalDialog
21098 +#define SfxModalDialog( parent, id ) Dialog( parent, "recover.xml", id )
21099 +#endif /* ENABLE_LAYOUT */
21100 +
21101 #if TEST_LAYOUT
21102 SvxRecoverDialog::SvxRecoverDialog( Window* pParent )
21103 #else /* !TEST_LAYOUT */
21104 --- toolkit/workben/layout/recover.hxx.old 2009-04-02 10:49:37.000000000 +0000
21105 +++ toolkit/workben/layout/recover.hxx 2009-04-06 16:42:13.000000000 +0000
21106 @@ -35,7 +35,7 @@
21107 #include <vcl/button.hxx>
21108 #include <vcl/field.hxx>
21109 #include <vcl/fixed.hxx>
21110 -#include <box.hxx>
21111 +#include <layout/core/box.hxx>
21112 #include <layout/layout-pre.hxx>
21114 class SvxRecoverDialog : public SfxModalDialog
21115 --- toolkit/workben/layout/sort-options.xml.old 2009-04-06 16:42:11.000000000 +0000
21116 +++ toolkit/workben/layout/sort-options.xml 2009-04-06 16:42:13.000000000 +0000
21117 @@ -33,8 +33,8 @@
21118 <listbox has_border="true" dropdown="true" id="LB_ALGORITHM" tabstop="true"/>
21119 </hbox>
21120 <fixedline id="FL_DIRECTION" _text="Direction"/>
21121 - <radiobutton id="BTN_TOP_DOWN" tabstop="true" _label="~Top to bottom (sort rows)"/>
21122 - <radiobutton id="BTN_LEFT_RIGHT" tabstop="true" _label="L~eft to right (sort columns)"/>
21123 + <radiobutton id="BTN_TOP_DOWN" radiogroup="sort-options" tabstop="true" _label="~Top to bottom (sort rows)"/>
21124 + <radiobutton id="BTN_LEFT_RIGHT" radiogroup="sort-options" tabstop="true" _label="L~eft to right (sort columns)"/>
21125 </vbox>
21126 </vbox>
21127 </tabpage>
21128 --- toolkit/workben/layout/sortdlg.cxx.old 2009-04-06 16:42:11.000000000 +0000
21129 +++ toolkit/workben/layout/sortdlg.cxx 2009-04-06 16:42:13.000000000 +0000
21130 @@ -42,8 +42,9 @@
21131 #include "scresid.hxx"
21132 #include "sortdlg.hrc"
21134 -
21135 -//==================================================================
21136 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
21137 +#include <layout/layout-pre.hxx>
21138 +#endif
21140 ScSortDlg::ScSortDlg( Window* pParent,
21141 const SfxItemSet* pArgSet ) :
21142 @@ -54,8 +55,15 @@ ScSortDlg::ScSortDlg( Window* pParent,
21143 bIsByRows ( FALSE )
21145 {
21146 +#ifdef LAYOUT_SFX_TABDIALOG_BROKEN
21147 AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 );
21148 AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
21149 +#else
21150 + String fields = rtl::OUString::createFromAscii ("fields");
21151 + AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
21152 + String options = rtl::OUString::createFromAscii ("options");
21153 + AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
21154 +#endif
21155 FreeResource();
21156 }
21158 --- toolkit/workben/layout/sortdlg.hxx.old 2009-04-06 16:42:11.000000000 +0000
21159 +++ toolkit/workben/layout/sortdlg.hxx 2009-04-06 16:42:13.000000000 +0000
21160 @@ -33,11 +33,15 @@
21162 #include <sfx2/tabdlg.hxx>
21164 -#ifndef _SFX_HXX
21165 +#if !TEST_LAYOUT
21166 +#define LAYOUT_SFX_TABDIALOG_BROKEN 1
21167 +#endif /* !TEST_LAYOUT */
21168 +
21169 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
21170 +#include <sfx2/layout.hxx>
21171 +#include <layout/layout-pre.hxx>
21172 #endif
21174 -//==================================================================
21175 -
21176 class ScSortDlg : public SfxTabDialog
21177 {
21178 public:
21179 @@ -61,7 +65,8 @@ inline void ScSortDlg::SetByRows ( BOOL
21180 inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; }
21181 inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; }
21183 +#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
21184 +#include <layout/layout-post.hxx>
21185 +#endif
21187 #endif // SC_SORTDLG_HXX
21188 -
21189 -
21190 --- toolkit/workben/layout/string-input.xml.old 1970-01-01 00:00:00.000000000 +0000
21191 +++ toolkit/workben/layout/string-input.xml 2009-04-06 16:42:13.000000000 +0000
21192 @@ -0,0 +1,16 @@
21193 +<?xml version="1.0" encoding="UTF-8"?>
21194 +<!-- This is a template. i18n translation is not performed in-place;
21195 + i18n translated XML files are generated from this template by
21196 + transex3/layout/tralay. !-->
21197 +
21198 +<modaldialog sizeable="true" closeable="false" moveable="true" output-size="true" id="RID_SCDLG_STRINPUT" sv-look="true" xmlns="http://openoffice.org/2007/layout" xmlns:cnt="http://openoffice.org/2007/layout/container" title="Insert String">
21199 + <vbox spacing="5" border="5">
21200 + <fixedtext id="FT_LABEL" label="FT-LABEL"/>
21201 + <edit has_border="true" id="ED_INPUT" tabstop="true"/>
21202 + <dialogbuttonhbox border="5" spacing="5">
21203 + <okbutton default="true" id="BTN_OK" tabstop="true"/>
21204 + <cancelbutton id="BTN_CANCEL" tabstop="true"/>
21205 + <helpbutton id="BTN_HELP" tabstop="true"/>
21206 + </dialogbuttonhbox>
21207 + </vbox>
21208 +</modaldialog>
21209 --- toolkit/workben/layout/tab-dialog.xml.old 1970-01-01 00:00:00.000000000 +0000
21210 +++ toolkit/workben/layout/tab-dialog.xml 2009-04-06 16:42:13.000000000 +0000
21211 @@ -0,0 +1,20 @@
21212 +<?xml version="1.0" encoding="UTF-8"?>
21213 +
21214 +<dialog xmlns="http://openoffice.org/2007/layout"
21215 + xmlns:cnt="http://openoffice.org/2007/layout/container"
21216 + _title="layout::TabDialog" optimumsize="true"
21217 + id="tab-dialog"
21218 + has_border="true" sizeable="true" moveable="true">
21219 + <vbox spacing="5" border="5">
21220 + <tabcontrol id="ID_TABCONTROL"/>
21221 + <dialogbuttonhbox border="5" spacing="5" cnt:expand="false">
21222 + <flow/>
21223 + <okbutton id="BTN_OK" show="false"/>
21224 + <pushbutton id="BTN_USER" _label="<User>" show="false"/>
21225 + <cancelbutton id="BTN_CANCEL" show="false"/>
21226 + <helpbutton id="BTN_HELP" show="false"/>
21227 + <resetbutton id="BTN_RESET" show="false"/>
21228 + <pushbutton id="BTN_BASEFMT" _label="<Base Format>" show="false"/>
21229 + </dialogbuttonhbox>
21230 + </vbox>
21231 +</dialog>
21232 --- toolkit/workben/layout/tabcontrol.xml.old 2009-04-02 10:49:37.000000000 +0000
21233 +++ toolkit/workben/layout/tabcontrol.xml 2009-04-06 16:42:13.000000000 +0000
21234 @@ -1,18 +1,18 @@
21235 <?xml version="1.0" encoding="UTF-8"?>
21237 <dialog xmlns="http://openoffice.org/2007/layout"
21238 - xmlns:cnt="http://openoffice.org/2007/layout/container"
21239 - title="TabControl Test" optimumsize="true"
21240 - has_border="true" sizeable="true" moveable="true">
21241 - <vbox>
21242 - <tabcontrol>
21243 - <pushbutton label="Child 1" cnt:title="Page 1" />
21244 - <edit has_border="true" text="Child 2" cnt:title="Page 2" />
21245 - <vbox cnt:title="Page 3">
21246 - <pushbutton label="Child 3"/>
21247 - <edit has_border="true" text="Child 4" />
21248 - </vbox>
21249 - </tabcontrol>
21250 - <okbutton cnt:expand="false" />
21251 - </vbox>
21252 + xmlns:cnt="http://openoffice.org/2007/layout/container"
21253 + title="TabControl Test" optimumsize="true"
21254 + has_border="true" sizeable="true" moveable="true">
21255 + <vbox>
21256 + <tabcontrol>
21257 + <pushbutton label="Child 1" cnt:title="Page 1" />
21258 + <edit has_border="true" text="Child 2" cnt:title="Page 2" />
21259 + <vbox cnt:title="Page 3">
21260 + <pushbutton label="Child 3"/>
21261 + <edit has_border="true" text="Child 4" />
21262 + </vbox>
21263 + </tabcontrol>
21264 + <okbutton cnt:expand="false" />
21265 + </vbox>
21266 </dialog>
21267 --- toolkit/workben/layout/test.cxx.old 2009-04-06 16:42:11.000000000 +0000
21268 +++ toolkit/workben/layout/test.cxx 2009-04-06 16:42:13.000000000 +0000
21269 @@ -238,19 +238,21 @@ void LayoutTest::RunEditor()
21270 editor.Execute();
21271 }
21273 -void RunDialog( Dialog& dialog )
21274 +short RunDialog( Dialog& dialog )
21275 {
21276 dialog.Show();
21277 - dialog.Execute();
21278 - fprintf( stderr, "Done: dialog execute exited\n" );
21279 + short result = dialog.Execute();
21280 + fprintf( stderr, "Done: dialog execute exited:%d\n", result);
21281 + return result;
21282 }
21284 #undef Dialog
21285 -void RunDialog( ::Dialog& dialog )
21286 +short RunDialog( ::Dialog& dialog )
21287 {
21288 dialog.Show();
21289 - dialog.Execute();
21290 - fprintf( stderr, "Done: dialog execute exited\n" );
21291 + short result = dialog.Execute();
21292 + fprintf( stderr, "Done: dialog execute exited:%d\n", result);
21293 + return result;
21294 }
21296 #if SORT_DLG
21297 @@ -271,6 +273,19 @@ void TestDialog( OUString const& name )
21298 PluginDialog plugin ( 0 );
21299 RunDialog( plugin );
21300 }
21301 + else if ( name.equalsAscii( "query" ) )
21302 + {
21303 + QueryBox query ( 0, "Do you want to do?", "do");
21304 + RunDialog( query );
21305 + }
21306 + else if ( name.equalsAscii( "query-compat" ) )
21307 + {
21308 + QueryBox query ( 0,
21309 + WinBits( WB_YES_NO | WB_DEF_YES ),
21310 +// WinBits( WB_ABORT_RETRY_IGNORE ),
21311 + OUString::createFromAscii ("Do you want to do?"));
21312 + RunDialog( query );
21313 + }
21314 else if ( name.equalsAscii( "recover" ) )
21315 {
21316 SvxRecoverDialog recover ( 0 );
21317 @@ -280,7 +295,7 @@ void TestDialog( OUString const& name )
21318 else if ( name.equalsAscii( "sort" ) )
21319 {
21320 LoadSC();
21321 - ScSortDlg sort ( 0, 0 );
21322 + ScSortDlg sort (0, 0);
21323 RunDialog( sort );
21324 }
21325 #endif /* SORT_DLG */
21326 --- toolkit/workben/layout/tpsort.cxx.old 2009-04-06 16:42:11.000000000 +0000
21327 +++ toolkit/workben/layout/tpsort.cxx 2009-04-06 16:42:13.000000000 +0000
21328 @@ -7,7 +7,7 @@
21329 * OpenOffice.org - a multi-platform office productivity suite
21330 *
21331 * $RCSfile: tpsort.cxx,v $
21332 - * $Revision: 1.13 $
21333 + * $Revision: 1.14 $
21334 *
21335 * This file is part of OpenOffice.org.
21336 *
21337 @@ -554,7 +554,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHd
21338 #undef ScResId
21339 #define ScResId(x) #x
21340 #undef SfxTabPage
21341 -#define SfxTabPage( parent, id, args ) TabPage( parent, "sort-options.xml", id, 0, &args )
21342 +#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
21343 #endif /* ENABLE_LAYOUT */
21345 ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
21346 @@ -584,6 +584,7 @@ ScTabPageSortOptions::ScTabPageSortOptio
21347 // aFtArea ( this, ScResId( FT_AREA ) ),
21348 //
21349 #if ENABLE_LAYOUT
21350 +#undef this
21351 #undef ScResId
21352 #define ScResId(x) this, #x
21353 #endif /* ENABLE_LAYOUT */
21354 @@ -748,7 +749,6 @@ USHORT* __EXPORT ScTabPageSortOptions::G
21356 #if ENABLE_LAYOUT
21357 #undef SfxTabPage
21358 -#define SfxTabPage TabPage
21359 #endif /* ENABLE_LAYOUT */
21360 SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
21361 Window* pParent,
21362 --- toolkit/workben/layout/tpsort.hxx.old 2009-04-06 16:42:11.000000000 +0000
21363 +++ toolkit/workben/layout/tpsort.hxx 2009-04-06 16:42:13.000000000 +0000
21364 @@ -132,7 +132,7 @@ class ScRangeData;
21365 class CollatorRessource;
21366 class CollatorWrapper;
21368 -#include <layout/layout.hxx>
21369 +#include <sfx2/layout.hxx>
21370 #include <layout/layout-pre.hxx>
21372 class ScTabPageSortOptions : public SfxTabPage
21373 @@ -142,12 +142,10 @@ public:
21374 const SfxItemSet& rArgSet );
21375 ~ScTabPageSortOptions();
21377 -#if !ENABLE_LAYOUT
21378 +#undef SfxTabPage
21379 +#define SfxTabPage ::SfxTabPage
21380 static SfxTabPage* Create ( Window* pParent,
21381 const SfxItemSet& rArgSet );
21382 -#else /* ENABLE_LAYOUT */
21383 - static TabPage* Create ( Window* parent, SfxItemSet const& set );
21384 -#endif /* ENABLE_LAYOUT */
21385 static USHORT* GetRanges ();
21386 virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
21387 virtual void Reset ( const SfxItemSet& rArgSet );
21388 @@ -185,13 +183,9 @@ private:
21390 // FixedText aFtAreaLabel;
21391 // FixedInfo aFtArea;
21392 -#if ENABLE_LAYOUT
21393 -#define String layout::LocalizedString
21394 -#endif /* ENABLE_LAYOUT */
21395 - String aStrRowLabel;
21396 - String aStrColLabel;
21397 - String aStrUndefined;
21398 -#undef String
21399 + LocalizedString aStrRowLabel;
21400 + LocalizedString aStrColLabel;
21401 + LocalizedString aStrUndefined;
21402 String aStrNoName;
21403 String aStrAreaLabel;
21405 --- toolkit/workben/layout/uno.hxx.old 2009-04-06 16:42:11.000000000 +0000
21406 +++ toolkit/workben/layout/uno.hxx 2009-04-06 16:42:13.000000000 +0000
21407 @@ -37,8 +37,8 @@
21408 #include <com/sun/star/lang/XInitialization.hpp>
21409 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
21411 -#include "root.hxx"
21412 -#include "factory.hxx"
21413 +#include <layout/core/root.hxx>
21414 +#include <layout/core/factory.hxx>
21416 #if LAYOUT_WEAK
21417 #include <cppuhelper/implbase1.hxx>
21418 --- toolkit/workben/layout/wordcount.xml.old 2009-04-02 10:49:37.000000000 +0000
21419 +++ toolkit/workben/layout/wordcount.xml 2009-04-06 16:42:13.000000000 +0000
21420 @@ -7,7 +7,7 @@
21421 xmlns:cnt="http://openoffice.org/2007/layout/container"
21422 help-id="HID_DLG_WORDCOUNT"
21423 id="DLG_WORDCOUNT"
21424 - sizeable="true" moveable="true" optimumsize="true"
21425 + sizeable="true" moveable="true" optimumsize="true" closeable="true"
21426 has_border="true" sv-look="true" _title="Word Count">
21427 <vbox border="5" spacing="5">
21428 <fixedline id="FL_CURRENT" _text="Current selection"/>
21429 @@ -26,7 +26,7 @@
21430 </vbox>
21431 </hbox>
21432 <!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
21433 - and reope the hbox/vbox thing !-->
21434 + and reopen the hbox/vbox thing !-->
21435 <fixedline id="FL_DOC" _text="Whole document"/>
21436 <hbox>
21437 <vbox cnt:padding="13" spacing="5">
21438 --- toolkit/workben/layout/wordcountdialog.cxx.old 2009-04-06 16:42:11.000000000 +0000
21439 +++ toolkit/workben/layout/wordcountdialog.cxx 2009-04-06 16:42:13.000000000 +0000
21440 @@ -7,7 +7,7 @@
21441 * OpenOffice.org - a multi-platform office productivity suite
21442 *
21443 * $RCSfile: wordcountdialog.cxx,v $
21444 - * $Revision: 1.4 $
21445 + * $Revision: 1.10 $
21446 *
21447 * This file is part of OpenOffice.org.
21448 *
21449 @@ -47,6 +47,15 @@
21450 #include <wordcountdialog.hrc>
21451 #endif /* !TEST_LAYOUT */
21453 +#if ENABLE_LAYOUT
21454 +#undef SW_RES
21455 +#define SW_RES(x) #x
21456 +#undef SfxModalDialog
21457 +#define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id )
21458 +#define SW_WORDCOUNTDIALOG_HRC
21459 +#include <helpid.h>
21460 +#endif /* ENABLE_LAYOUT */
21461 +
21462 /*-- 06.04.2004 16:05:55---------------------------------------------------
21464 -----------------------------------------------------------------------*/
21465 @@ -73,6 +82,9 @@ SwWordCountDialog::SwWordCountDialog(Win
21466 #pragma warning (default : 4355)
21467 #endif
21468 {
21469 +#if ENABLE_LAYOUT
21470 + SetHelpId (HID_DLG_WORDCOUNT);
21471 +#endif /* ENABLE_LAYOUT */
21472 FreeResource();
21473 }
21474 /*-- 06.04.2004 16:05:56---------------------------------------------------
21475 --- toolkit/workben/layout/wordcountdialog.hxx.old 2009-04-02 10:49:37.000000000 +0000
21476 +++ toolkit/workben/layout/wordcountdialog.hxx 2009-04-06 16:42:13.000000000 +0000
21477 @@ -7,7 +7,7 @@
21478 * OpenOffice.org - a multi-platform office productivity suite
21479 *
21480 * $RCSfile: wordcountdialog.hxx,v $
21481 - * $Revision: 1.3 $
21482 + * $Revision: 1.5 $
21483 *
21484 * This file is part of OpenOffice.org.
21485 *
21486 --- toolkit/workben/layout/zoom.cxx.old 2009-04-06 16:42:11.000000000 +0000
21487 +++ toolkit/workben/layout/zoom.cxx 2009-04-06 16:42:13.000000000 +0000
21488 @@ -7,7 +7,7 @@
21489 * OpenOffice.org - a multi-platform office productivity suite
21490 *
21491 * $RCSfile: zoom.cxx,v $
21492 - * $Revision: 1.4 $
21493 + * $Revision: 1.12 $
21494 *
21495 * This file is part of OpenOffice.org.
21496 *
21497 @@ -51,7 +51,9 @@
21498 #define _SVX_ZOOM_CXX
21500 #include <svx/dialogs.hrc>
21501 +#if !TEST_LAYOUT
21502 #include "zoom.hrc"
21503 +#endif /* !TEST_LAYOUT */
21505 #include "zoom.hxx"
21506 #if TEST_LAYOUT
21507 @@ -112,6 +114,13 @@ struct SvxViewLayoutItem : public LAYOUT
21509 #include <layout/layout-pre.hxx>
21511 +#if ENABLE_LAYOUT
21512 +#undef SVX_RES
21513 +#define SVX_RES(x) #x
21514 +#undef SfxModalDialog
21515 +#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
21516 +#endif /* ENABLE_LAYOUT */
21517 +
21518 // static ----------------------------------------------------------------
21520 static USHORT pRanges[] =
21521 @@ -282,6 +291,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pP
21522 bModified ( FALSE )
21524 {
21525 +#if ENABLE_LAYOUT
21526 + SetHelpId (SID_ATTR_ZOOM);
21527 +#endif /* ENABLE_LAYOUT */
21528 Link aLink = LINK( this, SvxZoomDialog, UserHdl );
21529 a100Btn.SetClickHdl( aLink );
21530 aOptimalBtn.SetClickHdl( aLink );
21531 --- toolkit/workben/layout/zoom.hxx.old 2009-04-06 16:42:11.000000000 +0000
21532 +++ toolkit/workben/layout/zoom.hxx 2009-04-06 16:42:13.000000000 +0000
21533 @@ -7,7 +7,7 @@
21534 * OpenOffice.org - a multi-platform office productivity suite
21535 *
21536 * $RCSfile: zoom.hxx,v $
21537 - * $Revision: 1.4 $
21538 + * $Revision: 1.6 $
21539 *
21540 * This file is part of OpenOffice.org.
21541 *
21542 --- toolkit/workben/layout/zoom.xml.old 2009-04-02 10:49:37.000000000 +0000
21543 +++ toolkit/workben/layout/zoom.xml 2009-04-06 16:42:13.000000000 +0000
21544 @@ -7,18 +7,18 @@
21545 xmlns:cnt="http://openoffice.org/2007/layout/container"
21546 id="RID_SVXDLG_ZOOM" _title="Zoom & View Layout" optimumsize="true"
21547 help-id="SID_ATTR_ZOOM"
21548 - has_border="true" sizeable="true" moveable="true">
21549 + has_border="true" sizeable="true" moveable="true" closeable="true">
21550 <vbox spacing="5" border="5">
21551 <hbox spacing="0" border="0">
21552 <vbox spacing="5" border="5">
21553 <fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
21554 - <radiobutton radiogroup="zoom" id="BTN_OPTIMAL" _label="Optimal"/>
21555 - <radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
21556 - <radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" _label="Page Width"/>
21557 - <radiobutton radiogroup="zoom" id="BTN_100" _label="100 %"/>
21558 + <radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL" _label="Optimal"/>
21559 + <radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
21560 + <radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
21561 + <radiobutton radiogroup="zoom-factor" id="BTN_100" _label="100 %"/>
21562 <hbox cnt:expand="false" cnt:fill="true">
21563 <align cnt:expand="false" cnt:fill="true">
21564 - <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
21565 + <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
21566 </align>
21567 <flow cnt:padding="10" cnt:expand="false"/>
21568 <metricfield id="ED_USER" value-step="1"
21569 @@ -30,11 +30,11 @@
21570 </vbox>
21571 <vbox spacing="5" border="5">
21572 <fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
21573 - <radiobutton radiogroup="zoom" id="BTN_AUTOMATIC" _label="~Automatic"/>
21574 - <radiobutton radiogroup="zoom" id="BTN_SINGLE" _label="~Single page"/>
21575 + <radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
21576 + <radiobutton radiogroup="zoom-layout" id="BTN_SINGLE" _label="~Single page"/>
21577 <hbox cnt:expand="false" cnt:fill="true">
21578 <align cnt:expand="false" cnt:fill="true">
21579 - <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_COLUMNS" _label="~Columns"/>
21580 + <radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
21581 </align>
21582 <flow cnt:padding="10" cnt:expand="false"/>
21583 <metricfield id="ED_COLUMNS" value-step="1"