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.

5 files changed, 493 insertions, 225 deletions

diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
index fb1a809a6156..d5597bb0073b 100644
--- a/toolkit/inc/layout/layout-post.hxx
+++ b/toolkit/inc/layout/layout-post.hxx
@@ -34,39 +34,72 @@
 
 #if ENABLE_LAYOUT
 
+/* Allow re-inclusion for cxx file. */
+#undef _LAYOUT_PRE_HXX
+
+
 #undef AdvancedButton
+#undef ApplyButton
 #undef Box
 #undef Button
 #undef CancelButton
 #undef CheckBox
+#undef ComboBox
 #undef Container
+#undef Control
+#undef Dialog
+#undef Edit
+#undef ErrorBox
 #undef FixedImage
 #undef FixedInfo
 #undef FixedLine
 #undef FixedText
-#undef HelpButton
 #undef HBox
+#undef HelpButton
+#undef IgnoreButton
+#undef ImageButton
+#undef InfoBox
+#undef ListBox
+#undef MessBox
+#undef MessageBox
 #undef MetricField
+#undef MetricFormatter
 #undef MoreButton
 #undef MultiLineEdit
+#undef MultiListBox
+#undef NoButton
+#undef NumericField
+#undef NumericFormatter
 #undef OKButton
+#undef Plugin
 #undef ProgressBar
 #undef PushButton
+#undef QueryBox
 #undef RadioButton
-#undef SfxModalDialog
+#undef ResetButton
+#undef RetryButton
+#undef SfxTabPage
+#undef SfxTabDialog
+#undef SpinField
+#undef TabDialog
+#undef TabControl
+#undef TabPage
 #undef Table
 #undef VBox
+#undef WarningBox
+#undef YesButton
 
-#undef Window
-
-#undef SVX_RES
-#define SVX_RES(i) ResId(i,DIALOG_MGR())
+#undef SvxFontListBox
+#undef SvxLanguageBox
 
-#undef SW_RES
-#define SW_RES(i) ResId(i,SWDIALOG_MGR())
+#undef ModalDialog
+#undef ModelessDialog
+#undef ScExpandedFixedText
+#undef SfxDialog
+#undef SfxModalDialog
+#undef SfxModelessDialog
 
-/* Allow re-inclusion for cxx file. */
-#undef _LAYOUT_PRE_HXX
+#undef Window
 
 #endif /* ENABLE_LAYOUT */
 
diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
index 747c8b13db45..d8a1e5d9665c 100644
--- a/toolkit/inc/layout/layout-pre.hxx
+++ b/toolkit/inc/layout/layout-pre.hxx
@@ -34,83 +34,78 @@
 
 #if ENABLE_LAYOUT
 
-//#if !LAYOUT
-//#define LAYOUT 1
-//#endif
-//#define LAYOUT_NS layout
-
-// TWBN, but find that SfxModalDialog and FixedLine are already defined, eg compiling
-// dlgfact.cxx
-//typedef layout::Dialog SfxModalDialog;
-//typedef layout::FixedLine FixedLine;
+///* Allow re-inclusion for next hxx file. */
+#undef _LAYOUT_POST_HXX
 
 #define AdvancedButton layout::AdvancedButton
+#define ApplyButton layout::ApplyButton
 #define Box layout::Box
 #define Button layout::Button
 #define CancelButton layout::CancelButton
 #define CheckBox layout::CheckBox
+#define ComboBox layout::ComboBox
 #define Container layout::Container
+#define Control layout::Control
+#define Dialog layout::Dialog
+#define Edit layout::Edit
+#define ErrorBox layout::ErrorBox
 #define FixedImage layout::FixedImage
 #define FixedInfo layout::FixedInfo
 #define FixedLine layout::FixedLine
 #define FixedText layout::FixedText
 #define HBox layout::HBox
 #define HelpButton layout::HelpButton
+#define IgnoreButton layout::IgnoreButton
+#define ImageButton layout::ImageButton
+#define InfoBox layout::InfoBox
+#define LocalizedString layout::LocalizedString
+#define ListBox layout::ListBox
+#define MessBox layout::MessBox
+#define MessageBox layout::MessageBox
 #define MetricField layout::MetricField
+#define MetricFormatter layout::MetricFormatter
 #define MoreButton layout::MoreButton
 #define MultiLineEdit layout::MultiLineEdit
+#define MultiListBox layout::MultiListBox
+#define NoButton layout::NoButton
+#define NumericField layout::NumericField
+#define NumericFormatter layout::NumericFormatter
 #define OKButton layout::OKButton
+#define Plugin layout::Plugin
 #define ProgressBar layout::ProgressBar
 #define PushButton layout::PushButton
+#define QueryBox layout::QueryBox
 #define RadioButton layout::RadioButton
-#define SfxModalDialog layout::Dialog
+#define ResetButton layout::ResetButton
+#define RetryButton layout::RetryButton
+#define SfxTabDialog layout::SfxTabDialog
+#define SfxTabPage layout::SfxTabPage
+#if ENABLE_LAYOUT
+#define SvxFontListBox layout::SvxFontListBox
+#define SvxLanguageBox layout::SvxLanguageBox
+#endif
+#define SpinField layout::SpinField
+#define TabControl layout::TabControl
+#define TabPage layout::TabPage
 #define Table layout::Table
 #define VBox layout::VBox
+#define WarningBox layout::WarningBox
+#define YesButton layout::YesButton
 
-/* FIXME: why are we defaulting to layout::Window?
-   /home/janneke/vc/ooo-build/build/hack/sw/source/ui/dialog/wordcountdialog.cxx:87: error: no matching function for call to 'layout::Dialog::Dialog(Window*&, const char [14], const char [7])'
-   ../../../../layout/inc/layout/layout.hxx:304: note: candidates are: layout::Dialog::Dialog(layout::Window*, const char*, const char*, sal_uInt32)
-   ../../../../layout/inc/layout/layout.hxx:300: note:                 layout::Dialog::Dialog(const layout::Dialog&)
-*/
+#define ModalDialog Dialog
+#define ModelessDialog Dialog
+#define ScExpandedFixedText FixedText
+#define SfxDialog Dialog
+#define SfxModalDialog Dialog
+#define SfxModelessDialog Dialog
+#define TabDialog Dialog
 
 #define Window ::Window
 
-#undef SVX_RES
-#define SVX_RES(x) #x
-#undef SW_RES
-#define SW_RES(x) #x
-
-/* Hmm.  This hack makes zoom.cxx, wordcountdialog.cxx diffs smaller
- * but is not scalable. */
-#ifdef _LAYOUT_POST_HXX
-
-#ifdef _SVX_RECOVER_CXX
-#undef SfxModalDialog
-// 3rd parameter must match ID in <modaldialog> "RID_SVXDLG_RECOVER", localize.sdf
-#define SfxModalDialog( pParent, SVX_RES_RID ) layout::Dialog( pParent, "recover.xml", "RID_SVXDLG_RECOVER" )
-//#define _SVX_RECOVER_HRC
-#endif /* _SVX_RECOVER_CXX */
-
-#ifdef SW_WORDCOUNTDIALOG_HXX
-#undef SfxModalDialog
-// 3rd parameter must match ID in <modaldialog> "DLG_WORDCOUNT", localize.sdf
-#define SfxModalDialog( pParent, SW_RES_RID ) layout::Dialog( pParent, "wordcount.xml", "DLG_WORDCOUNT" )
-#define SW_WORDCOUNTDIALOG_HRC
-#endif /* SW_WORDCOUNTDIALOG_HXX */
-
-#ifdef _SVX_ZOOM_CXX
-#undef SfxModalDialog
-// 3rd parameter must match ID in <modaldialog> "RID_SVXDLG_ZOOM", localize.sdf
-#define SfxModalDialog( pParent, SVX_RES_RID ) layout::Dialog( pParent, "zoom.xml", "RID_SVXDLG_ZOOM" )
-#define _SVX_ZOOM_HRC
-#endif /* _SVX_ZOOM_CXX */
-
-#endif /* _LAYOUT_POST_HXX */
-
-#else /* !ENABLE_LAYOUT */
+#else
 
-#define LAYOUT_PRE_POST
+#define LocalizedString String
 
-#endif /* !ENABLE_LAYOUT */
+#endif /* ENABLE_LAYOUT */
 
 #endif /* _LAYOUT_PRE_HXX */
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 2f3ff0df461f..19179507b294 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -32,21 +32,54 @@
 #ifndef _LAYOUT_HXX
 #define _LAYOUT_HXX
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/awt/XLayoutContainer.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/Color.hpp>
+#include <i18npool/lang.h>
+#include <toolkit/dllapi.h>
+#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/string.hxx>
-
-// FIXME: eventually wrap FieldUnit
+#include <vcl/bitmap.hxx>
+#include <vcl/combobox.h>
 #include <vcl/fldunit.hxx>
-// FIXME: eventually wrap this too ...
+#include <vcl/lstbox.h>
+#include <vcl/smartid.hxx>
 #include <vcl/wintypes.hxx>
 
-#include <toolkit/dllapi.h>
-
-class Window;
+class Button;
+class ComboBox;
+class Color;
+class Control;
+class Dialog;
+class Edit;
+class Font;
 class Image;
+class ListBox;
+class MapMode;
+class MultiListBox;
+class NotifyEvent;
+class Pointer;
+class PushButton;
+class RadioButton;
+class ResId;
+struct SfxChildWinInfo;
+//class SvxFontListBox;
+//class SvxLanguageBox;
+class TabControl;
+class TabPage;
+class VCLXRadioButton;
+class VCLXWindow;
+class Window;
+
+namespace layoutimpl
+{
+class VCLXTabControl;
+}
+
+class VCLXTabControl;
+
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
 
 namespace layout
 {
@@ -60,8 +93,8 @@ class TOOLKIT_DLLPUBLIC Context
     ContextImpl *pImpl;
 public:
     Context( char const* pPath );
-    ~Context();
-    PeerHandle GetPeerHandle( char const* pId, sal_uInt32 nId = 0 ) const;
+    virtual ~Context();
+    PeerHandle GetPeerHandle( char const* id, sal_uInt32 nId = 0 ) const;
     void setToplevel( PeerHandle xToplevel );
     PeerHandle getToplevel();
     PeerHandle getRoot();
@@ -74,36 +107,95 @@ public:
             par( pImpl ) {} \
         char const* GetUnoName() const; \
     public: \
-        t( Context *pCtx, char const* pId, sal_uInt32 nId = 0 ); \
-        t( Window *pParent, WinBits nStyle = defaultWinBit )
+        t( Context *context, char const* id, sal_uInt32 nId = 0 ); \
+        t( Window *parent, WinBits nStyle = defaultWinBit ); \
+        t (Window *parent, ResId const &res)
 #define DECL_GET_IMPL(t) \
         inline t##Impl &getImpl() const
 
+#define DECL_GET_WINDOW( cls ) ::cls* Get##cls() const
+#define IMPL_GET_WINDOW( cls ) ::cls* cls::Get##cls() const { return dynamic_cast< ::cls*>( GetWindow() ); }
+
+#define DECL_GET_VCLXWINDOW( cls ) ::VCLX##cls* GetVCLX##cls() const
+#define IMPL_GET_VCLXWINDOW( cls ) ::VCLX##cls* cls::Get##VCLX##cls() const { return dynamic_cast< ::VCLX##cls*>( GetVCLXWindow() ); }
+
+#define DECL_GET_LAYOUT_VCLXWINDOW( cls ) ::layoutimpl::VCLX##cls* GetVCLX##cls() const
+#define IMPL_GET_LAYOUT_VCLXWINDOW( cls ) ::layoutimpl::VCLX##cls* cls::Get##VCLX##cls() const { return dynamic_cast< ::layoutimpl::VCLX##cls*>( GetVCLXWindow() ); }
+
 // follows the VCL inheritance hierarchy ...
 
 class WindowImpl;
 class TOOLKIT_DLLPUBLIC Window
 {
 protected:
+    friend class WindowImpl;
     WindowImpl *mpImpl;
-    static PeerHandle CreatePeer( Window *pParent, WinBits nStyle,
+    static PeerHandle CreatePeer( Window *parent, WinBits nStyle,
                                   char const* pName);
+
+    virtual void setRes (ResId const& res);
+
 public:
-    PeerHandle GetPeer();
-    Context *getContext();
     DECL_GET_IMPL( Window );
     explicit Window( WindowImpl *pImpl );
     virtual ~Window();
 
+    PeerHandle GetPeer() const;
+    Context *getContext();
+
     void Enable( bool bEnable = true );
     inline void Disable() { Enable( false ); }
-    void Show( BOOL bVisible = TRUE );
-    inline void Hide() { Show( FALSE ); }
+    void Show( bool bVisible = true );
+    inline void Hide() { Show( false ); }
     void GrabFocus();
     void FreeResource() {}
 
+    void SetParent( ::Window *parent );
+    virtual void ParentSet (Window *window);
+    void SetParent( Window *parent );
+
+    css::uno::Reference<css::awt::XWindow> GetRef() const;
+    VCLXWindow* GetVCLXWindow() const;
+    ::Window* GetWindow() const;
+    ::Window* GetParent() const;
+
+    void SetPointer( Pointer const& pointer );
+    Pointer const& GetPointer() const;
     WinBits GetStyle();
-    void SetStyle( WinBits nStyle );
+    void SetText( rtl::OUString const& str );
+    String GetText() const;
+    void SetStyle( WinBits style );
+    void SetUpdateMode( bool mode );
+    void SetHelpId( sal_uIntPtr id );
+    sal_uIntPtr GetHelpId() const;
+    void SetSmartHelpId( SmartId const&, SmartIdUpdateMode mode=SMART_SET_SMART );
+    SmartId GetSmartHelpId() const;
+    void EnterWait ();
+    void LeaveWait ();
+    bool IsWait () const;
+    //void Enable (bool enable=true, bool child=true);
+    //void Disable (bool child=true);
+    bool IsEnabled () const;
+    void EnableInput (bool enable=true, bool child=true);
+    bool IsInputEnabled () const;
+
+    bool IsVisible () const;
+    bool HasChildPathFocus (bool systemWindow=false) const;
+    void SetPosPixel (Point const&);
+    Point GetPosPixel () const;
+    void SetSizePixel (Size const&);
+    Size GetSizePixel () const;
+    void SetPosSizePixel (Point const&, Size const&);
+    sal_Int32 GetCtrlTextWidth (rtl::OUString const& str) const;
+    sal_Int32 GetTextHeight () const;
+
+    Size LogicToPixel( Size const& size ) const;
+    Size LogicToPixel( Size const& size, MapMode const& mapMode ) const;
+
+    bool HasFocus () const;
+    Font& GetFont () const;
+    void SetFont (Font const& font);
+    virtual void Invalidate (sal_uInt8 flags=0);
 };
 
 class ControlImpl;
@@ -111,34 +203,39 @@ class TOOLKIT_DLLPUBLIC Control : public Window
 {
     DECL_GET_IMPL( Control );
     DECL_CONSTRUCTORS( Control, Window, 0 );
+
 public:
-// void SetText( String const& rStr ); - can't do this here ...
+    ~Control ();
+    void SetGetFocusHdl (Link const& link);
+    Link& GetGetFocusHdl ();
+    void SetLoseFocusHdl (Link const& link);
+    Link& GetLoseFocusHdl ();
 };
 
 class FixedLineImpl;
 class TOOLKIT_DLLPUBLIC FixedLine : public Control
 {
-    friend class FixedLineImpl;
     DECL_GET_IMPL( FixedLine );
     DECL_CONSTRUCTORS( FixedLine, Control, WB_HORZ );
+
 public:
-    bool IsEnabled();
+    bool IsEnabled() const;
 };
 
 class FixedTextImpl;
 class TOOLKIT_DLLPUBLIC FixedText : public Control
 {
-    friend class FixedTextImpl;
     DECL_GET_IMPL( FixedText );
     DECL_CONSTRUCTORS( FixedText, Control, 0 );
+
 public:
-    void SetText( String const& rStr );
+    ~FixedText ();
+    void SetText( rtl::OUString const& rStr );
 };
 
 class FixedImageImpl;
 class TOOLKIT_DLLPUBLIC FixedImage : public Control
 {
-    friend class FixedImageImpl;
     DECL_GET_IMPL( FixedImage );
     DECL_CONSTRUCTORS( FixedImage, Control, 0 );
 public:
@@ -148,7 +245,6 @@ public:
 class FixedInfoImpl;
 class TOOLKIT_DLLPUBLIC FixedInfo : public FixedText
 {
-    friend class FixedInfoImpl;
     DECL_GET_IMPL( FixedInfo );
     DECL_CONSTRUCTORS( FixedInfo, FixedText, 0 );
 };
@@ -166,16 +262,21 @@ public:
 class ButtonImpl;
 class TOOLKIT_DLLPUBLIC Button : public Control
 {
-    friend class ButtonImpl;
     DECL_GET_IMPL( Button );
     DECL_CONSTRUCTORS( Button, Control, 0 );
+    DECL_GET_WINDOW (Button);
+
 public:
-    void SetText( String const& rStr );
-    BOOL SetModeImage( const Image& rImage );
+    ~Button ();
+    static String GetStandardText (sal_uInt16 button_type);
+    void SetText( rtl::OUString const& rStr );
+    bool SetModeImage (Image const& image);
+    bool SetModeImage (::Image const& image, BmpColorMode mode=BMP_COLOR_NORMAL);
     void SetImageAlign( ImageAlign eAlign );
 
     void SetClickHdl( Link const& rLink );
     virtual void Click() /* pure virtual? */;
+    Link& GetClickHdl ();
 };
 
 class PushButtonImpl;
@@ -183,9 +284,12 @@ class TOOLKIT_DLLPUBLIC PushButton : public Button
 {
     DECL_GET_IMPL( PushButton );
     DECL_CONSTRUCTORS( PushButton, Button, 0 );
+    DECL_GET_WINDOW (PushButton);
+
 public:
-    void Check( BOOL bCheck = TRUE );
-    BOOL IsChecked() const;
+    ~PushButton ();
+    void Check( bool bCheck=true );
+    bool IsChecked() const;
 
     void Toggle();
     void SetToggleHdl( Link const& rLink );
@@ -227,6 +331,10 @@ class TOOLKIT_DLLPUBLIC HelpButton : public PushButton
 {
     DECL_CONSTRUCTORS( HelpButton, PushButton, 0 );
 };
+class TOOLKIT_DLLPUBLIC ImageButton : public PushButton
+{
+    DECL_CONSTRUCTORS( ImageButton, PushButton, 0 );
+};
 
 class AdvancedButtonImpl;
 class TOOLKIT_DLLPUBLIC AdvancedButton : public PushButton
@@ -238,6 +346,12 @@ class TOOLKIT_DLLPUBLIC AdvancedButton : public PushButton
     void AddSimple( Window* w );
     void RemoveAdvanced( Window* w );
     void RemoveSimple( Window* w );
+
+    void SetAdvancedText (rtl::OUString const& text);
+    void SetSimpleText (rtl::OUString const& text);
+    rtl::OUString GetAdvancedText () const;
+    rtl::OUString GetSimpleText () const;
+    void SetDelta (int);
 };
 
 class MoreButtonImpl;
@@ -247,6 +361,11 @@ class TOOLKIT_DLLPUBLIC MoreButton : public AdvancedButton
     DECL_GET_IMPL( MoreButton );
     void AddWindow( Window* w );
     void RemoveWindow( Window* w );
+
+    void SetMoreText (rtl::OUString const& text);
+    void SetLessText (rtl::OUString const& text);
+    rtl::OUString GetMoreText () const;
+    rtl::OUString GetLessText () const;
 };
 
 class RadioButtonImpl;
@@ -254,9 +373,12 @@ class TOOLKIT_DLLPUBLIC RadioButton : public Button
 {
     DECL_GET_IMPL( RadioButton );
     DECL_CONSTRUCTORS( RadioButton, Button, 0 );
+    DECL_GET_WINDOW( RadioButton );
+    DECL_GET_VCLXWINDOW( RadioButton );
 public:
-    void Check( BOOL bCheck = TRUE );
-    BOOL IsChecked() const;
+    ~RadioButton ();
+    void Check( bool bCheck=true );
+    bool IsChecked() const;
 
     void Toggle();
     void SetToggleHdl( Link const& rLink );
@@ -267,9 +389,11 @@ class TOOLKIT_DLLPUBLIC CheckBox : public Button
 {
     DECL_GET_IMPL( CheckBox );
     DECL_CONSTRUCTORS( CheckBox, Button, 0 );
+
 public:
-    void Check( BOOL bCheck = TRUE );
-    BOOL IsChecked() const;
+    ~CheckBox ();
+    void Check( bool bCheck=true );
+    bool IsChecked() const;
 
     void Toggle();
     void SetToggleHdl( Link const& rLink );
@@ -280,10 +404,14 @@ class TOOLKIT_DLLPUBLIC Edit : public Control
 {
     DECL_GET_IMPL( Edit );
     DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
+    DECL_GET_WINDOW (Edit);
+
 public:
-    void SetText( XubString const& rStr ) const;
-    XubString GetText() const;
+    ~Edit ();
+    void SetText( rtl::OUString const& rStr );
+    String GetText() const;
     void SetModifyHdl( Link const& rLink );
+    void SetSelection( Selection const& rSelection );
 };
 
 class MultiLineEditImpl;
@@ -305,8 +433,7 @@ class TOOLKIT_DLLPUBLIC FormatterBase
 {
 protected:
     FormatterBaseImpl *mpFormatImpl;
-    FormatterBase( FormatterBaseImpl *pFormatImpl )
-        : mpFormatImpl( pFormatImpl ) {}
+    FormatterBase( FormatterBaseImpl *pFormatImpl );
 };
 
 class NumericFormatterImpl;
@@ -331,8 +458,8 @@ class TOOLKIT_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
 {
     DECL_GET_IMPL( NumericField );
 public:
-    NumericField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
-    NumericField( Window *pParent, WinBits nStyle );
+    NumericField( Context *context, char const* id, sal_uInt32 nId=0 );
+    NumericField( Window *parent, WinBits nStyle );
 };
 
 class MetricFormatterImpl;
@@ -343,12 +470,12 @@ class TOOLKIT_DLLPUBLIC MetricFormatter : public FormatterBase
     explicit MetricFormatter( FormatterBaseImpl *pImpl );
     MetricFormatterImpl &getFormatImpl() const;
 public:
-    void SetMin( sal_Int64 nNewMin, FieldUnit nUnit = FUNIT_NONE );
-    void SetMax( sal_Int64 nNewMax, FieldUnit nUnit = FUNIT_NONE );
-    void SetFirst( sal_Int64 nNewFirst, FieldUnit nUnit = FUNIT_NONE );
-    void SetLast( sal_Int64 nNewLast, FieldUnit nUnit = FUNIT_NONE );
-    void SetValue( sal_Int64 nNewValue, FieldUnit nUnit = FUNIT_NONE );
-    sal_Int64 GetValue( FieldUnit nUnit = FUNIT_NONE ) const;
+    void SetMin( sal_Int64 nNewMin, FieldUnit nUnit=FUNIT_NONE );
+    void SetMax( sal_Int64 nNewMax, FieldUnit nUnit=FUNIT_NONE );
+    void SetFirst( sal_Int64 nNewFirst, FieldUnit nUnit=FUNIT_NONE );
+    void SetLast( sal_Int64 nNewLast, FieldUnit nUnit=FUNIT_NONE );
+    void SetValue( sal_Int64 nNewValue, FieldUnit nUnit=FUNIT_NONE );
+    sal_Int64 GetValue( FieldUnit nUnit=FUNIT_NONE ) const;
 
     void SetSpinSize( sal_Int64 nNewSize );
 };
@@ -358,73 +485,209 @@ class TOOLKIT_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
 {
     DECL_GET_IMPL( MetricField );
 public:
-    MetricField( Context *pCtx, char const* pId, sal_uInt32 nId = 0 );
-    MetricField( Window *pParent, WinBits nStyle );
+    MetricField( Context *context, char const* id, sal_uInt32 nId=0 );
+    MetricField( Window *parent, WinBits nStyle );
 };
 
-#define COMBOBOX_APPEND            ((USHORT)0xFFFF)
-#define COMBOBOX_ENTRY_NOTFOUND    ((USHORT)0xFFFF)
 class ComboBoxImpl;
 class TOOLKIT_DLLPUBLIC ComboBox : public Edit
 {
     DECL_GET_IMPL( ComboBox );
+    DECL_GET_WINDOW (ComboBox );
     DECL_CONSTRUCTORS( ComboBox, Edit, 0 );
 
 public:
-    USHORT InsertEntry( XubString const& rStr, USHORT nPos = COMBOBOX_APPEND );
-    void RemoveEntry( XubString const& rStr );
-    void RemoveEntry( USHORT nPos );
+    ~ComboBox ();
+    sal_uInt16 InsertEntry( String const& rStr, sal_uInt16 nPos=COMBOBOX_APPEND );
+    void RemoveEntry( String const& rStr );
+    void RemoveEntry( sal_uInt16 nPos );
     void Clear();
 
-    USHORT GetEntryPos( XubString const& rStr ) const;
-    XubString GetEntry( USHORT nPos ) const;
-    USHORT GetEntryCount() const;
+    sal_uInt16 GetEntryPos( String const& rStr ) const;
+    String GetEntry( sal_uInt16 nPos ) const;
+    sal_uInt16 GetEntryCount() const;
 
     void SetClickHdl( Link const& rLink );
     void SetSelectHdl( Link const& rLink );
+    void EnableAutocomplete (bool enable, bool matchCase=false );
 };
 
-#define LISTBOX_APPEND               ((USHORT)0xFFFF)
-#define LISTBOX_ENTRY_NOTFOUND       ((USHORT)0xFFFF)
 class ListBoxImpl;
 class TOOLKIT_DLLPUBLIC ListBox : public Control
 {
     DECL_GET_IMPL( ListBox );
     DECL_CONSTRUCTORS( ListBox, Control, WB_BORDER );
+    DECL_GET_WINDOW (ListBox);
+
 public:
-    USHORT InsertEntry( XubString const& rStr, USHORT nPos = LISTBOX_APPEND );
+    ~ListBox ();
+    sal_uInt16 InsertEntry( String const& rStr, sal_uInt16 nPos=LISTBOX_APPEND );
 
-    void RemoveEntry( XubString const& rStr );
-    void RemoveEntry( USHORT nPos );
+    void RemoveEntry( String const& rStr );
+    void RemoveEntry( sal_uInt16 nPos );
     void Clear();
 
-    USHORT GetEntryPos( XubString const& rStr ) const;
-    XubString GetEntry( USHORT nPos ) const;
-    USHORT GetEntryCount() const;
+    sal_uInt16 GetEntryPos( String const& rStr ) const;
+    String GetEntry( sal_uInt16 nPos ) const;
+    sal_uInt16 GetEntryCount() const;
 
-    void SelectEntry( XubString const& rStr, BOOL bSelect = TRUE );
-    void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE );
+    void SelectEntry( String const& rStr, bool bSelect=true );
+    void SelectEntryPos( sal_uInt16 nPos, bool bSelect=true );
 
-    USHORT GetSelectEntryCount() const;
-    XubString GetSelectEntry( USHORT nSelIndex = 0 ) const;
-    USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const;
+    sal_uInt16 GetSelectEntryCount() const;
+    String GetSelectEntry( sal_uInt16 nSelIndex=0 ) const;
+    sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex=0 ) const;
 
-    void SetSelectHdl( Link const& rLink );
-    void SetClickHdl( Link const& rLink );
+    void SetSelectHdl (Link const& link);
+    Link& GetSelectHdl ();
+
+    void SetClickHdl (Link const& link);
+    Link& GetClickHdl ();
+
+    void SetDoubleClickHdl (Link const& link);
+    Link& GetDoubleClickHdl ();
+
+    void SetEntryData (sal_uInt16 pos, void* data);
+    void* GetEntryData (sal_uInt16 pos) const;
+
+    virtual void SetNoSelection ();
+};
+
+class MultiListBoxImpl;
+class TOOLKIT_DLLPUBLIC MultiListBox : public ListBox
+{
+    DECL_GET_IMPL( MultiListBox );
+    DECL_CONSTRUCTORS( MultiListBox, ListBox, 0 );
+    DECL_GET_WINDOW( MultiListBox );
 };
 
 class DialogImpl;
 class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
 {
-    DECL_GET_IMPL( Dialog );
-    void SetParent( Window *pParent );
-    void SetParent( ::Window *pParent );
+    DECL_GET_WINDOW (Dialog);
+
+public:
+    DECL_GET_IMPL (Dialog);
+    Dialog( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
+    Dialog( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
+    ~Dialog ();
+    virtual short Execute();
+    void EndDialog( long nResult=0 );
+    void SetText( rtl::OUString const& rStr );
+    void SetTitle (rtl::OUString const& rStr );
+    bool Close ();
+    long Notify (NotifyEvent & event);
+
+    // Sxf*Dialog
+    bool bConstruct;
+    void Initialize (SfxChildWinInfo*);
+};
+
+#define DECL_MESSAGE_BOX_CTORS(Name)\
+    public:\
+    Name##Box (::Window *parent, char const* message,\
+               char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
+               char const* xml_file="message-box.xml", char const* id="message-box");\
+    Name##Box (::Window *parent, rtl::OUString const& message,\
+               rtl::OUString yes=String (),\
+               rtl::OUString no=String (),\
+               sal_uIntPtr help_id=0,\
+               char const* xml_file="message-box.xml", char const* id="message-box");\
+    Name##Box (::Window *parent, WinBits, char const* message,\
+               char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\
+               char const* xml_file="message-box.xml", char const* id="message-box");\
+    Name##Box (::Window *parent, WinBits, rtl::OUString const& message,\
+               rtl::OUString yes=String (),\
+               rtl::OUString no=String (),\
+               sal_uIntPtr help_id=0,\
+               char const* xml_file="message-box.xml", char const* id="message-box")\
+
+class TOOLKIT_DLLPUBLIC MessageBox : public Dialog
+{
+    DECL_MESSAGE_BOX_CTORS(Message);
+
+protected:
+    FixedImage imageError;
+    FixedImage imageInfo;
+    FixedImage imageQuery;
+    FixedImage imageWarning;
+    FixedText messageText;
+    CancelButton cancelButton;
+    HelpButton helpButton;
+    IgnoreButton ignoreButton;
+    NoButton noButton;
+    RetryButton retryButton;
+    YesButton yesButton;
+
+    void bits_init (WinBits bits, rtl::OUString const& message,
+                    rtl::OUString yes, rtl::OUString, sal_uIntPtr help_id);
+    void init (rtl::OUString const& message,
+               rtl::OUString const& yes, rtl::OUString const& no, sal_uIntPtr help_id);
+    void init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id);
+};
+
+#define CLASS_MESSAGE_BOX(Name)\
+    class TOOLKIT_DLLPUBLIC Name##Box : public MessageBox\
+    {\
+        DECL_MESSAGE_BOX_CTORS (Name);\
+    }
+
+//CLASS_MESSAGE_BOX (Mess);
+typedef MessageBox MessBox;
+CLASS_MESSAGE_BOX (Error);
+CLASS_MESSAGE_BOX (Info);
+CLASS_MESSAGE_BOX (Query);
+CLASS_MESSAGE_BOX (Warning);
+
+#undef CLASS_MESSAGE_BOX
+
+#undef TAB_APPEND
+
+class TabControlImpl;
+class TOOLKIT_DLLPUBLIC TabControl : public Control
+{
+//#ifndef TAB_APPEND
+#define TAB_APPEND 0xFFFF
+//#endif /* !TAB_APPEND */
+
+    DECL_GET_IMPL (TabControl);
+    DECL_CONSTRUCTORS (TabControl, Control, 0);
+    DECL_GET_WINDOW (TabControl);
+    DECL_GET_LAYOUT_VCLXWINDOW (TabControl);
+
+public:
+    ~TabControl ();
+    void InsertPage (sal_uInt16 id, rtl::OUString const& title, sal_uInt16 pos=TAB_APPEND);
+    void RemovePage (sal_uInt16 id);
+    sal_uInt16 GetPageCount () const;
+    sal_uInt16 GetPageId (sal_uInt16 pos) const;
+    sal_uInt16 GetPagePos (sal_uInt16 id) const;
+    void SetCurPageId (sal_uInt16 id);
+    sal_uInt16 GetCurPageId () const;
+    void SetTabPage (sal_uInt16 id, ::TabPage* page);
+    ::TabPage* GetTabPage (sal_uInt16 id) const;
+    void SetActivatePageHdl (Link const& link);
+    Link& GetActivatePageHdl () const;
+    void SetDeactivatePageHdl (Link const& link);
+    Link& GetDeactivatePageHdl () const;
+    void SetTabPageSizePixel (Size const& size);
+    Size GetTabPageSizePixel () const;
+};
+
+class TabPageImpl;
+class TOOLKIT_DLLPUBLIC TabPage : public Context, public Window
+{
+    DECL_GET_IMPL( TabPage );
 public:
-    Dialog( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-    Dialog( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-    short Execute();
-    void EndDialog( long nResult = 0 );
-    void SetText( String const& rStr );
+    static ::Window* global_parent;
+    static TabControl* global_tabcontrol;
+
+    TabPage( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
+    TabPage( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
+    ~TabPage();
+    DECL_GET_WINDOW( TabPage );
+    virtual void ActivatePage();
+    virtual void DeactivatePage();
 };
 
 class ProgressBarImpl;
@@ -450,7 +713,7 @@ protected:
     css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
     Container( rtl::OUString const& rName, sal_Int32 nBorder );
 public:
-    Container( Context const* pCtx, char const* pId );
+    Container( Context const* context, char const* id );
 
     void Add( Window *pWindow );
     void Add( Container *pContainer );
@@ -474,11 +737,11 @@ class TOOLKIT_DLLPUBLIC Table : public Container
 protected:
     Table( sal_Int32 nBorder, sal_Int32 nColumns );
 public:
-    Table( Context const* pCtx, char const* pId );
+    Table( Context const* context, char const* id );
     void Add( Window *pWindow, bool bXExpand, bool bYExpand,
-              sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
+              sal_Int32 nXSpan=1, sal_Int32 nYSpan=1 );
     void Add( Container *pContainer, bool bXExpand, bool bYExpand,
-              sal_Int32 nXSpan = 1, sal_Int32 nYSpan = 1 );
+              sal_Int32 nXSpan=1, sal_Int32 nYSpan=1 );
 
 private:
     void setProps( css::uno::Reference< css::awt::XLayoutConstrains > xChild,
@@ -490,7 +753,7 @@ class TOOLKIT_DLLPUBLIC Box : public Container
 protected:
     Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous );
 public:
-    Box( Context const* pCtx, char const* pId );
+    Box( Context const* context, char const* id );
     void Add( Window *pWindow, bool bExpand, bool bFill, sal_Int32 nPadding);
     void Add( Container *pContainer, bool bExpand, bool bFill, sal_Int32 nPadding);
 
@@ -502,16 +765,69 @@ private:
 class TOOLKIT_DLLPUBLIC HBox : public Box
 {
 public:
-    HBox( Context const* pCtx, char const* pId );
+    HBox( Context const* context, char const* id );
     HBox( sal_Int32 nBorder, bool bHomogeneous );
 };
 class TOOLKIT_DLLPUBLIC VBox : public Box
 {
 public:
-    VBox( Context const* pCtx, char const* pId );
+    VBox( Context const* context, char const* id );
     VBox( sal_Int32 nBorder, bool bHomogeneous );
 };
 
+class PluginImpl;
+class TOOLKIT_DLLPUBLIC Plugin : public Control
+{
+    DECL_GET_IMPL( Plugin );
+    //DECL_CONSTRUCTORS( Plugin, Control, 0 );
+public:
+    ::Control *mpPlugin;
+    Plugin( Context *context, char const* id, ::Control *plugin );
+};
+
+class LocalizedStringImpl;
+class TOOLKIT_DLLPUBLIC LocalizedString : public Window
+{
+    DECL_GET_IMPL( LocalizedString );
+
+public:
+    LocalizedString( Context *context, char const* id );
+
+    rtl::OUString operator= (rtl::OUString const&);
+    rtl::OUString operator+= (sal_Unicode );
+    rtl::OUString operator+= (rtl::OUString const&);
+
+    operator rtl::OUString ();
+    operator rtl::OUString const& ();
+    operator String();
+    String getString ();
+    rtl::OUString getOUString ();
+    String GetToken (USHORT i, sal_Char c);
+};
+
+class InPlugImpl;
+class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window
+{
+    DECL_GET_IMPL (InPlug);
+
+public:
+    InPlug ( Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0);
+    InPlug ( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0);
+
+    void ParentSet (Window *window);
+};
+
 } // end namespace layout
 
+#if ENABLE_LAYOUT
+#define LAYOUT_NS layout::
+#define LAYOUT_DIALOG_PARENT\
+    VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow()
+#define LAYOUT_THIS_WINDOW( this ) this->GetWindow ()
+#else /* !ENABLE_LAYOUT */
+#define LAYOUT_NS
+#define LAYOUT_DIALOG_PARENT this
+#define LAYOUT_THIS_WINDOW( this ) this
+#endif /* !ENABLE_LAYOUT */
+
 #endif /* _LAYOUT_HXX */
diff --git a/toolkit/inc/layout/layoutcore.hxx b/toolkit/inc/layout/layoutcore.hxx
deleted file mode 100644
index 2ffe777c59ae..000000000000
--- a/toolkit/inc/layout/layoutcore.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * 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: layoutcore.hxx,v $
- *
- * $Revision: 1.3 $
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _LAYOUT_CORE_HXX_
-#define _LAYOUT_CORE_HXX_
-
-#include <com/sun/star/awt/XToolkit.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/awt/XLayoutContainer.hpp>
-#include <com/sun/star/awt/XLayoutConstrains.hpp>
-
-#include <layout/layout.hxx>
-
-namespace layoutimpl
-{
-
-namespace css = layout::css;
-
-css::uno::Reference< css::awt::XLayoutContainer >
-createContainer( const rtl::OUString &rName );
-
-css::uno::Reference< css::awt::XLayoutConstrains >
-createWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
-              css::uno::Reference< css::uno::XInterface > xParent,
-              const rtl::OUString &rName, long nProps );
-
-css::uno::Reference< css::awt::XLayoutConstrains >
-createInternalWidget( css::uno::Reference< css::awt::XToolkit > xToolkit,
-                      css::uno::Reference< css::uno::XInterface > xParent,
-                      const rtl::OUString &rName, long nProps );
-
-css::uno::Reference< css::graphic::XGraphic > loadGraphic( const char *pName );
-
-// Helpers - unfortunately VCLXWindows don't implement XPropertySet
-// but containers do - these helpers help us to hide this
-namespace prophlp
-{
-// can we set properties on this handle ?
-bool TOOLKIT_DLLPUBLIC canHandleProps( const css::uno::Reference< css::uno::XInterface > &xRef );
-// if so which properties ?
-css::uno::Reference< css::beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC queryPropertyInfo(
-    const css::uno::Reference< css::uno::XInterface > &xRef );
-// set / get ...
-void TOOLKIT_DLLPUBLIC setProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
-                  const rtl::OUString &rName,
-                  css::uno::Any aValue );
-css::uno::Any TOOLKIT_DLLPUBLIC getProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
-                           const rtl::OUString &rName );
-} // namespace prophlp
-} // namespace layoutimpl
-
-#endif // _LAYOUT_CORE_HXX_
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index d131a0d5199a..3e61a9e9aa87 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -181,6 +181,7 @@ protected:
 
 public:
                     VCLXButton();
+    ~VCLXButton();
 
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -346,6 +347,8 @@ public:
 
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getFirstActionListener ();
 };
 
 //  ----------------------------------------------------
@@ -764,6 +767,7 @@ protected:
 
 public:
                         VCLXComboBox();
+    ~VCLXComboBox();
 
     // ::com::sun::star::uno::XInterface
     ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);