CWS-TOOLING: integrate CWS layoutdialogs2

2009-04-09 10:11:14 +0200 mba  r270680 : defective merge sets seem to have brought config_office back
2009-04-02 18:00:52 +0200 mba  r270429 : #i100503#: make tralay work without LD_LIBRARY_PATH
2009-04-01 13:27:58 +0200 mba  r270320 : warning on Solaris fixed
2009-03-31 22:15:03 +0200 mba  r270293 : CWS-TOOLING: rebase CWS layoutdialogs2 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 13:05:08 +0100 mba  r269526 : fixed some compiler warnings of the Sun compiler
2009-03-11 15:32:42 +0100 mba  r269337 : some problems for ENABLE_LAYOUT fixed
2009-03-09 16:05:32 +0100 mba  r269197 : merge conflict solved
2009-03-09 15:09:55 +0100 mba  r269194 : merge conflict solved
2009-03-09 15:09:35 +0100 mba  r269193 : merge conflict solved
2009-03-06 22:12:47 +0100 mba  r269052 : compilation error fixed
2009-03-06 17:36:37 +0100 mba  r269033 : integer warning fixed
2009-03-06 10:31:19 +0100 mba  r268983 : CWS-TOOLING: rebase CWS layoutdialogs2 to trunk@268395 (milestone: DEV300:m42)
2009-03-03 20:03:59 +0100 jcn  r268777 : Add Notes checkbox to find-and-replace dialog in anticipation of m40 resync.
2009-03-03 15:56:20 +0100 jcn  r268737 : Apply layout-find-dialog-crash-fix.diff -- fixes crasher.
From http://svn.gnome.org/viewvc/ooo-build?view=revision&revision=15378
2009-02-06 17:41:24 +0100 mba  r267479 : arrrrgh - svx headers must be included behind the magic define
2009-02-05 19:44:42 +0100 mba  r267439 : seems that msvc preprocessor is thick as a brick
2009-02-05 15:15:16 +0100 mba  r267425 : pch added
2009-02-05 08:14:01 +0100 mba  r267409 : double defined symbols fixed
2009-02-05 08:13:14 +0100 mba  r267408 : compile Languagebox and FontListbox with ENABLE_LAYOUT
2009-02-05 08:07:35 +0100 mba  r267406 : warning fixed
2009-02-05 08:06:42 +0100 mba  r267405 : warnings and errors fixed
2009-01-30 15:51:52 +0100 mba  r267206 : export Container class to compile code in sfx2
2009-01-30 15:51:14 +0100 mba  r267205 : remove LAYOUT_EXPERIMENTAL from sfx2, everything now compiles with ENABLE_LAYOUT
2009-01-28 17:01:27 +0100 mba  r267069 : fixed namespace problems in sfx2
2009-01-28 16:59:48 +0100 mba  r267068 : fixed namespace problems
2009-01-24 13:57:06 +0100 mba  r266877 : move svx stuff to experimental
2009-01-24 13:56:11 +0100 mba  r266876 : move svx stuff to experimental
2009-01-24 13:52:09 +0100 mba  r266875 : put sfx stuff into experimental
2009-01-24 13:28:08 +0100 mba  r266874 : put sfx stuff into experimental
2009-01-24 13:26:38 +0100 mba  r266873 : help msvc++ compiler a bit
2009-01-24 13:24:43 +0100 mba  r266872 : warning removed
2009-01-24 13:23:21 +0100 mba  r266871 : moved svx stuff to svx; put sfx stuff into experimental
2009-01-24 13:22:04 +0100 mba  r266870 : moved svx stuff to svx
2009-01-05 16:35:34 +0100 jcn  r265879 : config_office/configure: Regenerate.  Fixes naive builds.
2008-12-17 16:06:25 +0100 jcn  r265638 : Wordcount: minor HIG tweaks.
2008-12-17 16:06:21 +0100 jcn  r265637 : Zoom: minor HIG spacing tweaks.
2008-12-17 16:06:16 +0100 jcn  r265636 : Zoom: fix align-test and update zoom.xml.
2008-12-17 16:06:12 +0100 jcn  r265635 : Zoom: add align-test.xml to illustrate zoom alignment bug.
2008-12-17 16:06:07 +0100 jcn  r265634 : Find-and-Replace: request font-style-name="Bold", does not seem to work.
2008-12-17 16:06:03 +0100 jcn  r265633 : Find-and-Replace: Add alignment for combobox labels.
2008-12-17 16:05:59 +0100 jcn  r265632 : Find-and-Replace: Replace pairs of <flow> with <align>. Fixes ugly non-emptiness of more-<hbox>.
2008-12-17 16:05:56 +0100 jcn  r265631 : Find-and-Replace: add nice 12pt border.
2008-12-17 16:05:51 +0100 jcn  r265630 : Find-and-Replace: also add rowsep at lower fixedline.
2008-12-17 16:05:47 +0100 jcn  r265629 : Find-and-Replace: Add poor man's colsep and rowsep substitute spaces.
2008-12-17 16:05:43 +0100 jcn  r265628 : Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons.
2008-12-17 16:05:40 +0100 jcn  r265627 : Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion.
2008-12-17 16:05:36 +0100 jcn  r265626 : Find-and-Replace: use sc icon. Fixes FIND button height.
2008-12-17 16:05:31 +0100 jcn  r265625 : Bugfix have empty/invisible containers not take up space.
2008-12-17 16:05:27 +0100 jcn  r265624 : Find-and-replace: Fix/remove most property errors.
2008-12-17 16:05:23 +0100 jcn  r265623 : Table: make x, y expand default.
2008-12-17 16:05:18 +0100 jcn  r265622 : Use OSL_TRACE rather than printf. Fixes warning visibility.
2008-12-17 16:05:14 +0100 jcn  r265621 : Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors.
2008-12-17 16:05:10 +0100 jcn  r265620 : Junk extra <table> from boxtest. Fixes visual output.
2008-12-17 16:05:05 +0100 jcn  r265619 : Eradicate PROPHELPER_SET_INFO: junk static caching.
2008-12-17 16:05:01 +0100 jcn  r265618 : Update awk+sed localize generation rules. Fixes multiple (wrong) titles in Find & Replace.
2008-12-17 16:04:56 +0100 jcn  r265617 : Use dash (-) instead of underscore (_) to separate language modifiers. Fixes en_GB etc.
2008-12-17 16:04:51 +0100 jcn  r265616 : Add "defbutton=true" to dialogs. Fixes ENTER doing default action: n#439222.
2008-12-17 16:04:45 +0100 jcn  r265615 : Michael's new table-based find and replace.
2008-12-17 16:04:40 +0100 jcn  r265614 : Apply Michael's boxtest patch.
2008-12-17 16:04:36 +0100 jcn  r265613 : Make sort-options experimental. Part II. Fixes crasher n-44.patch. Fixes crasher: n#442036.
2008-12-17 16:04:31 +0100 jcn  r265612 : Make sort-options experimental. Part I.
2008-12-17 16:04:26 +0100 jcn  r265611 : Add --enable-layout-experimental configure switch. Part II. Typo in configure.in, add set_soenv entry.
2008-12-17 16:04:21 +0100 jcn  r265610 : Add --enable-layout-experimental configure switch. Default off.
2008-11-26 16:25:18 +0100 mba  r264417 : fixed compiler warnings
2008-11-26 15:52:02 +0100 mba  r264407 : fixed compiler warnings
2008-11-26 15:40:44 +0100 mba  r264402 : fixed compiler warnings
2008-11-26 14:50:47 +0100 mba  r264395 : fixed compiler warnings
2008-11-26 14:39:12 +0100 mba  r264393 : fixed compiler warnings
2008-11-26 14:38:49 +0100 mba  r264392 : fixed compiler warnings
2008-11-26 14:38:31 +0100 mba  r264391 : fixed compiler warnings
2008-11-26 14:38:13 +0100 mba  r264390 : fixed compiler warnings
2008-11-26 14:37:38 +0100 mba  r264389 : fixed compiler warnings
2008-11-26 10:11:17 +0100 mba  r264352 : fixed compiler warnings
2008-11-26 10:06:12 +0100 mba  r264351 : fixed compiler warnings
2008-11-26 09:58:28 +0100 mba  r264347 : fixed compiler warnings
2008-11-26 09:50:41 +0100 mba  r264345 : fixed compiler warnings
2008-11-26 09:46:10 +0100 mba  r264343 : fixed compiler warnings
2008-10-22 10:57:09 +0200 mba  r262584 : fixed small error resulting from resolved merged conflicts
2008-10-22 10:56:21 +0200 mba  r262583 : fixed some small errors resulting from resolved merged conflicts
2008-10-20 19:29:27 +0200 jcn  r262557 : layoutdialogs2: Remove stray patches.
2008-10-20 19:29:22 +0200 jcn  r262556 : layoutdialogs2: Force resize also on second show after hiding.
2008-10-20 19:29:17 +0200 jcn  r262555 : layoutdialogs2: Do not trigger handlers for api calls.
2008-10-20 19:29:13 +0200 jcn  r262554 : layoutdialogs2: Use disable/enable instead of hide/show for currency box. Fixes monster lisbox.
2008-10-20 19:29:09 +0200 jcn  r262553 : layoutdialogs2: Use line-count instead of linecount. Fixes sizing of listboxes.
2008-10-20 19:29:04 +0200 jcn  r262552 : layoutdialogs2: vcl: respect line-count also for non-dropdown listbox.
2008-10-20 19:28:59 +0200 jcn  r262551 : layoutdialogs2: Update to svn:r14142 patched.
2008-10-20 19:28:51 +0200 jcn  r262550 : layoutdialogs2: Manual tweaks in number-format.xml.
2008-10-20 19:28:45 +0200 jcn  r262549 : layoutdialogs2: Integrate Number Format tabpage into Format Cell dialog.
2008-10-20 19:28:36 +0200 jcn  r262548 : layoutdialogs2: Windows build fixes. Thanks Noel.
2008-10-20 19:28:31 +0200 jcn  r262547 : layoutdialogs2: Layout Format Cells/Number Format tabpage.
2008-10-20 19:28:24 +0200 jcn  r262546 : layoutdialogs2: Remove sc/uiconfig/layout/localize.sdf.
2008-10-20 19:28:20 +0200 jcn  r262545 : layoutdialogs2: --enable-debug link fix
2008-10-20 19:28:16 +0200 jcn  r262544 : layoutdialogs2: Add missing localize.sdf dependency. Thanks, Petr.
2008-10-20 19:28:12 +0200 jcn  r262543 : layoutdialogs2: svx linx fixlet.
2008-10-20 19:28:06 +0200 jcn  r262542 : layoutdialogs2: Move layout/* to layout/core, vclcompat to layout/vcl. Distribute layout headers. Fixes sfx2 layout core includes.
2008-10-20 19:27:58 +0200 jcn  r262541 : layoutdialogs2: Build fix for --enable-layout.
2008-10-20 19:27:54 +0200 jcn  r262540 : layoutdialogs2: Generate localize.sdf files in uiconfig.
2008-10-20 19:27:47 +0200 jcn  r262539 : layoutdialogs2: Minimalize deprecated String use further by using OUString.
2008-10-20 19:27:42 +0200 jcn  r262538 : layoutdialogs2: Implement LocalizedString.GetToken and use it for aCalcBtn. Fixes empty label.
2008-10-20 19:27:36 +0200 jcn  r262537 : layoutdialogs2: Add layout::Sfx*Dialog wrapper.
2008-10-20 19:27:29 +0200 jcn  r262536 : layoutdialogs2: Introduce Closing*Dialog wrappers fixing closing with ESC.
2008-10-20 19:27:24 +0200 jcn  r262535 : layoutdialogs2: Support <sfxmodelessdialog> from sfx2.
2008-10-20 19:27:17 +0200 jcn  r262534 : layoutdialogs2: Rename find-&-replace.xml to find-and-replace.xml. Fixes split build with failing solenv patch.
2008-10-20 19:27:12 +0200 jcn  r262533 : layoutdialogs2: Do not build sfx2 when --disable-layout.
2008-10-20 19:27:08 +0200 jcn  r262532 : layoutdialogs2: Ignore ja/ too.
2008-10-20 19:27:04 +0200 jcn  r262531 : layoutdialogs2: Add destructors for VCLXButton, VCLXComboBox.
2008-10-20 19:26:58 +0200 jcn  r262530 : layoutdialogs2: Make dialogs closable with ESC: wordcount, zoom, message-box, move-copy-sheet, insert-sheet.
2008-10-20 19:26:52 +0200 jcn  r262529 : layoutdialogs2: Move some implementations to .cxx.
2008-10-20 19:26:47 +0200 jcn  r262528 : layoutdialogs2: Fix simple editor crasher.
2008-10-20 19:26:43 +0200 jcn  r262527 : layoutdialogs2: Further cleanup: remove clean & delete from wrapperGone.
2008-10-20 19:26:38 +0200 jcn  r262526 : layoutdialogs2: Add reset logic to ~WindowImpl, plugs ComboBox and Dialog leaks.
2008-10-20 19:26:34 +0200 jcn  r262525 : layoutdialogs2: Interesting hack: only leaks ::ComboBox and ::Dialog.
2008-10-20 19:26:29 +0200 jcn  r262524 : layoutdialogs2: Build fix.
2008-10-20 19:26:24 +0200 jcn  r262523 : layoutdialogs2: Find&Replace duplicate disposal workaround inside layout.
2008-10-20 19:26:19 +0200 jcn  r262522 : layoutdialogs2: Revert "Terrible crasher-fix hack. Do not dispose Dialog or any FocusHandler owners."
This reverts commit 5222b5b123a2e6c88494983bd875de574f365bae.
2008-10-20 19:26:14 +0200 jcn  r262521 : layoutdialogs2: Terrible crasher-fix hack. Do not dispose Dialog or any FocusHandler owners.
2008-10-20 19:26:08 +0200 jcn  r262520 : layoutdialogs2: Revert "ComboBox: crash down to (Dialog's) VCLXWindowImpl::DestroyOutputDevice();"
This reverts commit b423129aca295e84ef5986149b6ee71eb7ba0aa3.
2008-10-20 19:26:03 +0200 jcn  r262519 : layoutdialogs2: ComboBox: crash down to (Dialog's) VCLXWindowImpl::DestroyOutputDevice();
2008-10-20 19:25:57 +0200 jcn  r262518 : layoutdialogs2: Handler and debug cleanup.
2008-10-20 19:25:52 +0200 jcn  r262517 : layoutdialogs2: Minimally remove FixedText workaround.
2008-10-20 19:25:47 +0200 jcn  r262516 : layoutdialogs2: Preparations for FocusHdl fix.
2008-10-20 19:25:42 +0200 jcn  r262515 : layoutdialogs2: Remove vclxwindows patch by using handler hackery.
2008-10-20 19:25:38 +0200 jcn  r262514 : layoutdialogs2: Don't call deleted dialog. Hdler reset tweaks. Fixes Find&Replace.
2008-10-20 19:25:34 +0200 jcn  r262513 : layoutdialogs2: Hdler and disposing cleanups.
2008-10-20 19:25:29 +0200 jcn  r262512 : layoutdialogs2: Prevent Find&Replace window from being deleted twice.
2008-10-20 19:25:24 +0200 jcn  r262511 : layoutdialogs2: Add destructor to SvxSearchDialogWrapper. Fixes second invocation crasher.
2008-10-20 19:25:19 +0200 jcn  r262510 : layoutdialogs2: Make Find&Replace work (once) with minimal client code changes.
2008-10-20 19:25:13 +0200 jcn  r262509 : layoutdialogs2: Add ComboBox/FixedText debug switching.
2008-10-20 19:25:08 +0200 jcn  r262508 : layoutdialogs2: Add destructors resetting handlers.
2008-10-20 19:25:03 +0200 jcn  r262507 : layoutdialogs2: Static cast fixes.
2008-10-20 19:24:59 +0200 jcn  r262506 : layoutdialogs2: Always set button handler. Fixes pushbuttons.
2008-10-20 19:24:55 +0200 jcn  r262505 : layoutdialogs2: Revert "Move FocusHandlers from Control down to ListBox, ComboBox, FixedText."
This reverts commit 8bc4b991539a74373bfb1ef8792276ada8c958e4.
2008-10-20 19:24:50 +0200 jcn  r262504 : layoutdialogs2: Disable Timer for ENABLE_LAYOUT.
2008-10-20 19:24:45 +0200 jcn  r262503 : layoutdialogs2: Move FocusHandlers from Control down to ListBox, ComboBox, FixedText.
2008-10-20 19:24:40 +0200 jcn  r262502 : layoutdialogs2: Wider small symbol.
2008-10-20 19:24:36 +0200 jcn  r262501 : layoutdialogs2: Listener and SetHandler cleanup.
2008-10-20 19:24:31 +0200 jcn  r262500 : layoutdialogs2: Clear mxWindow upon deletion. Fixes Find&Replace crasher.
2008-10-20 19:24:27 +0200 jcn  r262499 : layoutdialogs2: Typo, fixes build.
2008-10-20 19:24:22 +0200 jcn  r262498 : layoutdialogs2: Ignore .log files too.
2008-10-20 19:24:19 +0200 jcn  r262497 : layoutdialogs2: By default, work around #define protected public Resource hack.
2008-10-20 19:24:15 +0200 jcn  r262496 : layoutdialogs2: Sw:Find&Replace: Remove wrong static cast. Fixes crasher.
2008-10-20 19:24:10 +0200 jcn  r262495 : layoutdialogs2: Find&Replace: do not vertically expand buttons, add title.
2008-10-20 19:24:06 +0200 jcn  r262494 : layoutdialogs2: Find&Replace: Remove need for ResId, set help id.
2008-10-20 19:24:01 +0200 jcn  r262493 : layoutdialogs2: MoreButton: redraw upon resize, fix labels, use small symbol.
2008-10-20 19:23:57 +0200 jcn  r262492 : layoutdialogs2: Support setting and querying small symbol on vcl:button.
2008-10-20 19:23:52 +0200 jcn  r262491 : layoutdialogs2: Support redrawing of only this, make parent optional.
2008-10-20 19:23:48 +0200 jcn  r262490 : layoutdialogs2: Add Kohei's wfield patch https://bugzilla.novell.com/attachment.cgi?id=235398. Fixes n#417840.
2008-10-20 19:23:44 +0200 jcn  r262489 : layoutdialogs2: Redraw [parent] upon first time visibility.
Fixes weird listbox dropdown sizing in Find & Replace.
2008-10-20 19:23:39 +0200 jcn  r262488 : layoutdialogs2: Add manual layouting for Find & Replace.
2008-10-20 19:23:35 +0200 jcn  r262487 : layoutdialogs2: src2xml: use label instead of text for buttons.
Run on Find & Replace; fixes button texts.
2008-10-20 19:23:31 +0200 jcn  r262486 : layoutdialogs2: Add initial auto-translated find-&-replace-.xml.
2008-10-20 19:23:26 +0200 jcn  r262485 : layoutdialogs2: layout importer: handle ModelessDialog.
Fixes Find & Replace parsing error.
2008-10-20 19:23:22 +0200 jcn  r262484 : layoutdialogs2: src2xml: Handle multiple widgets at same x,y.
Fixes silent removal of widgets in Find & Replace dialog.
2008-10-20 19:23:18 +0200 jcn  r262483 : layoutdialogs2: src2xml: Handle hide= attribute, translate to show=.
2008-10-20 19:23:14 +0200 jcn  r262482 : layoutdialogs2: Only use __PRETTY_FUNCTION__ on gcc. Fixes Windows build. Thanks Tor!
2008-10-20 19:23:10 +0200 jcn  r262481 : layoutdialogs2: Add two missing SAL_CALL decorations. Fixes Windows build. Thanks Tor!
2008-10-20 19:23:05 +0200 jcn  r262480 : layoutdialogs2: Build fixes for layout'ed Find & Replace dialog.
2008-10-20 19:22:54 +0200 jcn  r262479 : layoutdialogs2: Do not use layout::SfxTabDialog for now.
2008-10-20 19:22:47 +0200 jcn  r262478 : layoutdialogs2: Crufty sizing tweaks.
2008-10-20 19:22:42 +0200 jcn  r262477 : layoutdialogs2: More debugging cleanups.
2008-10-20 19:22:37 +0200 jcn  r262476 : layoutdialogs2: More cleanups that result in constant manual resizing...
2008-10-20 19:22:33 +0200 jcn  r262475 : layoutdialogs2: Tabdlg cleanups.
2008-10-20 19:22:28 +0200 jcn  r262474 : layoutdialogs2: Add GetOptimalSize () to InPlug. Fixes auto-sizing of tabcontrol.
2008-10-20 19:22:21 +0200 jcn  r262473 : layoutdialogs2: Get VCLXTabControl to resize automatically (too tall), not mousable.
2008-10-20 19:22:13 +0200 jcn  r262472 : layoutdialogs2: Respect show=false property; do not show everything.
2008-10-20 19:22:09 +0200 jcn  r262471 : layoutdialogs2: Add show=false on buttons. Fixes displaying everything.
2008-10-20 19:22:05 +0200 jcn  r262470 : layoutdialogs2: Move some code to reduce namespace and #if hacking.
2008-10-20 19:22:00 +0200 jcn  r262469 : layoutdialogs2: Cleanup, remove unneeded #defines.
2008-10-20 19:21:56 +0200 jcn  r262468 : layoutdialogs2: Replace static casts with dynamic_cast, fixes layout::SfxTabDialog.
Explicitly add 2 tabpages while adding tabpages, instead of relying on ResId.
2008-10-20 19:21:51 +0200 jcn  r262467 : layoutdialogs2: Use cpp hacking to remove layout-tabdialog.hxx duplication.
2008-10-20 19:21:45 +0200 jcn  r262466 : layoutdialogs2: Minimize diff between layout-tabdialog.hxx and tabdlg.hxx.
2008-10-20 19:21:41 +0200 jcn  r262465 : layoutdialogs2: Remove copy of SfxTabDialog; use cpp logic to create both flavours.
2008-10-20 19:21:36 +0200 jcn  r262464 : layoutdialogs2: Minimize diff between layout/sfxtabdialog.cxx and source/tabdlg.cxx.
This enables the next step: use cpp logic instead of code duplication.
2008-10-20 19:21:31 +0200 jcn  r262463 : layoutdialogs2: Hello world on layout::SfxTabDialog.
2008-10-20 19:21:24 +0200 jcn  r262462 : layoutdialogs2: Nice `Compiling:' message that shows the file being compiled.
2008-10-20 19:21:20 +0200 jcn  r262461 : layoutdialogs2: Use layout::SfxTabDialog for sort options.
2008-10-20 19:21:15 +0200 jcn  r262460 : layoutdialogs2: Update sort options tab.
2008-10-20 19:21:10 +0200 jcn  r262459 : layoutdialogs2: Add layout::SfxTabDialog.
2008-10-20 19:21:04 +0200 jcn  r262458 : layoutdialogs2: Cleanup previous attempt using layout::SfxTabPage == layout::TabPage.
2008-10-20 19:20:57 +0200 jcn  r262457 : layoutdialogs2: Windows 2003 compile fixes, i#92397.
2008-10-20 19:20:52 +0200 jcn  r262456 : layoutdialogs2: Set default radiogroup when none provided.
2008-10-20 19:20:48 +0200 jcn  r262455 : layoutdialogs2: Add radiogroup to sort-options. Fixes crasher.
2008-10-20 19:20:43 +0200 jcn  r262454 : layoutdialogs2: Cleanup ParentSet fix.
2008-10-20 19:20:36 +0200 jcn  r262453 : layoutdialogs2: Add debugging in ParentSet. Works standalone, not integrated.
2008-10-20 19:20:31 +0200 jcn  r262452 : layoutdialogs2: Revert "Have InPlug not derive from Window, but have as member."
This reverts commit 50ea26eec3fe14943f24900081ad923e72550345.
2008-10-20 19:20:25 +0200 jcn  r262451 : layoutdialogs2: Have InPlug not derive from Window, but have as member.
2008-10-20 19:20:20 +0200 jcn  r262450 : layoutdialogs2: Move layout plugin implementation from layout::SfxTabPage to InPlug.
2008-10-20 19:20:14 +0200 jcn  r262449 : layoutdialogs2: Get all widgets to display in sfxtabpage plugin with Window::SetParent hack.
2008-10-20 19:20:09 +0200 jcn  r262448 : layoutdialogs2: Two-button manual hello world with sfxtabpage plugin.
2008-10-20 19:20:03 +0200 jcn  r262447 : layoutdialogs2: WIP: layout::SfxTabPage derived from SfxTabPage.
2008-10-20 19:19:55 +0200 jcn  r262446 : layoutdialogs2: Always set parent after construction, fixes listbox dropdown.
2008-10-20 19:19:51 +0200 jcn  r262445 : layoutdialogs2: Fix radio button crasher.
2008-10-20 19:19:47 +0200 jcn  r262444 : layoutdialogs2: Implement ListBox method wrappers. Fixes filling of listbox.
2008-10-20 19:19:42 +0200 jcn  r262443 : layoutdialogs2: Convert Move/Copy sheet to layout engine.
2008-10-20 19:19:35 +0200 jcn  r262442 : layoutdialogs2: Also hide yes/no buttons if not used.
2008-10-20 19:19:31 +0200 jcn  r262441 : layoutdialogs2: Elaborate on changing client code.
2008-10-20 19:19:26 +0200 jcn  r262440 : layoutdialogs2: Implement winbits client-code compatibility for Message Boxes.
2008-10-20 19:19:21 +0200 jcn  r262439 : layoutdialogs2: Add localize.sdf to toolkit uiconfig. Fixes build.
2008-10-20 19:19:17 +0200 jcn  r262438 : layoutdialogs2: Do not use ti_layout twice in toolkit build.lst. Fixes build.
2008-10-20 19:19:13 +0200 jcn  r262437 : layoutdialogs2: Oops, also dist toolkit-layout.zip.
2008-10-20 19:19:09 +0200 jcn  r262436 : layoutdialogs2: Move layout.mk to solenv.
2008-10-20 19:19:03 +0200 jcn  r262435 : layoutdialogs2: Add handy TEST file.
2008-10-20 19:18:58 +0200 jcn  r262434 : layoutdialogs2: Implement MessageBox and wrappers ErrorBox, InfoBox, QueryBox, WarningBox.
2008-10-20 19:18:52 +0200 jcn  r262433 : layoutdialogs2: QueryBox without image used for Delete Sheet dialog.
2008-10-20 19:18:46 +0200 jcn  r262432 : layoutdialogs2: WIP QueryBox.
2008-10-20 19:18:39 +0200 jcn  r262431 : layoutdialogs2: Add insert-sheet localization.
2008-10-20 19:18:34 +0200 jcn  r262430 : layoutdialogs2: Run indent-region on zoom.xml, distribute it.
2008-10-20 19:18:30 +0200 jcn  r262429 : layoutdialogs2: Dist xml files too.
2008-10-20 19:18:26 +0200 jcn  r262428 : layoutdialogs2: Add insert-sheet.xml to workben.
2008-10-20 19:18:22 +0200 jcn  r262427 : layoutdialogs2: Update layout TODO.
2008-10-20 19:18:18 +0200 jcn  r262426 : layoutdialogs2: Cleanups and add comments.
2008-10-20 19:18:13 +0200 jcn  r262425 : layoutdialogs2: Keep RadioButtons::RadioButton callback at HEAD of list.
Fixes radiobutton grouping.
2008-10-20 19:18:07 +0200 jcn  r262424 : layoutdialogs2: Remove IMPORT_RADIOGROUP cruft.
2008-10-20 19:18:02 +0200 jcn  r262423 : layoutdialogs2: Have code check fire event for radio button.
Fixes radio button grouping.
2008-10-20 19:17:58 +0200 jcn  r262422 : layoutdialogs2: Enable IMPORT_RADIOGROUP flag.
2008-10-20 19:17:54 +0200 jcn  r262421 : layoutdialogs2: Add radio groups to zoom.xml.
2008-10-20 19:17:50 +0200 jcn  r262420 : layoutdialogs2: Move RadioGroup implementation to cxx file.
2008-10-20 19:17:45 +0200 jcn  r262419 : layoutdialogs2: Manually set help id for insert table.
2008-10-20 19:17:41 +0200 jcn  r262418 : layoutdialogs2: Cosmetic fixes for insert-sheet.
2008-10-20 19:17:37 +0200 jcn  r262417 : layoutdialogs2: FindAndRemove now also skips translation prefix.
Fixes setting of title etc. from nontranslated xml.
2008-10-20 19:17:32 +0200 jcn  r262416 : layoutdialogs2: Manually set help id for zoom and wordcount dialogs.
2008-10-20 19:17:27 +0200 jcn  r262415 : layoutdialogs2: Set help-id from xml.
2008-10-20 19:17:21 +0200 jcn  r262414 : layoutdialogs2: Move -DENABLE_LAYOUT from stray makefiles to settings.mk.
2008-10-20 19:17:13 +0200 jcn  r262413 : layoutdialogs2: Initial conversion of insert-sheet dialog.
2008-10-20 19:17:08 +0200 jcn  r262412 : layoutdialogs2: Add wrappers for {Get,Set}{Pointer,Text}.
2008-10-20 19:17:04 +0200 jcn  r262411 : layoutdialogs2: Toolkit layout dialog copy updates.
2008-10-20 19:16:59 +0200 jcn  r262410 : layoutdialogs2: Cleanup #include <layout*> disaster.
Fixes multiple inclusions of layout-pre, layout-post.
2008-10-20 19:16:53 +0200 jcn  r262409 : layoutdialogs2: Implement Get,Set{,Smart}HelpId ().
2008-10-20 19:16:49 +0200 jcn  r262408 : layoutdialogs2: Make some getters const.
2008-10-20 19:16:45 +0200 jcn  r262407 : layoutdialogs2: Manual tweaks for string-input.xml.
2008-10-20 19:16:40 +0200 jcn  r262406 : layoutdialogs2: Add string-input.xml.
2008-10-20 19:16:36 +0200 jcn  r262405 : layoutdialogs2: Add dummy implementation for SetHelpId etc.
2008-10-20 19:16:32 +0200 jcn  r262404 : layoutdialogs2: Actually say *what* file cannot be copied *where*. Sigh.
2008-10-20 19:16:27 +0200 jcn  r262403 : layoutdialogs2: Thinko in macro name. Fixes compilation of strindlg.cxx.
2008-10-20 19:16:22 +0200 jcn  r262402 : layoutdialogs2: Add layout includes to stringdlg and makefile.
2008-10-20 19:16:17 +0200 jcn  r262401 : layoutdialogs2: Add sc/uiconfig/layout/localize.sdf
2008-10-20 19:16:13 +0200 jcn  r262400 : layoutdialogs2: Oops, build sc/uiconfig/layout.
2008-10-20 19:16:09 +0200 jcn  r262399 : layoutdialogs2: Have virtual destructor on Context, delete TabPage when deleting TabDialog.
2008-10-20 19:16:04 +0200 jcn  r262398 : layoutdialogs2: Actually delete layout::TabPage objects when deleting SfxTabdialog.
2008-10-20 19:16:00 +0200 jcn  r262397 : layoutdialogs2: Workaround for second invocation crash of sort dialog options tab.
2008-10-20 19:15:56 +0200 jcn  r262396 : layoutdialogs2: Handle Reset button.
2008-10-20 19:15:51 +0200 jcn  r262395 : layoutdialogs2: Also install sc xml zip file.
2008-10-20 19:15:46 +0200 jcn  r262394 : layoutdialogs2: Integrate sort-options into sc.
2008-10-20 19:15:41 +0200 jcn  r262393 : layoutdialogs2: Revert "Fix sfx2 compile warnings."
This reverts commit 8b55d402af7bd217db35f67b02dc92f93f3ada5d.
2008-10-20 19:15:34 +0200 jcn  r262392 : layoutdialogs2: Remove debuging.
2008-10-20 19:15:30 +0200 jcn  r262391 : layoutdialogs2: Pass set argument to layout::TabPage. Fixes OO.o integration crasher.
2008-10-20 19:15:24 +0200 jcn  r262390 : layoutdialogs2: Ignore more.
2008-10-20 19:15:20 +0200 jcn  r262389 : layoutdialogs2: Oops, make just one (1) sort-options tab.
2008-10-20 19:15:15 +0200 jcn  r262388 : layoutdialogs2: Revert macroconf compile warnings.
2008-10-20 19:15:09 +0200 jcn  r262387 : layoutdialogs2: Fix sfx2 compile warnings.
2008-10-20 19:15:01 +0200 jcn  r262386 : layoutdialogs2: Collapsed tabpage and sort-options development.
2008-10-20 19:14:51 +0200 jcn  r262385 : layoutdialogs2: Make dev300/src680 install layout switchable at compile time.
2008-10-20 19:14:47 +0200 jcn  r262384 : layoutdialogs2: Update README, add README.
2008-10-20 19:14:43 +0200 jcn  r262383 : layoutdialogs2: Repainting, hiding stuff.
2008-10-20 19:14:38 +0200 jcn  r262382 : layoutdialogs2: Add allocateArea to VCLXTabPage.
2008-10-20 19:14:34 +0200 jcn  r262381 : layoutdialogs2: Revert "Use VCLXContainer as base for VCLXTabPage."
This reverts commit 06a984434d0d2c356fd0cdaf96d6d613d5147b7c.
2008-10-20 19:14:30 +0200 jcn  r262380 : layoutdialogs2: Use VCLXContainer as base for VCLXTabPage.
2008-10-20 19:14:26 +0200 jcn  r262379 : layoutdialogs2: Revert "Derive VCLXTabPage from VBox."
This reverts commit 8ab66364bdc08151ce2c982c1aa03f7881d86b84.
2008-10-20 19:14:22 +0200 jcn  r262378 : layoutdialogs2: Derive VCLXTabPage from VBox.
2008-10-20 19:14:17 +0200 jcn  r262377 : layoutdialogs2: More cleanups and testing.
2008-10-20 19:14:12 +0200 jcn  r262376 : layoutdialogs2: Get layout tabpage to nicely select. No content visible, though.
2008-10-20 19:14:07 +0200 jcn  r262375 : layoutdialogs2: Support ScTabPageSortOptions in standalone test.
2008-10-20 19:14:02 +0200 jcn  r262374 : layoutdialogs2: Support tabpage creation from xml.
2008-10-20 19:13:56 +0200 jcn  r262373 : layoutdialogs2: Remove most TEST_LAYOUT conditionals.
2008-10-20 19:13:52 +0200 jcn  r262372 : layoutdialogs2: Remove Args effort.
2008-10-20 19:13:48 +0200 jcn  r262371 : layoutdialogs2: Attempt to create ArgSet.
2008-10-20 19:13:44 +0200 jcn  r262370 : layoutdialogs2: Compile more.
2008-10-20 19:13:39 +0200 jcn  r262369 : layoutdialogs2: Add sortdlg.
2008-10-20 19:13:35 +0200 jcn  r262368 : layoutdialogs2: Oops, ID fix.
2008-10-20 19:13:30 +0200 jcn  r262367 : layoutdialogs2: Build fix.
2008-10-20 19:13:26 +0200 jcn  r262366 : layoutdialogs2: Revert "Use ::Window for plugin base iso ::Control."
This reverts commit 919ddaf2f52ad5e4df877a094cd1e336888d6210.
2008-10-20 19:13:21 +0200 jcn  r262365 : layoutdialogs2: Plugin dialog cleanups.
2008-10-20 19:13:17 +0200 jcn  r262364 : layoutdialogs2: Use ::Window for plugin base iso ::Control.
2008-10-20 19:13:12 +0200 jcn  r262363 : layoutdialogs2: Use cstdio, remove cruft.
2008-10-20 19:13:07 +0200 jcn  r262362 : layoutdialogs2: Remove cruft.
2008-10-20 19:13:02 +0200 jcn  r262361 : layoutdialogs2: Remove sizing mess.
2008-10-20 19:12:57 +0200 jcn  r262360 : layoutdialogs2: Trigger [re]draw of DialControl.
2008-10-20 19:12:53 +0200 jcn  r262359 : layoutdialogs2: DialControl window behaves nicely and invisible.
2008-10-20 19:12:48 +0200 jcn  r262358 : layoutdialogs2: Revert adding of setparent.
2008-10-20 19:12:43 +0200 jcn  r262357 : layoutdialogs2: Add dialog::setparent to plugin.
2008-10-20 19:12:39 +0200 jcn  r262356 : layoutdialogs2: Add a setProperty for VCLXPlugin.
2008-10-20 19:12:34 +0200 jcn  r262355 : layoutdialogs2: Unhide plugin.
2008-10-20 19:12:30 +0200 jcn  r262354 : layoutdialogs2: Revert.
2008-10-20 19:12:25 +0200 jcn  r262353 : layoutdialogs2: Use window instead of control.
2008-10-20 19:12:20 +0200 jcn  r262352 : layoutdialogs2: Lots of plugin settings.
2008-10-20 19:12:16 +0200 jcn  r262351 : layoutdialogs2: More hacks.
2008-10-20 19:12:11 +0200 jcn  r262350 : layoutdialogs2: Compile fixes.
2008-10-20 19:12:05 +0200 jcn  r262349 : layoutdialogs2: Use c++ includes.
2008-10-20 19:12:00 +0200 jcn  r262348 : layoutdialogs2: Junk UnoTunnel nonsense.
2008-10-20 19:11:55 +0200 jcn  r262347 : layoutdialogs2: Remove more cruft.
2008-10-20 19:11:50 +0200 jcn  r262346 : layoutdialogs2: Remove cruft.
2008-10-20 19:11:44 +0200 jcn  r262345 : layoutdialogs2: Rename wrap to plugin.
2008-10-20 19:11:39 +0200 jcn  r262344 : layoutdialogs2: All sorry tries.
2008-10-20 19:11:33 +0200 jcn  r262343 : layoutdialogs2: Rename plugin to wrap.
2008-10-20 19:11:28 +0200 jcn  r262342 : layoutdialogs2: Add ifdefs, no UNOTUNNEL, no crash on exit.
2008-10-20 19:11:23 +0200 jcn  r262341 : layoutdialogs2: Redo all kind of Uno and XIface weirdness.
2008-10-20 19:11:17 +0200 jcn  r262340 : layoutdialogs2: Remove extra UnoTunnel.
2008-10-20 19:11:12 +0200 jcn  r262339 : layoutdialogs2: Plugin hello world. TODO: parenting/owning/sizing, ... etc.
2008-10-20 19:11:06 +0200 jcn  r262338 : layoutdialogs2: Zoom updates.
2008-10-20 19:11:01 +0200 jcn  r262337 : layoutdialogs2: Add missing controls.
2008-10-20 19:10:56 +0200 jcn  r262336 : layoutdialogs2: Add .gitignore.

1 files changed, 1630 insertions, 0 deletions

diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
new file mode 100644
index 000000000000..0e2eec91773e
--- /dev/null
+++ b/toolkit/source/layout/vcl/wrapper.cxx
@@ -0,0 +1,1630 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/rc.h>
+//#define RESOURCE_PUBLISH_PROTECTED 1
+#if RESOURCE_PUBLISH_PROTECTED
+// ugh, override non-helpful proctection
+#define protected public
+#endif /* RESOURCE_PUBLISH_PROTECTED */
+#include <tools/rc.hxx>
+#undef protected
+
+
+#include "wrapper.hxx"
+
+#include <awt/vclxplugin.hxx>
+#include <awt/vclxtabcontrol.hxx>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/awt/XDialog2.hpp>
+#include <com/sun/star/awt/XProgressBar.hpp>
+#include <com/sun/star/awt/XSimpleTabController.hpp>
+#include <com/sun/star/awt/XTabListener.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <comphelper/processfactory.hxx>
+#include <layout/core/factory.hxx>
+#include <layout/core/localized-string.hxx>
+#include <layout/core/root.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <vcl/ctrl.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/image.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
+#include <vcl/window.hxx>
+
+using namespace ::com::sun::star;
+using rtl::OUString;
+
+namespace layout
+{
+
+// Context bits ...
+class ContextImpl
+{
+    uno::Reference< awt::XLayoutRoot > mxRoot;
+    uno::Reference< container::XNameAccess > mxNameAccess;
+    PeerHandle mxTopLevel;
+
+public:
+    ContextImpl( char const *pPath )
+    {
+        uno::Sequence< uno::Any > aParams( 1 );
+        aParams[0] <<= OUString( pPath, strlen( pPath ), RTL_TEXTENCODING_UTF8 );
+
+        uno::Reference< lang::XSingleServiceFactory > xFactory(
+            comphelper::createProcessComponent(
+                OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
+            uno::UNO_QUERY );
+        if ( !xFactory.is() )
+        {
+            throw uno::RuntimeException(
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "Layout engine not installed" ) ),
+                uno::Reference< uno::XInterface >() );
+        }
+        mxRoot = uno::Reference< awt::XLayoutRoot >(
+            xFactory->createInstanceWithArguments( aParams ),
+            uno::UNO_QUERY );
+
+        mxNameAccess = uno::Reference< container::XNameAccess >( mxRoot, uno::UNO_QUERY );
+    }
+
+    ~ContextImpl()
+    {
+    }
+
+    PeerHandle getByName( const OUString &rName )
+    {
+        uno::Any val = mxNameAccess->getByName( rName );
+        PeerHandle xRet;
+        val >>= xRet;
+        return xRet;
+    }
+    PeerHandle getTopLevel()
+    {
+        return mxTopLevel;
+    }
+    void setTopLevel( PeerHandle xToplevel )
+    {
+        mxTopLevel = xToplevel;
+    }
+    PeerHandle getRoot()
+    {
+        return mxRoot;
+    }
+};
+
+Context::Context( const char *pPath )
+    : pImpl( new ContextImpl( pPath ) )
+{
+}
+Context::~Context()
+{
+    delete pImpl;
+    pImpl = NULL;
+}
+
+void Context::setToplevel( PeerHandle xToplevel )
+{
+    pImpl->setTopLevel( xToplevel );
+}
+
+PeerHandle Context::getToplevel()
+{
+    return pImpl->getTopLevel();
+}
+PeerHandle Context::getRoot()
+{
+    return pImpl->getRoot();
+}
+
+PeerHandle Context::GetPeerHandle( const char *id, sal_uInt32 nId ) const
+{
+    PeerHandle xHandle;
+    xHandle = pImpl->getByName( OUString( id, strlen( id ), RTL_TEXTENCODING_UTF8 ) );
+    if ( !xHandle.is() )
+    {
+        DBG_ERROR1( "Failed to fetch widget '%s'", id );
+    }
+
+    if ( nId != 0 )
+    {
+        rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId );
+        xHandle = GetPeerHandle( aStr, 0 );
+    }
+    return xHandle;
+}
+
+WindowImpl::WindowImpl (Context *context, const PeerHandle &peer, Window *window)
+    : mpWindow (window)
+    , mpCtx (context)
+    , mxWindow (peer, uno::UNO_QUERY)
+    , mxVclPeer (peer, uno::UNO_QUERY)
+    , mvclWindow (0)
+    , bFirstTimeVisible (true)
+{
+}
+
+WindowImpl::~WindowImpl ()
+{
+    if (mpWindow)
+        mpWindow->mpImpl = 0;
+    if (mvclWindow)
+    {
+        VCLXWindow *v = mvclWindow->GetWindowPeer ();
+        v->SetWindow (0);
+        mvclWindow->SetComponentInterface (uno::Reference <awt::XWindowPeer> ());
+        mvclWindow->SetWindowPeer (uno::Reference <awt::XWindowPeer> (), 0);
+        delete mvclWindow;
+        mvclWindow = 0;
+    }
+}
+
+void WindowImpl::wrapperGone ()
+{
+    mvclWindow = 0;
+    mpWindow->mpImpl = 0;
+    mpWindow = 0;
+    mpCtx = 0;
+    if ( mxWindow.is() )
+    {
+        uno::Reference< lang::XComponent > xComp( mxWindow, uno::UNO_QUERY );
+        mxWindow.clear ();
+        if ( xComp.is() )
+            xComp->dispose();
+    }
+}
+
+void SAL_CALL WindowImpl::disposing (lang::EventObject const&)
+    throw (uno::RuntimeException)
+{
+    if (mxWindow.is ())
+        mxWindow.clear ();
+}
+
+uno::Any WindowImpl::getProperty (char const* name)
+{
+    if ( !this || !mxVclPeer.is() )
+        return css::uno::Any();
+    return mxVclPeer->getProperty
+        ( rtl::OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ) );
+}
+
+void WindowImpl::setProperty (char const *name, uno::Any any)
+{
+    if ( !this || !mxVclPeer.is() )
+        return;
+    mxVclPeer->setProperty
+        ( rtl::OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ), any );
+}
+
+void WindowImpl::redraw (bool resize)
+{
+    uno::Reference <awt::XWindow> ref (mxWindow, uno::UNO_QUERY);
+    ::Window* window = VCLXWindow::GetImplementation (ref)->GetWindow ();
+    ::Window* parent = window->GetParent();
+    ::Rectangle r = Rectangle (parent->GetPosPixel (),
+                               parent->GetSizePixel ());
+    parent->Invalidate (r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
+    if (resize)
+        parent->SetPosSizePixel (0, 0, 1, 1, awt::PosSize::SIZE);
+    else
+        parent->SetPosSizePixel (0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
+                                 awt::PosSize::SIZE);
+}
+
+Window::Window( WindowImpl *pImpl )
+    : mpImpl( pImpl )
+{
+    mpImpl->mvclWindow = GetVCLXWindow () ? GetWindow () : 0;
+}
+
+Window::~Window()
+{
+    /* likely to be an UNO object - with floating references */
+    if (mpImpl)
+        mpImpl->wrapperGone ();
+    mpImpl = 0;
+}
+
+///IMPL_GET_IMPL( Control );
+
+static ControlImpl* null_control_impl = 0;
+
+ControlImpl &Control::getImpl () const
+{
+    if (ControlImpl* c = static_cast<ControlImpl *>(mpImpl))
+        return *c;
+    return *null_control_impl;
+}
+
+Control::~Control ()
+{
+    SetGetFocusHdl (Link ());
+    SetLoseFocusHdl (Link ());
+}
+
+void Window::setRes (ResId const& res)
+{
+#if RESOURCE_PUBLISH_PROTECTED
+    // Resources are shut-off from use.  Is that really necessary?
+    Resource &r = *GetWindow ();
+    r.GetRes (res);
+#else /* !RESOURCE_PUBLISH_PROTECTED */
+    //We *must* derive.  Is this also really necessary?
+    //Resource r (res);
+
+    // ugh, I wonder which solution is cleaner...
+    class Resource_open_up : public Resource
+    {
+    public:
+        Resource_open_up (ResId const& r)
+            : Resource (r)
+        {
+        }
+        static sal_Int32 GetLongRes (void *p)
+        {
+            return Resource::GetLongRes (p);
+        }
+        void* GetClassRes ()
+        {
+            return Resource::GetClassRes ();
+        }
+        sal_Int32 ReadLongRes ()
+        {
+            return Resource::ReadLongRes ();
+        }
+        UniString ReadStringRes ()
+        {
+            return Resource::ReadStringRes ();
+        }
+    };
+
+    Resource_open_up r (res);
+#endif /* !RESOURCE_PUBLISH_PROTECTED */
+    if (sal_uInt32 help_id = (sal_uInt32)r.GetLongRes (static_cast<char *> (r.GetClassRes ()) + 12))
+        SetHelpId (help_id);
+    sal_uInt32 mask = r.ReadLongRes ();
+    if ( mask & WINDOW_TEXT )
+        SetText( r.ReadStringRes ());
+}
+
+void Window::SetParent( ::Window *parent )
+{
+    uno::Reference <awt::XWindow> ref( GetPeer(), uno::UNO_QUERY );
+    if (VCLXWindow *vcl = VCLXWindow::GetImplementation( ref ))
+        if (::Window *window = vcl->GetWindow())
+            window->SetParent( parent );
+}
+
+void Window::SetParent( Window *parent )
+{
+    /* Let's hear it for C++: poor man's dynamic binding.  */
+    parent->ParentSet (this);
+}
+
+void Window::ParentSet (Window *window)
+{
+    window->SetParent (GetWindow ());
+}
+
+Context *Window::getContext()
+{
+    return this && mpImpl ? mpImpl->mpCtx : NULL;
+}
+
+PeerHandle Window::GetPeer() const
+{
+    if ( !mpImpl )
+        return PeerHandle();
+    return mpImpl->mxWindow;
+}
+
+uno::Reference<awt::XWindow> Window::GetRef() const
+{
+    return uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY );
+}
+
+VCLXWindow* Window::GetVCLXWindow() const
+{
+    return VCLXWindow::GetImplementation( GetRef() );
+}
+
+::Window* Window::GetWindow() const
+{
+    return GetVCLXWindow()->GetWindow();
+}
+
+::Window* Window::GetParent() const
+{
+    return GetWindow()->GetParent();
+}
+
+void Window::SetHelpId( sal_uIntPtr id )
+{
+    GetWindow()->SetHelpId( id );
+}
+
+sal_uIntPtr Window::GetHelpId() const
+{
+    return GetWindow()->GetHelpId();
+}
+
+void Window::SetSmartHelpId( SmartId const& id, SmartIdUpdateMode mode )
+{
+    GetWindow()->SetSmartHelpId( id, mode );
+}
+
+SmartId Window::GetSmartHelpId() const
+{
+    return GetWindow()->GetSmartHelpId();
+}
+
+void Window::EnterWait ()
+{
+    GetWindow()->EnterWait ();
+}
+void Window::LeaveWait ()
+{
+    GetWindow()->LeaveWait ();
+}
+bool Window::IsWait () const
+{
+    return GetWindow()->IsWait ();
+}
+
+bool Window::IsVisible () const
+{
+    if (GetWindow ())
+        return GetWindow()->IsVisible ();
+    return false;
+}
+
+bool Window::HasChildPathFocus (bool systemWindow) const
+{
+    return GetWindow()->HasChildPathFocus (systemWindow);
+}
+
+void Window::SetPosPixel (Point const&)
+{
+}
+
+Point Window::GetPosPixel () const
+{
+    return Point ();
+}
+
+void Window::SetSizePixel (Size const&)
+{
+}
+
+void Window::SetPosSizePixel (Point const&, Size const&)
+{
+}
+
+Size Window::GetSizePixel () const
+{
+    return Size ();
+}
+
+// void Window::Enable (bool enable, bool child);
+// {
+//     GetWindow ()->Enable (enable, child);
+// }
+
+// void Window::Disable (bool child)
+// {
+//     GetWindow ()->Disable (child);
+// }
+
+bool Window::IsEnabled () const
+{
+    return GetWindow ()->IsEnabled ();
+//     if (getImpl().mxWindow.is ())
+//         return getImpl ().mxWindow->isEnabled ();
+//     return false;
+}
+
+void Window::EnableInput (bool enable, bool child)
+{
+    GetWindow ()->EnableInput (enable, child);
+}
+
+bool Window::IsInputEnabled () const
+{
+    return GetWindow ()->IsInputEnabled ();
+}
+
+bool Window::HasFocus () const
+{
+    return GetWindow ()->HasFocus ();
+}
+
+Font& Window::GetFont () const
+{
+    return const_cast <Font&> (GetWindow ()->GetFont ());
+}
+
+void Window::SetFont (Font const& font)
+{
+    GetWindow ()->SetFont (font);
+}
+
+void Window::Invalidate (sal_uInt8 flags)
+{
+    GetWindow ()->Invalidate (flags);
+}
+
+struct ToolkitVclPropsMap
+{
+    WinBits vclStyle;
+    long initAttr;
+    const char *propName;
+
+    // the value to give the prop to enable/disable it -- not the most brilliant
+    // type declaration and storage, but does the work... properties are
+    // either a boolean or a short since they are either a directly wrappers for
+    // a WinBit, or aggregates related (like Align for WB_LEFT, _RIGHT and _CENTER).
+    bool isBoolean;
+    short enableProp, disableProp;
+};
+
+#define TYPE_BOOL  true
+#define TYPE_SHORT false
+#define NOTYPE     0
+static const ToolkitVclPropsMap toolkitVclPropsMap[] =
+{
+    { WB_BORDER,    awt::WindowAttribute::BORDER,    "Border", TYPE_SHORT, 1, 0 },
+    { WB_NOBORDER,    awt::VclWindowPeerAttribute::NOBORDER,    "Border", TYPE_SHORT, 0, 1 },
+    { WB_SIZEABLE,    awt::WindowAttribute::SIZEABLE,    NULL, NOTYPE, 0, 0 },
+    { WB_MOVEABLE,    awt::WindowAttribute::MOVEABLE,    NULL, NOTYPE, 0, 0 },
+    { WB_CLOSEABLE,    awt::WindowAttribute::CLOSEABLE,    NULL, NOTYPE, 0, 0 },
+
+    { WB_HSCROLL,    awt::VclWindowPeerAttribute::HSCROLL,    NULL, NOTYPE, 0, 0 },
+    { WB_VSCROLL,    awt::VclWindowPeerAttribute::VSCROLL,    NULL, NOTYPE, 0, 0 },
+    { WB_LEFT,    awt::VclWindowPeerAttribute::LEFT,    "Align", TYPE_SHORT, 0, 0 },
+    { WB_CENTER,    awt::VclWindowPeerAttribute::CENTER,    "Align", TYPE_SHORT, 1, 0 },
+    { WB_RIGHT,    awt::VclWindowPeerAttribute::RIGHT,    "Align", TYPE_SHORT, 2, 0 },
+    { WB_SPIN,    awt::VclWindowPeerAttribute::SPIN,    NULL, NOTYPE, 0, 0 },
+    { WB_SORT,    awt::VclWindowPeerAttribute::SORT,    NULL, NOTYPE, 0, 0 },
+    { WB_DROPDOWN,    awt::VclWindowPeerAttribute::DROPDOWN,    "Dropdown",    TYPE_BOOL, 1, 0 },
+    { WB_DEFBUTTON,    awt::VclWindowPeerAttribute::DEFBUTTON,    "DefaultButton", TYPE_BOOL, 1, 0 },
+    { WB_READONLY,    awt::VclWindowPeerAttribute::READONLY,    NULL, NOTYPE, 0, 0 },
+    { WB_CLIPCHILDREN,    awt::VclWindowPeerAttribute::CLIPCHILDREN,    NULL, NOTYPE, 0, 0 },
+    { WB_GROUP,    awt::VclWindowPeerAttribute::GROUP,    NULL, NOTYPE, 0, 0 },
+
+    { WB_OK,    awt::VclWindowPeerAttribute::OK,    NULL, NOTYPE, 0, 0 },
+    { WB_OK_CANCEL,    awt::VclWindowPeerAttribute::OK_CANCEL,    NULL, NOTYPE, 0, 0 },
+    { WB_YES_NO,    awt::VclWindowPeerAttribute::YES_NO,    NULL, NOTYPE, 0, 0 },
+    { WB_YES_NO_CANCEL,    awt::VclWindowPeerAttribute::YES_NO_CANCEL,    NULL, NOTYPE, 1, 0 },
+    { WB_RETRY_CANCEL,    awt::VclWindowPeerAttribute::RETRY_CANCEL,    NULL, NOTYPE, 1, 0 },
+    { WB_DEF_OK,    awt::VclWindowPeerAttribute::DEF_OK,    NULL, NOTYPE, 0, 0 },
+    { WB_DEF_CANCEL,    awt::VclWindowPeerAttribute::DEF_CANCEL,    NULL, NOTYPE, 1, 0 },
+    { WB_DEF_RETRY,    awt::VclWindowPeerAttribute::DEF_RETRY,    NULL, NOTYPE, 0, 0 },
+    { WB_DEF_YES,    awt::VclWindowPeerAttribute::DEF_YES,    NULL, NOTYPE, 0, 0 },
+    { WB_DEF_NO,    awt::VclWindowPeerAttribute::DEF_NO,    NULL, NOTYPE, 0, 0 },
+
+    { WB_AUTOHSCROLL, awt::VclWindowPeerAttribute::AUTOHSCROLL, "AutoHScroll", TYPE_BOOL, 1, 0 },
+    { WB_AUTOVSCROLL, awt::VclWindowPeerAttribute::AUTOVSCROLL, "AutoVScroll",    TYPE_BOOL, 1, 0 },
+
+    { WB_WORDBREAK,    0,    "MultiLine", TYPE_BOOL, 1, 0 },
+    { WB_NOPOINTERFOCUS,    0,    "FocusOnClick", TYPE_BOOL, 1, 0 },
+    { WB_TOGGLE,    0,    "Toggle", TYPE_BOOL, 1, 0 },
+    { WB_REPEAT,    0,    "Repeat", TYPE_BOOL, 1, 0 },
+    { WB_NOHIDESELECTION,    0,    "HideInactiveSelection", TYPE_BOOL, 1, 0 },
+};
+#undef TYPE_BOOL
+#undef TYPE_SHORT
+#undef NOTYPE
+
+static const int toolkitVclPropsMapLen =
+    sizeof( toolkitVclPropsMap ) / sizeof( ToolkitVclPropsMap );
+
+void Window::SetStyle( WinBits nStyle )
+{
+    uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
+    for (int i = 0; i < toolkitVclPropsMapLen; i++)
+    {
+        if ( toolkitVclPropsMap[ i ].propName )
+        {
+            short nValue;
+            if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
+                nValue = toolkitVclPropsMap[ i ].enableProp;
+            else
+                nValue = toolkitVclPropsMap[ i ].disableProp;
+            uno::Any aValue;
+            if ( toolkitVclPropsMap[ i ].isBoolean )
+                aValue = uno::makeAny( (bool) nValue );
+            else
+                aValue = uno::makeAny( (short) nValue );
+            mpImpl->setProperty( toolkitVclPropsMap[ i ].propName, aValue );
+        }
+    }
+}
+
+WinBits Window::GetStyle()
+{
+    uno::Reference< awt::XVclWindowPeer > xPeer = mpImpl->mxVclPeer;
+    WinBits ret = 0;
+    for (int i = 0; i < toolkitVclPropsMapLen; i++)
+    {
+        if ( toolkitVclPropsMap[ i ].propName )
+        {
+            short nValue = 0;
+            if ( toolkitVclPropsMap[ i ].isBoolean )
+            {
+                bool bValue = false;
+                mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= bValue;
+                nValue = bValue ? 1 : 0;
+            }
+            else
+                mpImpl->getProperty( toolkitVclPropsMap[ i ].propName ) >>= nValue;
+            if ( nValue == toolkitVclPropsMap[ i ].enableProp )
+                ret |= toolkitVclPropsMap[i].vclStyle;
+        }
+    }
+    return ret;
+}
+
+/* Unpleasant way to get an xToolkit pointer ... */
+uno::Reference< awt::XToolkit > getToolkit()
+{
+    static uno::Reference< awt::XToolkit > xToolkit;
+    if (!xToolkit.is())
+    {
+        // Urgh ...
+        xToolkit = uno::Reference< awt::XToolkit >(
+            ::comphelper::getProcessServiceFactory()->createInstance(
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ),
+            uno::UNO_QUERY );
+        if ( !xToolkit.is() )
+            throw uno::RuntimeException(
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "failed to create toolkit!") ),
+                uno::Reference< uno::XInterface >() );
+    }
+    return xToolkit;
+}
+
+PeerHandle Window::CreatePeer( Window *parent, WinBits nStyle, const char *pName)
+{
+    long nWinAttrbs = 0;
+    for (int i = 0; i < toolkitVclPropsMapLen; i++)
+        if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
+            nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
+
+    return layoutimpl::WidgetFactory::createWidget (getToolkit(), parent->GetPeer(), OUString::createFromAscii( pName ), nWinAttrbs);
+}
+
+void Window::Enable( bool bEnable )
+{
+    if ( !getImpl().mxWindow.is() )
+        return;
+    getImpl().mxWindow->setEnable( bEnable );
+}
+
+void Window::Show( bool bVisible )
+{
+    if ( !getImpl().mxWindow.is() )
+        return;
+    getImpl().mxWindow->setVisible( bVisible );
+    if (!bVisible)
+        getImpl ().bFirstTimeVisible = true;
+    else if (GetParent() && getImpl().bFirstTimeVisible)
+    {
+        getImpl().redraw ();
+        getImpl().bFirstTimeVisible = false;
+    }
+}
+
+void Window::GrabFocus()
+{
+    if ( !getImpl().mxWindow.is() )
+        return;
+    getImpl().mxWindow->setFocus();
+}
+
+void Window::SetUpdateMode(bool mode)
+{
+    GetWindow()->SetUpdateMode( mode );
+}
+
+void Window::SetPointer( Pointer const& pointer )
+{
+    GetWindow()->SetPointer( pointer );
+}
+
+Pointer const& Window::GetPointer() const
+{
+    return GetWindow()->GetPointer();
+}
+
+void Window::SetText( OUString const& str )
+{
+    GetWindow()->SetText( str );
+}
+
+String Window::GetText() const
+{
+    return GetWindow()->GetText();
+}
+
+sal_Int32 Window::GetCtrlTextWidth (OUString const&) const
+{
+    return 0;
+}
+
+sal_Int32 Window::GetTextHeight () const
+{
+    return 0;
+}
+
+Size Window::LogicToPixel( Size const& size, MapMode const&) const
+{
+    return size;
+}
+
+ControlImpl::ControlImpl (Context *context, const PeerHandle &peer, Window *window)
+    : WindowImpl( context, peer, window )
+{
+}
+
+ControlImpl::~ControlImpl ()
+{
+    if ((!!mGetFocusHdl || !!mLoseFocusHdl) && mxWindow.is ())
+        /* Disposing will be done @ VCLXWindow::dispose () maFocusListeners.disposeAndClear()
+           don't do it twice */
+        mxWindow.clear ();
+}
+
+void ControlImpl::SetGetFocusHdl (Link const& link)
+{
+    if (!mLoseFocusHdl || !link)
+        UpdateListening (link);
+    mGetFocusHdl = link;
+}
+
+Link& ControlImpl::GetGetFocusHdl ()
+{
+    return mGetFocusHdl;
+}
+
+void ControlImpl::SetLoseFocusHdl (Link const& link)
+{
+    if (!mGetFocusHdl || !link)
+        UpdateListening (link);
+    mLoseFocusHdl = link;
+}
+
+Link& ControlImpl::GetLoseFocusHdl ()
+{
+    return mGetFocusHdl;
+}
+
+void ControlImpl::UpdateListening (Link const& link)
+{
+    if (!link && (!!mGetFocusHdl || !!mLoseFocusHdl)
+        && (!mGetFocusHdl || !mLoseFocusHdl))
+        mxWindow->removeFocusListener (this);
+    else if (!!link && !mGetFocusHdl && !mLoseFocusHdl)
+        mxWindow->addFocusListener (this);
+}
+
+void SAL_CALL ControlImpl::disposing (lang::EventObject const&)
+    throw (uno::RuntimeException)
+{
+///    mxWindow.clear ();
+}
+
+void SAL_CALL ControlImpl::focusGained (awt::FocusEvent const&)
+    throw (uno::RuntimeException)
+{
+    mGetFocusHdl.Call (mpWindow);
+}
+
+void SAL_CALL ControlImpl::focusLost (awt::FocusEvent const&)
+    throw (uno::RuntimeException)
+{
+    mLoseFocusHdl.Call (mpWindow);
+}
+
+Link& Control::GetGetFocusHdl ()
+{
+    return getImpl ().GetGetFocusHdl ();
+}
+
+void Control::SetGetFocusHdl (Link const& link)
+{
+    if (&getImpl () && getImpl().mxWindow.is ())
+        getImpl ().SetGetFocusHdl (link);
+}
+
+Link& Control::GetLoseFocusHdl ()
+{
+    return getImpl ().GetLoseFocusHdl ();
+}
+
+void Control::SetLoseFocusHdl (Link const& link)
+{
+    if (&getImpl () && getImpl().mxWindow.is ())
+        getImpl ().SetLoseFocusHdl (link);
+}
+
+class DialogImpl : public WindowImpl
+{
+public:
+    uno::Reference< awt::XDialog2 > mxDialog;
+    DialogImpl( Context *context, PeerHandle const &peer, Window *window );
+};
+
+DialogImpl::DialogImpl( Context *context, const PeerHandle &peer, Window *window )
+    : WindowImpl( context, peer, window )
+    , mxDialog( peer, uno::UNO_QUERY )
+{
+}
+
+Dialog::Dialog( Window *parent, const char *xml_file, const char *id, sal_uInt32 nId )
+    : Context( xml_file )
+    , Window( new DialogImpl( this, Context::GetPeerHandle( id, nId ), this ) )
+    , bConstruct (true)
+{
+    if ( parent )
+        SetParent( parent );
+}
+
+Dialog::Dialog( ::Window *parent, const char *xml_file, const char *id, sal_uInt32 nId )
+    : Context( xml_file )
+    , Window( new DialogImpl( this, Context::GetPeerHandle( id, nId ), this ) )
+{
+    if ( parent )
+        SetParent( parent );
+}
+
+Dialog::~Dialog ()
+{
+}
+
+IMPL_GET_WINDOW (Dialog);
+IMPL_GET_IMPL (Dialog);
+
+#define MX_DIALOG if (getImpl ().mxDialog.is ()) getImpl ().mxDialog
+#define RETURN_MX_DIALOG if (getImpl ().mxDialog.is ()) return getImpl ().mxDialog
+
+short Dialog::Execute()
+{
+    RETURN_MX_DIALOG->execute ();
+    return -1;
+}
+
+void Dialog::EndDialog( long result )
+{
+    MX_DIALOG->endDialog (result);
+}
+
+void Dialog::SetText( OUString const& str )
+{
+    SetTitle (str);
+}
+
+void Dialog::SetTitle( OUString const& str )
+{
+    MX_DIALOG->setTitle (str);
+}
+
+bool Dialog::Close ()
+{
+    EndDialog (false);
+    return true;
+}
+
+long Dialog::Notify (NotifyEvent& event)
+{
+    return GetDialog ()->Notify (event);
+}
+
+void Dialog::Initialize (SfxChildWinInfo*)
+{
+}
+
+#define MESSAGE_BOX_MEMBER_INIT\
+    Dialog (parent, xml_file, id)\
+        , imageError (this, "FI_ERROR")\
+        , imageInfo (this, "FI_INFO")\
+        , imageQuery (this, "FI_QUERY")\
+        , imageWarning (this, "FI_WARNING")\
+        , messageText (this, "FT_MESSAGE")\
+        , cancelButton (this, "BTN_CANCEL")\
+        , helpButton (this, "BTN_HELP")\
+        , ignoreButton (this, "BTN_IGNORE")\
+        , noButton (this, "BTN_NO")\
+        , retryButton (this, "BTN_RETRY")\
+        , yesButton (this, "BTN_YES")
+
+MessageBox::MessageBox (::Window *parent, char const* message,
+                        char const* yes, char const* no, sal_uIntPtr help_id,
+                        char const* xml_file, char const* id)
+    : MESSAGE_BOX_MEMBER_INIT
+{
+    ignoreButton.Hide ();
+    retryButton.Hide ();
+    init (message, yes, no, help_id);
+}
+
+MessageBox::MessageBox (::Window *parent, OUString const& message,
+                        OUString yes, OUString no, sal_uIntPtr help_id,
+                        char const* xml_file, char const* id)
+    : MESSAGE_BOX_MEMBER_INIT
+{
+    ignoreButton.Hide ();
+    retryButton.Hide ();
+    init (message, yes, no, help_id);
+}
+
+#if !defined (__GNUC__)
+#define __PRETTY_FUNCTION__ __FUNCTION__
+#endif /* !__GNUC__ */
+
+MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message,
+                        char const* yes, char const* no, sal_uIntPtr help_id,
+                        char const* xml_file, char const* id)
+    : MESSAGE_BOX_MEMBER_INIT
+{
+    // HIG suggests using verbs instead of yes/no/retry etc.
+    // This constructor provides client-code compatibility: Client code should be fixed.
+#ifndef __SUNPRO_CC
+    OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
+#endif
+    bits_init (bits, OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
+}
+
+MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message,
+                        OUString yes, OUString no, sal_uIntPtr help_id,
+                        char const* xml_file, char const* id)
+    : MESSAGE_BOX_MEMBER_INIT
+{
+    // HIG suggests using verbs instead of yes/no/retry etc.
+    // This constructor provides client-code compatibility: Client code should be fixed.
+#ifndef __SUNPRO_CC
+    OSL_TRACE ("%s: warning, deprecated vcl/Messbox compatibility", __PRETTY_FUNCTION__);
+#endif
+    bits_init (bits, message, yes, no, help_id);
+}
+
+void MessageBox::bits_init (WinBits bits, OUString const& message,
+                            OUString yes, OUString no, sal_uIntPtr help_id)
+{
+    if ( bits & ( WB_OK_CANCEL | WB_OK ))
+        yes = Button::GetStandardText ( BUTTON_OK );
+    if ( bits & (WB_YES_NO | WB_YES_NO_CANCEL ))
+    {
+        yes = Button::GetStandardText ( BUTTON_YES );
+        no =  Button::GetStandardText ( BUTTON_NO );
+    }
+    if (! (bits & (WB_RETRY_CANCEL | WB_YES_NO_CANCEL | WB_ABORT_RETRY_IGNORE )))
+        cancelButton.Hide ();
+    if (! (bits & (WB_RETRY_CANCEL | WB_ABORT_RETRY_IGNORE)))
+        retryButton.Hide ();
+    if ( bits & WB_ABORT_RETRY_IGNORE )
+        cancelButton.SetText ( Button::GetStandardText (BUTTON_ABORT));
+    else
+        ignoreButton.Hide ();
+    if ( !(bits & ( WB_OK | WB_OK_CANCEL | WB_YES_NO | WB_YES_NO_CANCEL)))
+        yesButton.Hide ();
+    if ( !(bits & ( WB_YES_NO | WB_YES_NO_CANCEL)))
+        noButton.Hide ();
+
+    init (message, yes, no, help_id);
+}
+
+void MessageBox::init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id)
+{
+    init ( OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id);
+}
+
+void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, sal_uIntPtr help_id)
+{
+    imageError.Hide ();
+    imageInfo.Hide ();
+    imageQuery.Hide ();
+    imageWarning.Hide ();
+    if (message.getLength ())
+        messageText.SetText (message);
+    if (yes.getLength ())
+    {
+        yesButton.SetText (yes);
+        if (yes != OUString (Button::GetStandardText (BUTTON_OK))
+            && yes != OUString (Button::GetStandardText (BUTTON_YES)))
+            SetTitle (yes);
+        if (no.getLength ())
+            noButton.SetText (no);
+        else
+            noButton.Hide ();
+    }
+    if (help_id)
+        SetHelpId (help_id);
+    else
+        helpButton.Hide ();
+}
+
+#undef MESSAGE_BOX_IMPL
+#define MESSAGE_BOX_IMPL(Name)\
+    Name##Box::Name##Box (::Window *parent, char const* message,\
+                          char const* yes, char const* no, sal_uIntPtr help_id,\
+                          char const* xml_file, char const* id)\
+    : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
+    {\
+        image##Name.Show ();\
+    }\
+    Name##Box::Name##Box (::Window *parent, OUString const& message,\
+                          OUString yes, OUString no, sal_uIntPtr help_id,\
+                          char const* xml_file, char const* id)\
+    : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
+    {\
+        image##Name.Show ();\
+    }\
+    Name##Box::Name##Box (::Window *parent, WinBits bits, char const* message,\
+                          char const* yes, char const* no, sal_uIntPtr help_id,\
+                          char const* xml_file, char const* id)\
+    : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
+    {\
+        image##Name.Show ();\
+    }\
+    Name##Box::Name##Box (::Window *parent, WinBits bits, OUString const& message,\
+                          OUString yes, OUString no, sal_uIntPtr help_id,\
+                          char const* xml_file, char const* id)\
+    : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
+    {\
+        image##Name.Show ();\
+    }
+
+MESSAGE_BOX_IMPL (Error);
+MESSAGE_BOX_IMPL (Info);
+MESSAGE_BOX_IMPL (Query);
+MESSAGE_BOX_IMPL (Warning);
+
+class TabControlImpl
+    : public ControlImpl
+    , public ::cppu::WeakImplHelper1 <awt::XTabListener>
+{
+    Link mActivatePageHdl;
+    Link mDeactivatePageHdl;
+
+public:
+    uno::Reference <awt::XSimpleTabController> mxTabControl;
+    TabControlImpl (Context *context, const PeerHandle &peer, Window *window)
+        : ControlImpl (context, peer, window)
+        ,  mxTabControl (peer, uno::UNO_QUERY)
+    {
+    }
+
+    virtual void SAL_CALL disposing (lang::EventObject const& e)
+        throw (uno::RuntimeException)
+    {
+        ControlImpl::disposing (e);
+        mxTabControl.clear ();
+    }
+
+    Link& GetActivatePageHdl ()
+    {
+        return mActivatePageHdl;
+    }
+
+    void SetActivatePageHdl (Link const& link)
+    {
+        if (!mDeactivatePageHdl || !link)
+            UpdateListening (link);
+        mActivatePageHdl = link;
+    }
+
+    Link& GetDeactivatePageHdl ()
+    {
+        return mDeactivatePageHdl;
+    }
+
+    void SetDeactivatePageHdl (Link const& link)
+    {
+        if (!mActivatePageHdl || !link)
+            UpdateListening (link);
+        mDeactivatePageHdl = link;
+    }
+
+    void UpdateListening (Link const& link)
+    {
+        if (!link && (!!mActivatePageHdl || !!mDeactivatePageHdl))
+            mxTabControl->removeTabListener (this);
+        else if (!!link && !mActivatePageHdl && !mDeactivatePageHdl)
+            mxTabControl->addTabListener (this);
+    }
+
+    void SAL_CALL activated (sal_Int32)
+        throw (uno::RuntimeException)
+    {
+        mActivatePageHdl.Call (mpWindow);
+    }
+
+    void SAL_CALL deactivated (sal_Int32)
+        throw (uno::RuntimeException)
+    {
+        mDeactivatePageHdl.Call (mpWindow);
+    }
+
+    void SAL_CALL inserted (sal_Int32)
+        throw (uno::RuntimeException)
+    {
+    }
+
+    void SAL_CALL removed (sal_Int32)
+        throw (uno::RuntimeException)
+    {
+    }
+
+    void SAL_CALL changed (sal_Int32, uno::Sequence <beans::NamedValue> const&)
+        throw (uno::RuntimeException)
+    {
+    }
+};
+
+IMPL_GET_WINDOW (TabControl);
+IMPL_GET_LAYOUT_VCLXWINDOW (TabControl);
+
+#define MX_TABCONTROL if (getImpl ().mxTabControl.is ()) getImpl ().mxTabControl
+#define RETURN_MX_TABCONTROL if (getImpl ().mxTabControl.is ()) return getImpl ().mxTabControl
+
+TabControl::~TabControl ()
+{
+    SetActivatePageHdl (Link ());
+    SetDeactivatePageHdl (Link ());
+}
+
+void TabControl::InsertPage (sal_uInt16 id, OUString const& title, sal_uInt16 pos)
+{
+    (void) pos;
+//    GetTabControl ()->InsertPage (id, title, pos);
+//    GetTabControl ()->SetTabPage (id, new ::TabPage (GetTabControl ()));
+
+    MX_TABCONTROL->insertTab ();
+    SetCurPageId (id);
+
+#if 1 // colour me loc productive -- NOT
+#define ADD_PROP( seq, i, name, val )\
+    { \
+        beans::NamedValue value; \
+        value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
+        value.Value = uno::makeAny( val ); \
+        seq[i] = value; \
+    }
+
+    uno::Sequence< beans::NamedValue > seq (1);
+    ADD_PROP ( seq, 0, "Title", OUString (title) );
+    MX_TABCONTROL->setTabProps (id, seq);
+#else
+    GetTabPage (id)->SetText (title);
+#endif
+
+#if 0
+    /// This so seems the right solution, but it makes the buttons of the
+    /// tabdialog move up
+
+    ::TabPage *page = GetTabPage (id);
+    if (Window *w = dynamic_cast <Window*> (page))
+    {
+        w->SetParent (this);
+        //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->AddChild (w);
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //uno::Reference <uno::XInterface> x (page->GetWindowPeer());
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->::Window::GetWindowPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
+    }
+    getImpl ().redraw ();
+#endif
+}
+void TabControl::RemovePage (sal_uInt16 id)
+{
+    GetTabControl ()->RemovePage (id);
+}
+sal_uInt16 TabControl::GetPageCount () const
+{
+    return GetTabControl ()->GetPageCount ();
+}
+sal_uInt16 TabControl::GetPageId (sal_uInt16 pos) const
+{
+    return GetTabControl ()->GetPageId (pos);
+}
+sal_uInt16 TabControl::GetPagePos (sal_uInt16 id) const
+{
+    getImpl ().redraw ();
+    return GetTabControl ()->GetPagePos (id);
+}
+void TabControl::SetCurPageId (sal_uInt16 id)
+{
+    getImpl ().redraw ();
+    GetTabControl ()->SetCurPageId (id);
+}
+sal_uInt16 TabControl::GetCurPageId () const
+{
+    return GetTabControl ()->GetCurPageId ();
+}
+void TabControl::SetTabPage (sal_uInt16 id, ::TabPage* page)
+{
+    GetTabControl ()->SetTabPage (id, page);
+
+#if 0
+    /// This so seems the right solution, but it makes the buttons of the
+    /// tabdialog move up
+    if (Window *w = dynamic_cast <Window*> (page))
+    {
+        w->SetParent (this);
+        //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->AddChild (w);
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetWindowPeer (), uno::UNO_QUERY));
+        //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
+    }
+#endif
+    getImpl ().redraw ();
+}
+::TabPage* TabControl::GetTabPage (sal_uInt16 id) const
+{
+    return GetTabControl ()->GetTabPage (id);
+}
+void TabControl::SetActivatePageHdl (Link const& link)
+{
+    if (&getImpl () && getImpl().mxTabControl.is ())
+        getImpl ().SetActivatePageHdl (link);
+}
+Link& TabControl::GetActivatePageHdl () const
+{
+    return getImpl ().GetActivatePageHdl ();
+}
+void TabControl::SetDeactivatePageHdl (Link const& link)
+{
+    if (&getImpl () && getImpl().mxTabControl.is ())
+        getImpl ().SetDeactivatePageHdl (link);
+}
+Link& TabControl::GetDeactivatePageHdl () const
+{
+    return getImpl ().GetDeactivatePageHdl ();
+}
+void TabControl::SetTabPageSizePixel (Size const& size)
+{
+    GetTabControl ()->SetTabPageSizePixel (size);
+//    GetParent()->SetSizePixel (size);
+//    GetWindow()->SetSizePixel (size);
+    //GetVCLXTabControl->SetTabSize (size);
+}
+Size TabControl::GetTabPageSizePixel () const
+{
+#if 0
+    //return GetTabControl ()->GetTabPageSizePixel ();
+    static size_t const tab_page_first_index = 1;
+    for (size_t i = 0; i < GetPageCount (); i++)
+    {
+        ::TabPage *p = GetTabPage (i + tab_page_first_index);
+        //if (dynamic_cast<Windowt*> (p))
+        if (i) // URG
+            return p->GetOptimalSize (WINDOWSIZE_MINIMUM);
+    }
+#endif
+    return GetTabControl ()->GetTabPageSizePixel ();
+}
+
+IMPL_CONSTRUCTORS (TabControl, Control, "tabcontrol");
+IMPL_GET_IMPL (TabControl);
+
+class TabPageImpl : public WindowImpl
+{
+public:
+    uno::Reference< awt::XWindow > mxTabPage;
+    TabPageImpl( Context *context, const PeerHandle &peer, Window *window )
+        : WindowImpl( context, peer, window )
+        , mxTabPage( peer, uno::UNO_QUERY )
+    {
+    }
+};
+
+::Window* TabPage::global_parent = 0;
+TabControl* TabPage::global_tabcontrol = 0;
+
+IMPL_GET_IMPL( TabPage );
+
+TabPage::TabPage( Window *parent, const char *xml_file, const char *id, sal_uInt32 nId)
+    : Context( xml_file )
+    , Window( new TabPageImpl( this, Context::GetPeerHandle( id, nId ), this ) )
+{
+    if ( parent )
+        SetParent( parent );
+}
+
+TabPage::TabPage( ::Window *parent, const char *xml_file, const char *id, sal_uInt32 nId)
+    : Context( xml_file )
+    , Window( new TabPageImpl( this, Context::GetPeerHandle( id, nId ), this ) )
+{
+    if ( parent )
+        SetParent( parent );
+}
+
+TabPage::~TabPage()
+{
+    delete GetTabPage();
+}
+
+IMPL_GET_WINDOW( TabPage );
+
+void TabPage::ActivatePage()
+{
+}
+
+void TabPage::DeactivatePage()
+{
+}
+
+class FixedLineImpl : public ControlImpl
+{
+public:
+    FixedLineImpl( Context *context, const PeerHandle &peer, Window *window )
+        : ControlImpl( context, peer, window )
+    {
+    }
+};
+
+IMPL_CONSTRUCTORS( FixedLine, Control, "hfixedline" );
+IMPL_GET_IMPL( FixedLine );
+
+bool FixedLine::IsEnabled() const
+{
+    //FIXME
+    return true;
+}
+
+class FixedTextImpl : public ControlImpl
+{
+public:
+    uno::Reference< awt::XFixedText > mxFixedText;
+    FixedTextImpl( Context *context, const PeerHandle &peer, Window *window )
+        : ControlImpl( context, peer, window )
+        , mxFixedText( peer, uno::UNO_QUERY )
+    {
+    }
+
+    ~FixedTextImpl ();
+
+    virtual void SAL_CALL disposing( lang::EventObject const& e )
+        throw (uno::RuntimeException);
+};
+
+FixedTextImpl::~FixedTextImpl ()
+{
+}
+
+void SAL_CALL FixedTextImpl::disposing( lang::EventObject const& e )
+    throw (uno::RuntimeException)
+{
+    ControlImpl::disposing (e);
+    mxFixedText.clear ();
+}
+
+FixedText::~FixedText ()
+{
+}
+
+IMPL_CONSTRUCTORS( FixedText, Control, "fixedtext" );
+IMPL_GET_IMPL( FixedText );
+
+void FixedText::SetText( OUString const& rStr )
+{
+    if ( !getImpl().mxFixedText.is() )
+        return;
+    getImpl().mxFixedText->setText( rStr );
+}
+
+class FixedInfoImpl : public FixedTextImpl
+{
+public:
+    FixedInfoImpl( Context *context, const PeerHandle &peer, Window *window )
+        : FixedTextImpl( context, peer, window )
+    {
+    }
+};
+
+IMPL_CONSTRUCTORS( FixedInfo, FixedText, "fixedinfo" );
+IMPL_GET_IMPL( FixedInfo );
+
+class ProgressBarImpl : public ControlImpl
+{
+public:
+    uno::Reference< awt::XProgressBar > mxProgressBar;
+    ProgressBarImpl( Context *context, const PeerHandle &peer, Window *window )
+        : ControlImpl( context, peer, window )
+        , mxProgressBar( peer, uno::UNO_QUERY )
+    {
+    }
+
+    virtual void SAL_CALL disposing( lang::EventObject const& e )
+        throw (uno::RuntimeException)
+    {
+        ControlImpl::disposing (e);
+        mxProgressBar.clear ();
+    }
+};
+
+
+class FixedImageImpl: public ControlImpl
+{
+public:
+    uno::Reference< graphic::XGraphic > mxGraphic;
+    FixedImageImpl( Context *context, const PeerHandle &peer, Window *window)
+//                    const char *pName )
+        : ControlImpl( context, peer, window )
+          //, mxGraphic( layoutimpl::loadGraphic( pName ) )
+        , mxGraphic( peer, uno::UNO_QUERY )
+    {
+        if ( !mxGraphic.is() )
+        {
+            DBG_ERROR( "ERROR: failed to load image: `%s'" /*, pName*/ );
+        }
+#if 0
+        else
+            getImpl().mxGraphic->...();
+#endif
+    }
+};
+
+IMPL_CONSTRUCTORS( FixedImage, Control, "fixedimage" );
+IMPL_GET_IMPL( FixedImage )
+
+void FixedImage::setImage( ::Image const& i )
+{
+    (void) i;
+    if ( !getImpl().mxGraphic.is() )
+        return;
+    //FIXME: hack moved to proplist
+    //getImpl().mxGraphic =
+}
+
+#if 0
+
+FixedImage::FixedImage( const char *pName )
+    : pImpl( new FixedImageImpl( pName ) )
+{
+}
+
+FixedImage::~FixedImage()
+{
+    delete pImpl;
+}
+
+#endif
+
+
+IMPL_CONSTRUCTORS( ProgressBar, Control, "ProgressBar" );
+IMPL_GET_IMPL( ProgressBar );
+
+void ProgressBar::SetForegroundColor( util::Color color )
+{
+    if ( !getImpl().mxProgressBar.is() )
+        return;
+    getImpl().mxProgressBar->setForegroundColor( color );
+}
+
+void ProgressBar::SetBackgroundColor( util::Color color )
+{
+    if ( !getImpl().mxProgressBar.is() )
+        return;
+    getImpl().mxProgressBar->setBackgroundColor( color );
+}
+
+void ProgressBar::SetValue( sal_Int32 i )
+{
+    if ( !getImpl().mxProgressBar.is() )
+        return;
+    getImpl().mxProgressBar->setValue( i );
+}
+
+void ProgressBar::SetRange( sal_Int32 min, sal_Int32 max )
+{
+    if ( !getImpl().mxProgressBar.is() )
+        return;
+    getImpl().mxProgressBar->setRange( min, max );
+}
+
+sal_Int32 ProgressBar::GetValue()
+{
+    if ( !getImpl().mxProgressBar.is() )
+        return 0;
+    return getImpl().mxProgressBar->getValue();
+}
+
+class PluginImpl: public ControlImpl
+{
+public:
+    ::Control *mpPlugin;
+
+    PluginImpl( Context *context, const PeerHandle &peer, Window *window, :: Control *plugin )
+        : ControlImpl( context, peer, window )
+        , mpPlugin( plugin )
+    {
+        uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
+        layoutimpl::VCLXPlugin *vcl
+            = static_cast<layoutimpl::VCLXPlugin*>( VCLXWindow::GetImplementation( ref ) );
+        ::Window *parent = vcl->mpWindow->GetParent();
+        vcl->SetWindow( plugin );
+        vcl->SetPlugin( mpPlugin );
+        plugin->SetParent( parent );
+        plugin->SetStyle( vcl->mStyle );
+        plugin->SetCreatedWithToolkit( true );
+        plugin->SetComponentInterface( vcl );
+        plugin->Show();
+    }
+};
+
+Plugin::Plugin( Context *context, char const *id, ::Control *plugin )
+    : Control( new PluginImpl( context, context->GetPeerHandle( id, 0 ), this, plugin ) )
+    , mpPlugin( plugin )
+{
+}
+
+IMPL_GET_IMPL( Plugin );
+
+class LocalizedStringImpl : public WindowImpl
+{
+public:
+    layoutimpl::LocalizedString *mpString;
+    OUString maString;
+    LocalizedStringImpl( Context *context, const PeerHandle &peer, Window *window )
+        : WindowImpl( context, peer, window )
+        , mpString( static_cast<layoutimpl::LocalizedString*>( VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( mxWindow, uno::UNO_QUERY ) ) ) )
+        , maString ()
+    {
+    }
+    OUString getText()
+    {
+        if (mpString)
+            maString = mpString->getText ();
+        return maString;
+    }
+    void setText( OUString const& s )
+    {
+        if (mpString)
+            mpString->setText( s );
+    }
+};
+
+IMPL_GET_IMPL( LocalizedString );
+
+LocalizedString::LocalizedString( Context *context, char const* id )
+    : Window( new LocalizedStringImpl( context, context->GetPeerHandle( id, 0 ), this ) )
+{
+}
+
+String LocalizedString::getString ()
+{
+    return getImpl ().getText ();
+}
+
+OUString LocalizedString::getOUString ()
+{
+    return getImpl ().getText ();
+}
+
+LocalizedString::operator OUString ()
+{
+    return getOUString ();
+}
+
+LocalizedString::operator OUString const& ()
+{
+    getOUString ();
+    return getImpl ().maString;
+}
+
+LocalizedString::operator String()
+{
+    getOUString ();
+    return getImpl ().maString;
+}
+
+String LocalizedString::GetToken (USHORT i, sal_Char c)
+{
+    return getString ().GetToken (i, c);
+}
+
+OUString LocalizedString::operator= (OUString const& s)
+{
+    getImpl().setText( s );
+    return getImpl().getText();
+}
+
+OUString LocalizedString::operator+= (OUString const& b)
+{
+    OUString a = getImpl ().getText ();
+    a += b;
+    getImpl ().setText (a);
+    return getImpl ().getText ();
+}
+
+OUString LocalizedString::operator+= (sal_Unicode const b)
+{
+    String a = getImpl ().getText ();
+    a += b;
+    getImpl ().setText (a);
+    return getImpl ().getText ();
+}
+
+class InPlugImpl : public WindowImpl
+{
+public:
+    InPlugImpl (Context *context, const PeerHandle &peer, Window *window)
+        : WindowImpl (context, peer, window)
+    {
+    }
+};
+
+IMPL_GET_IMPL (InPlug);
+
+static char const *FIXME_set_parent (::Window *parent, char const *xml_file)
+{
+    layout::TabPage::global_parent = parent;
+    return xml_file;
+}
+
+InPlug::InPlug (Window *parent, char const* xml_file, char const* id, sal_uInt32 nId)
+    : Context (FIXME_set_parent (parent ? parent->GetWindow () : 0, xml_file))
+    , layout::Window (new InPlugImpl (this, Context::GetPeerHandle (id, nId), this))
+{
+    if (parent)
+        SetParent (parent);
+    if (::Window *w = dynamic_cast< ::Window* > (this))
+        w->SetComponentInterface (GetVCLXWindow ());
+}
+
+InPlug::InPlug (::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId)
+    : Context (FIXME_set_parent (parent, xml_file))
+    , layout::Window (new InPlugImpl (this, Context::GetPeerHandle (id, nId), this))
+{
+    if (parent)
+        layout::Window::SetParent (parent);
+    if (::Window *w = dynamic_cast< ::Window* > (this))
+        w->SetComponentInterface (GetVCLXWindow ());
+}
+
+void InPlug::ParentSet (Window *window)
+{
+    window->SetParent (dynamic_cast< ::Window* > (this));
+
+    /// FIXME: for standalone run of layout::SfxTabDialog
+    SetParent (window->GetParent ());
+}
+
+} // namespace layout