GNOME.org
 

ooo-build r14870 - in trunk: . patches/dev300

Author: jannieuw
Date: Tue Dec 16 13:23:17 2008
New Revision: 14870
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14870&view=rev

Log:
2008-12-16  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-disable-experimental.diff: Bugfix for
	--enable-layout-experimental, make enabling really an option.

	* patches/dev300/layoutdialogs2-development.diff: Bugfix: have
	empty containers not take-up space.  Robustification and fix for
	setting properties in nested containers: Eradicate
	PROPHELPER_SET_INFO.  Lots of Find and Replace dialog tweaks
	in an effort to avoid a flood of "layout is UGLY" bugs.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-disable-experimental.diff
   trunk/patches/dev300/layoutdialogs2-development.diff

Modified: trunk/patches/dev300/layout-disable-experimental.diff
==============================================================================
--- trunk/patches/dev300/layout-disable-experimental.diff	(original)
+++ trunk/patches/dev300/layout-disable-experimental.diff	Tue Dec 16 13:23:17 2008
@@ -1,3 +1,8 @@
+0867725... Make sort-options experimental.  Part II.  Fixes crasher n-44.patch.  Fixes crasher: n#442036.
+7dcddcb... Make sort-options experimental.  Part I.
+c7bb736... Add --enable-layout-experimental configure switch.  Part II.  Typo in configure.in, add set_soenv entry.
+fea9cd2... Add --enable-layout-experimental configure switch.  Default off.
+
 diff --git config_office/configure.in config_office/configure.in
 index 531db1e..00b7ab3 100644
 --- config_office/configure.in
@@ -25,11 +30,23 @@
 +   ENABLE_LAYOUT_EXPERIMENTAL="FALSE"
 +   AC_MSG_RESULT([no])
 +fi
-+AC_SUBST(ENABLE_LAYOUT)
++AC_SUBST(ENABLE_LAYOUT_EXPERIMENTAL)
 +
  # ===================================================================
  # De- or increase default verbosity of build process
  # ===================================================================
+diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
+index c6bd1de..bf515bc 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1982,6 +1982,7 @@ ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
+ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
+ ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
+ ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
++ToFile( "ENABLE_LAYOUT_EXPERIMENTAL", "@ENABLE_LAYOUT_EXPERIMENTAL@", "e" );
+ ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
+ ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
+ ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
 diff --git sc/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsort.cxx
 index ead9819..d17a08a 100644
 --- sc/source/ui/dbgui/tpsort.cxx

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Tue Dec 16 13:23:17 2008
@@ -1,10 +1,39 @@
-f0cdffd... Update awk+sed localize generation rules.  Fixes multiple (wrong) titles in Find & Replace.
-8091f0e... Use dash (-) instead of underscore (_) to separate language modifiers.  Fixes en_GB etc.
-f1180d5... Add "defbutton=true" to dialogs.  Fixes ENTER doing default action: n#439222.
-63b7689... Michael's new table-based find and replace.
-84991df... Apply Michael's boxtest patch.
+9f8efae... Find-and-Replace: request font-style-name="Bold", does not seem to work.
+775a44c... Find-and-Replace: Add alignment for combobox labels.
+74e6a94... Find-and-Replace: Replace pairs of <flow> with <align>.  Fixes ugly non-emptiness of more-<hbox>.
+401e048... Find-and-Replace: add nice 12pt border.
+0aae134... Find-and-Replace: also add rowsep at lower fixedline.
+499c964... Find-and-Replace: Add poor man's colsep and rowsep substitute spaces.
+441a6f6... Find-and-Replace: use <vbox cnt:x-expand="false"> for buttons.
+e4c0ec1... Find-and-Replace: add <vbox>s and use cnt:expand="false" to stop vertical button expansion.
+fba02b0... Find-and-Replace: use sc icon.  Fixes FIND button height.
+b6fd760... Bugfix have empty/invisible containers not take up space.
+69ff9af... Find-and-replace: Fix/remove most property errors.
+3044b08... Table: make x, y expand default.
+dd5cb2d... Use OSL_TRACE rather than printf. Fixes warning visibility.
+156a26b... Boxtest: add <vbox><table x-expand="true"> pair to trigger property errors.
+d576870... Junk extra <table> from boxtest.  Fixes visual output.
+abd572f... Eradicate PROPHELPER_SET_INFO: junk static caching.
+c2bf12f... Update awk+sed localize generation rules.  Fixes multiple (wrong) titles in Find & Replace.
+4c7b870... Use dash (-) instead of underscore (_) to separate language modifiers.  Fixes en_GB etc.
+d4247ce... Add "defbutton=true" to dialogs.  Fixes ENTER doing default action: n#439222.
+55e9b2c... Michael's new table-based find and replace.
+b5ce699... Apply Michael's boxtest patch.
 
 
+diff --git sc/uiconfig/layout/insert-sheet.xml sc/uiconfig/layout/insert-sheet.xml
+index 0ce5843..517a24d 100644
+--- sc/uiconfig/layout/insert-sheet.xml
++++ sc/uiconfig/layout/insert-sheet.xml
+@@ -49,7 +49,7 @@
+ 	    </vbox>
+ 	</hbox>
+ 	<dialogbuttonhbox border="5" spacing="5">
+-            <okbutton default="true" id="BTN_OK"/>
++            <okbutton defbutton="true" id="BTN_OK"/>
+             <cancelbutton id="BTN_CANCEL"/>
+             <helpbutton id="BTN_HELP"/>
+ 	</dialogbuttonhbox>
 diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk
 index 4688e04..4832e5c 100644
 --- sc/uiconfig/layout/makefile.mk
@@ -21,70 +50,6 @@
 +	grep sortdlg.src $(PRJ)/source/ui/src/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@
  	echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
  	rm -f *-$@
-diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk
-index d7c3ed9..8671740 100644
---- svx/uiconfig/layout/makefile.mk
-+++ svx/uiconfig/layout/makefile.mk
-@@ -53,7 +53,7 @@ all .PHONY:
- .INCLUDE :  target.mk
- 
- localize.sdf: $(PRJ)/source/dialog/localize.sdf
--	grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
--	grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
-+	grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
-+	grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
- 	echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
- 	rm -f *-$@
-diff --git sw/uiconfig/layout/makefile.mk sw/uiconfig/layout/makefile.mk
-index 7ca393c..c654305 100644
---- sw/uiconfig/layout/makefile.mk
-+++ sw/uiconfig/layout/makefile.mk
-@@ -50,6 +50,7 @@ all .PHONY:
- .INCLUDE :  target.mk
- 
- localize.sdf: $(PRJ)/source/ui/dialog/localize.sdf
--	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
-+#	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
-+	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/'  -e 's/\tDLG_WORDCOUNT/\t/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
- 	echo '#empty' | cat - wordcount-$@ > $@
- 	rm -f *-$@
-diff --git toolkit/source/layout/core/translate.cxx toolkit/source/layout/core/translate.cxx
-index d0fc9f7..b059984 100644
---- toolkit/source/layout/core/translate.cxx
-+++ toolkit/source/layout/core/translate.cxx
-@@ -58,13 +58,13 @@ getLocaleSubdirList( lang::Locale const& rLocale )
- {
-     std::list<OUString> aSubdirs;
-     aSubdirs.push_front( OUString::createFromAscii( "." ) );
--    aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
-+    aSubdirs.push_front( OUString::createFromAscii( "en-US" ) );
-     if ( rLocale.Language.getLength() )
-         aSubdirs.push_front( rLocale.Language );
-     if ( rLocale.Country.getLength() )
-     {
-         OUString aLocaleCountry = rLocale.Language
--            + OUString::createFromAscii( "_" )
-+            + OUString::createFromAscii( "-" )
-             + rLocale.Country;
-         aSubdirs.push_front( aLocaleCountry );
-         if ( rLocale.Variant.getLength() )
-f1180d5... Add "defbutton=true" to dialogs.  Fixes ENTER doing default action: n#439222.
-63b7689... Michael's new table-based find and replace.
-84991df... Apply Michael's boxtest patch.
-
-diff --git sc/uiconfig/layout/insert-sheet.xml sc/uiconfig/layout/insert-sheet.xml
-index 0ce5843..517a24d 100644
---- sc/uiconfig/layout/insert-sheet.xml
-+++ sc/uiconfig/layout/insert-sheet.xml
-@@ -49,7 +49,7 @@
- 	    </vbox>
- 	</hbox>
- 	<dialogbuttonhbox border="5" spacing="5">
--            <okbutton default="true" id="BTN_OK"/>
-+            <okbutton defbutton="true" id="BTN_OK"/>
-             <cancelbutton id="BTN_CANCEL"/>
-             <helpbutton id="BTN_HELP"/>
- 	</dialogbuttonhbox>
 diff --git sc/uiconfig/layout/move-copy-sheet.xml sc/uiconfig/layout/move-copy-sheet.xml
 index 79720df..6e68b5a 100644
 --- sc/uiconfig/layout/move-copy-sheet.xml
@@ -112,15 +77,18 @@
              <helpbutton id="BTN_HELP" tabstop="true"/>
  	</dialogbuttonhbox>
 diff --git svx/uiconfig/layout/find-and-replace.xml svx/uiconfig/layout/find-and-replace.xml
-index ad5af2b..9b922a7 100644
+index ad5af2b..aff0531 100644
 --- svx/uiconfig/layout/find-and-replace.xml
 +++ svx/uiconfig/layout/find-and-replace.xml
-@@ -4,69 +4,69 @@
+@@ -3,109 +3,164 @@
+      i18n translated XML files are generated from this template by
       transex3/layout/tralay.  !-->
  
- <sfxmodelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closeable="true" sizeable="true" moveable="true" output-size="true" id="RID_SVXDLG_SEARCH" sv-look="true" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
+-<sfxmodelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closeable="true" sizeable="true" moveable="true" output-size="true" id="RID_SVXDLG_SEARCH" sv-look="true" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
 -    <vbox spacing="5" border="5">
-+    <table cnt:spacing="5" cnt:border="5" columns="2" homogeneous="false">
++<sfxmodelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closeable="true" sizeable="true" moveable="true" id="RID_SVXDLG_SEARCH" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
++    <hbox border="12">
++    <table columns="3">
  	<string id="RID_SVXSTR_SEARCH_STYLES" _text="Including Styles"/>
  	<string id="RID_SVXSTR_SEARCH" _text="(Search)"/>
  	<string id="RID_SVXSTR_REPLACE" _text="(Replace)"/>
@@ -136,8 +104,96 @@
 -		<fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
 -		<flow/>
 -		<flow/>
--		<flow/>
--	    </vbox>
++
++	<!-- row -->
++	<align valign="1" halign="0">
++	    <fixedtext id="FT_SEARCH" _label="~Search for" font-style-name="Bold"/>
++	</align>
++	<!-- poor man's colsep -->
++	<min-size cnt:x-expand="false" min-width="12"/>
++	<vbox cnt:x-expand="false">
++	    <imagebutton defbutton="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"
++			 image-align="0" graphic="res/commandimagelist/sc_searchdialog.png"/>
++	</vbox>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
++	<!-- row -->
++	<vbox spacing="0" border="0" cnt:x-expand="true">
++	    <combobox dropdown="true" id="ED_SEARCH" tabstop="true" cnt:expand="true"/>
++	    <listbox has_border="true" dropdown="true" show="false" id="LB_SEARCH" sort="true" tabstop="true" cnt:expand="true"/>
++	</vbox>
++	<!-- poor man's colsep -->
++	<min-size cnt:x-expand="false" min-width="12"/>
++	<vbox cnt:x-expand="false">
++	    <pushbutton id="BTN_SEARCH_ALL" tabstop="true" _label="Find ~All" cnt:expand="false"/>
++	</vbox>
++	<!-- row -->
++	<vbox spacing="0" border="0" cnt:expand="false" cnt:col-span="3">
++	    <fixedtext show="false" id="FT_SEARCH_ATTR" word-break="true"/>
++	    <fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
++	</vbox>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
++	<!-- row -->
++	<fixedline cnt:y-expand="false" cnt:col-span="3"/>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
++	<!-- row -->
++	<align valign="1" halign="0">
++	    <fixedtext id="FT_REPLACE" _label="Re~place with" font-style-name="Bold"/>
++	</align>
++	<!-- poor man's colsep -->
++	<min-size cnt:x-expand="false" min-width="12"/>
++	<vbox cnt:x-expand="false">
++	    <pushbutton id="BTN_REPLACE" tabstop="true" _label="~Replace" cnt:expand="false"/>
++	</vbox>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
++	<!-- row -->
++	<vbox spacing="0" border="0" cnt:x-expand="true">
++	    <combobox dropdown="true" id="ED_REPLACE" tabstop="true" cnt:expand="true"/>
++	    <listbox has_border="true" dropdown="true" show="false" id="LB_REPLACE" sort="true" tabstop="true" cnt:expand="true"/>
++	</vbox>
++	<!-- poor man's colsep -->
++	<min-size cnt:x-expand="false" min-width="12"/>
++	<vbox cnt:x-expand="false">
++	    <pushbutton id="BTN_REPLACE_ALL" tabstop="true" _label="Replace A~ll" cnt:expand="false"/>
++	</vbox>
++	<!-- row -->
++	<vbox spacing="6" border="0" cnt:col-span="3">
++	    <fixedtext show="false" id="FT_REPLACE_ATTR" word-break="true"/>
++	    <fixedtext show="false" id="FT_REPLACE_FORMATS" word-break="true"/>
++	    <fixedline show="false" id="FL_SEARCH_COMPONENT"/>
++	</vbox>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="12"/>
++	<!-- row -->
++	<vbox spacing="6" border="0" cnt:col-span="3">
++	    <hbox spacing="12">
++                <checkbox id="CB_MATCH_CASE" tabstop="true" _label="Ma~tch case"/>
++		<min-size min-width="0"/>
++		<vbox cnt:x-expand="false" cnt:padding="12">
++                    <pushbutton show="false" id="BTN_COMPONENT_1" tabstop="true" cnt:expand="false" cnt:padding="12"/>
++		</vbox>
++                <checkbox id="CB_WHOLE_WORDS" tabstop="true" _label="Whole wor~ds only"/>
++		<min-size min-width="0"/>
++		<vbox cnt:x-expand="false" cnt:padding="12">
++                    <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
++		</vbox>
+ 		<flow/>
++	    </hbox>
++	</vbox>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
++	<!-- row -->
++        <fixedline cnt:y-expand="false" cnt:col-span="3"/>
++	<!-- row: poor man's rowsep -->
++	<min-size cnt:col-span="3" cnt:x-expand="false" min-height="6"/>
++	<!-- row -->
++	<hbox cnt:col-span="3">
++	    <vbox cnt:expand="false">
++		<morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true" cnt:expand="false"/>
+ 	    </vbox>
 -	    <vbox cnt:expand="false" spacing="5" border="0">
 -		<min-size min-width="100" cnt:expand="false"/>
 -		<pushbutton default="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"/>
@@ -145,7 +201,7 @@
 -	    </vbox>
 -	</hbox>
 -        <hbox spacing="5" border="0">
--	    <flow/>
+ 	    <flow/>
 -	    <vbox cnt:expand="false" spacing="5" border="0">
 -		<min-size min-width="100" cnt:expand="false"/>
 -		<fixedline id="FL_SEARCH_COMMAND"/>
@@ -175,74 +231,99 @@
 -        <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
 -        <fixedline id="FL_BUTTONS"/>
 -	<hbox>
-+
-+	<!-- row -->
-+	<fixedtext id="FT_SEARCH" _label="~Search for"/>
-+	<imagebutton defbutton="true" id="BTN_SEARCH" tabstop="true" _label="~Find" cnt:expand="false"
-+		     image-align="0" graphic="res/commandimagelist/lc_searchdialog.png"/>
-+	<!-- row -->
-+	<vbox spacing="0" border="2" cnt:x-expand="true">
-+	     <combobox dropdown="true" id="ED_SEARCH" tabstop="true" cnt:expand="true"/>
-+	     <listbox has_border="true" dropdown="true" show="false" id="LB_SEARCH" sort="true" tabstop="true" cnt:expand="true"/>
-+	</vbox>
-+	<pushbutton id="BTN_SEARCH_ALL" tabstop="true" _label="Find ~All" cnt:expand="false"/>
-+	<!-- row -->
-+	<vbox spacing="0" border="0" cnt:col-span="2" cnt:y-expand="false">
-+	    <fixedtext show="false" id="FT_SEARCH_ATTR" word-break="true"/>
-+	    <fixedtext show="false" id="FT_SEARCH_FORMATS" word-break="true"/>
-+	</vbox>
-+	<!-- row -->
-+	<fixedline cnt:y-expand="false" cnt:col-span="2"/>
-+	<!-- row -->
-+	<fixedtext id="FT_REPLACE" _label="Re~place with"/>
-+	<pushbutton id="BTN_REPLACE" tabstop="true" _label="~Replace" cnt:expand="false"/>
-+	<!-- row -->
-+	<vbox spacing="0" border="5" cnt:x-expand="true">
-+	    <combobox dropdown="true" id="ED_REPLACE" tabstop="true" cnt:expand="false"/>
-+	    <listbox has_border="true" dropdown="true" show="false" id="LB_REPLACE" sort="true" tabstop="true"/>
-+	</vbox>
-+	<pushbutton id="BTN_REPLACE_ALL" tabstop="true" _label="Replace A~ll" cnt:expand="false"/>
-+	<!-- row -->
-+	<vbox spacing="5" border="0" cnt:col-span="2">
-+	    <fixedtext show="false" id="FT_REPLACE_ATTR" word-break="true"/>
-+	    <fixedtext show="false" id="FT_REPLACE_FORMATS" word-break="true"/>
-+	    <fixedline show="false" id="FL_SEARCH_COMPONENT"/>
-+	</vbox>
-+	<!-- row -->
-+	<vbox spacing="5" border="0" cnt:col-span="2">
-+	    <flow>
-+                <checkbox id="CB_MATCH_CASE" tabstop="true" _label="Ma~tch case"/>
-+                <pushbutton show="false" id="BTN_COMPONENT_1" tabstop="true" cnt:expand="false"/>
-+                <checkbox id="CB_WHOLE_WORDS" tabstop="true" _label="Whole wor~ds only"/>
-+                <pushbutton show="false" id="BTN_COMPONENT_2" tabstop="true" cnt:expand="false"/>
-+	    </flow>
-+	</vbox>
-+	<!-- row -->
-+        <fixedline cnt:y-expand="false" cnt:col-span="2"/>
-+	<!-- row -->
-+	<hbox cnt:col-span="2">
-             <morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true"/>
-             <dialogbuttonhbox>
- 		<helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
- 		<cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
+-            <morebutton delta="174" map-unit="MAP_APPFONT" id="BTN_MORE" state="false" tabstop="true"/>
+-            <dialogbuttonhbox>
+-		<helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
+-		<cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
++            <dialogbuttonhbox cnt:expand="false">
++		<vbox cnt:expand="false" cnt:fill="false">
++		    <helpbutton id="BTN_HELP" tabstop="true" cnt:expand="false"/>
++		</vbox>
++		<vbox cnt:expand="false" cnt:fill="false">
++		    <cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
++		</vbox>
              </dialogbuttonhbox>
  	</hbox>
 -        <fixedline show="false" id="FL_OPTIONS"/>
 -	<hbox homogeneous="false" spacing="5" border="0">
+-	    <vbox spacing="5" border="0">
 +	<!-- row -->
-+        <fixedline show="false" id="FL_OPTIONS" cnt:col-span="2"/>
++        <fixedline show="false" id="FL_OPTIONS" cnt:col-span="3"/>
 +	<!-- row -->
-+	<hbox homogeneous="false" spacing="5" border="0" cnt:col-span="2">
- 	    <vbox spacing="5" border="0">
++	<hbox spacing="6" border="0" cnt:col-span="3">
++	    <vbox spacing="6" border="0">
++		<min-size min-height="0"/>
  		<checkbox show="false" id="CB_SELECTIONS" tabstop="true" _label="Current selection ~only"/>
  		<checkbox show="false" id="CB_BACKWARDS" tabstop="true" _label="Bac~kwards"/>
-@@ -107,5 +107,5 @@
+ 		<checkbox show="false" id="CB_REGEXP" tabstop="true" _label="Regular e~xpressions"/>
+ 		<hbox>
+ 		    <checkbox show="false" id="CB_SIMILARITY" tabstop="true" _label="S~imilarity search"/>
+-		    <flow/>
+-		    <pushbutton show="false" id="PB_SIMILARITY" tabstop="true" _label="~..." cnt:expand="false"/>
+-		    <flow/>
++		    <align halign="1">
++		    <vbox cnt:x-expand="false">
++			<pushbutton show="false" id="PB_SIMILARITY" tabstop="true" _label="~..." cnt:expand="false"/>
++		    </vbox>
++		    </align>
+ 		</hbox>
+ 		<checkbox show="false" id="CB_LAYOUTS" tabstop="true" _label="Search for St~yles"/>
+ 		<checkbox show="false" id="CB_JAP_MATCH_FULL_HALF_WIDTH" tabstop="true" _label="Match character width"/>
+ 		<hbox>
+ 		    <checkbox show="false" id="CB_JAP_SOUNDS_LIKE" tabstop="true" _label="Sounds like (Japanese)"/>
+-		    <flow/>
+-		    <pushbutton show="false" id="PB_JAP_OPTIONS" tabstop="true" _label="..." cnt:expand="false"/>
+-		    <flow/>
++		    <align halign="1">
++		    <vbox cnt:x-expand="false">
++			<pushbutton show="false" id="PB_JAP_OPTIONS" tabstop="true" _label="..." cnt:expand="false"/>
++		    </vbox>
++		    </align>
+ 		</hbox>
+ 
+ 		<fixedline show="false" id="FL_CALC"/>
+-		<hbox spacing="5" border="0">
++		<hbox spacing="6" border="0">
+ 		    <fixedtext show="false" id="FT_CALC_SEARCHIN" _label="~Search in"/>
+ 		    <listbox has_border="true" dropdown="true" show="false" id="LB_CALC_SEARCHIN" tabstop="true"/>
+ 		</hbox>
+-		<hbox spacing="5" border="0">
++		<hbox spacing="6" border="0">
+ 		    <fixedtext show="false" id="FT_CALC_SEARCHDIR" _label="~Search direction"/>
+-		    <vbox spacing="5" border="5">
++		    <vbox spacing="6" border="6">
+ 			<radiobutton show="false" id="RB_CALC_ROWS" _label="Ro~ws"/>
+ 			<radiobutton show="false" id="RB_CALC_COLUMNS" _label="Col~umns"/>
+ 		    </vbox>
+ 		</hbox>
+ 		<checkbox show="false" id="CB_ALL_SHEETS" _label="Search in all sheets"/>
+ 	    </vbox>
+-	    <vbox cnt:expand="false" spacing="5" border="0">
++	    <vbox spacing="6" border="0" cnt:x-expand="false">
+ 		<min-size min-width="100" cnt:expand="false"/>
+ 		<pushbutton show="false" id="BTN_ATTRIBUTE" tabstop="true" _label="Attri~butes..." cnt:expand="false"/>
+ 		<pushbutton show="false" id="BTN_FORMAT" tabstop="true" _label="For~mat..." cnt:expand="false"/>
  		<pushbutton show="false" id="BTN_NOFORMAT" tabstop="true" _label="~No Format" cnt:expand="false"/>
  	    </vbox>
  	</hbox>
 -    </vbox>
 +    </table>
++    </hbox>
  </sfxmodelessdialog>
+diff --git svx/uiconfig/layout/makefile.mk svx/uiconfig/layout/makefile.mk
+index d7c3ed9..8671740 100644
+--- svx/uiconfig/layout/makefile.mk
++++ svx/uiconfig/layout/makefile.mk
+@@ -53,7 +53,7 @@ all .PHONY:
+ .INCLUDE :  target.mk
+ 
+ localize.sdf: $(PRJ)/source/dialog/localize.sdf
+-	grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
+-	grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
++	grep srchdlg.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
++	grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
+ 	echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
+ 	rm -f *-$@
 diff --git svx/uiconfig/layout/zoom.xml svx/uiconfig/layout/zoom.xml
 index 5938643..9f9d782 100644
 --- svx/uiconfig/layout/zoom.xml
@@ -259,6 +340,19 @@
  	</dialogbuttonhbox>
      </vbox>
  </modaldialog>
+diff --git sw/uiconfig/layout/makefile.mk sw/uiconfig/layout/makefile.mk
+index 7ca393c..c654305 100644
+--- sw/uiconfig/layout/makefile.mk
++++ sw/uiconfig/layout/makefile.mk
+@@ -50,6 +50,7 @@ all .PHONY:
+ .INCLUDE :  target.mk
+ 
+ localize.sdf: $(PRJ)/source/ui/dialog/localize.sdf
+-	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
++#	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
++	grep wordcountdialog.src $(PRJ)/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/'  -e 's/\tDLG_WORDCOUNT/\t/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
+ 	echo '#empty' | cat - wordcount-$@ > $@
+ 	rm -f *-$@
 diff --git sw/uiconfig/layout/wordcount.xml sw/uiconfig/layout/wordcount.xml
 index e922294..fbab778 100644
 --- sw/uiconfig/layout/wordcount.xml
@@ -272,43 +366,445 @@
              <helpbutton id="PB_HELP"/>
          </dialogbuttonhbox>
      </vbox>
+diff --git toolkit/source/layout/core/bin.cxx toolkit/source/layout/core/bin.cxx
+index 62ea068..dad845d 100644
+--- toolkit/source/layout/core/bin.cxx
++++ toolkit/source/layout/core/bin.cxx
+@@ -165,6 +165,12 @@ Align::allocateArea( const awt::Rectangle &rArea )
+     allocateChildAt( mxChild, aChildArea );
+ }
+ 
++bool
++Align::emptyVisible ()
++{
++    return true;
++}
++
+ /* MinSize */
+ 
+ MinSize::MinSize() : Bin()
+@@ -178,6 +184,12 @@ MinSize::MinSize() : Bin()
+              &mnMinHeight );
+ }
+ 
++bool
++MinSize::emptyVisible ()
++{
++    return true;
++}
++
+ awt::Size SAL_CALL MinSize::getMinimumSize()
+     throw(uno::RuntimeException)
+ {
+diff --git toolkit/source/layout/core/bin.hxx toolkit/source/layout/core/bin.hxx
+index c23c371..0b75bc2 100644
+--- toolkit/source/layout/core/bin.hxx
++++ toolkit/source/layout/core/bin.hxx
+@@ -75,8 +75,6 @@ public:
+     // css::awt::XLayoutConstrains
+     virtual css::awt::Size SAL_CALL getMinimumSize()
+         throw(css::uno::RuntimeException);
+-
+-    PROPHELPER_SET_INFO
+ };
+ 
+ // Align gives control over child position on the allocated space.
+@@ -91,11 +89,11 @@ protected:
+ public:
+     Align();
+ 
++    bool emptyVisible ();
++
+     // css::awt::XLayoutContainer
+     virtual void SAL_CALL allocateArea( const css::awt::Rectangle &rArea )
+         throw (css::uno::RuntimeException);
+-
+-    PROPHELPER_SET_INFO
+ };
+ 
+ // Makes child request its or a specified size, whatever is larger.
+@@ -108,11 +106,10 @@ protected:
+ public:
+     MinSize();
+ 
++    bool emptyVisible ();
+     // css::awt::XLayoutContainer
+     virtual css::awt::Size SAL_CALL getMinimumSize()
+         throw(css::uno::RuntimeException);
+-
+-    PROPHELPER_SET_INFO
+ };
+ 
+ } //  namespace layoutimpl
+diff --git toolkit/source/layout/core/box-base.cxx toolkit/source/layout/core/box-base.cxx
+index f0b7a42..f03cd5c 100644
+--- toolkit/source/layout/core/box-base.cxx
++++ toolkit/source/layout/core/box-base.cxx
+@@ -69,9 +69,9 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
+         uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren
+             = xContainer->getChildren();
+ 
+-        // FIXME: <flow> workaround: empty visible containers always visible:
+-        if ( !aChildren.getLength() )
+-            return true;
++        if (!aChildren.getLength ())
++            if (Container *c = dynamic_cast <Container*> (xWidget.get ()))
++                return c->emptyVisible ();
+ 
+         for ( int i = 0; i < aChildren.getLength(); i++ )
+             if ( isVisible( aChildren[i] ) )
 diff --git toolkit/source/layout/core/box-base.hxx toolkit/source/layout/core/box-base.hxx
-index 4fa7e53..e430e22 100644
+index 4fa7e53..67365a3 100644
 --- toolkit/source/layout/core/box-base.hxx
 +++ toolkit/source/layout/core/box-base.hxx
-@@ -57,7 +57,7 @@ public:
+@@ -57,7 +57,6 @@ public:
      struct ChildProps: public PropHelper
      {
          //ChildProps( ChildProps* );
 -        PROPHELPER_SET_INFO
-+	PROPHELPER_SET_INFO
      };
  
  protected:
 diff --git toolkit/source/layout/core/box.hxx toolkit/source/layout/core/box.hxx
-index 98190ca..5a0e870 100644
+index 98190ca..d99a603 100644
 --- toolkit/source/layout/core/box.hxx
 +++ toolkit/source/layout/core/box.hxx
-@@ -61,6 +61,7 @@ public:
-     struct ChildProps : public Box_Base::ChildProps
+@@ -83,8 +83,6 @@ public:
+     // helper: mix of getMinimumSize() and getHeightForWidth()
+     css::awt::Size calculateSize( long nWidth = 0 );
+ 
+-    PROPHELPER_SET_INFO
+-
+ private:
+     /* Helpers to deal with the joint Box directions. */
+     inline int primDim (const css::awt::Size &size)
+diff --git toolkit/source/layout/core/container.cxx toolkit/source/layout/core/container.cxx
+index c9b4513..608d5a4 100644
+--- toolkit/source/layout/core/container.cxx
++++ toolkit/source/layout/core/container.cxx
+@@ -50,6 +50,12 @@ Container::Container()
+     setChangeListener( this );
+ }
+ 
++bool
++Container::emptyVisible ()
++{
++    return false;
++}
++
+ uno::Any
+ Container::queryInterface( const uno::Type & rType ) throw (uno::RuntimeException)
+ {
+diff --git toolkit/source/layout/core/container.hxx toolkit/source/layout/core/container.hxx
+index 5cac33d..71fba80 100644
+--- toolkit/source/layout/core/container.hxx
++++ toolkit/source/layout/core/container.hxx
+@@ -73,6 +73,8 @@ public:
+     Container();
+     virtual ~Container() {}
+ 
++    virtual bool emptyVisible ();
++
+     // XInterface
+     virtual void SAL_CALL acquire() throw() { PropHelper::acquire(); }
+     virtual void SAL_CALL release() throw() { PropHelper::release(); }
+@@ -129,8 +131,6 @@ public:
+     css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize )
+         throw(css::uno::RuntimeException) { return rNewSize; }
+ 
+-PROPHELPER_SET_INFO
+-
+ protected:
+     void propertiesChanged();
+ };
+diff --git toolkit/source/layout/core/dialogbuttonhbox.cxx toolkit/source/layout/core/dialogbuttonhbox.cxx
+index 67a7ec0..0475723 100644
+--- toolkit/source/layout/core/dialogbuttonhbox.cxx
++++ toolkit/source/layout/core/dialogbuttonhbox.cxx
+@@ -39,13 +39,12 @@
+ #include "proplist.hxx"
+ 
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <cstdio>
+ #undef DBG_ERROR
+-#define DBG_ERROR printf
++#define DBG_ERROR OSL_TRACE
+ #undef DBG_ERROR1
+-#define DBG_ERROR1 printf
++#define DBG_ERROR1 OSL_TRACE
+ #undef DBG_ERROR2
+-#define DBG_ERROR2 printf
++#define DBG_ERROR2 OSL_TRACE
+ #endif /* TEST_LAYOUT && !DBG_UTIL */
+ 
+ namespace layoutimpl
+diff --git toolkit/source/layout/core/flow.cxx toolkit/source/layout/core/flow.cxx
+index 4bfd1b9..b004336 100644
+--- toolkit/source/layout/core/flow.cxx
++++ toolkit/source/layout/core/flow.cxx
+@@ -56,6 +56,12 @@ Flow::Flow()
+              &mnSpacing );
+ }
+ 
++bool
++Flow::emptyVisible ()
++{
++    return true;
++}
++
+ void SAL_CALL
+ Flow::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
+     throw (uno::RuntimeException, css::awt::MaxChildrenException)
+diff --git toolkit/source/layout/core/flow.hxx toolkit/source/layout/core/flow.hxx
+index d550947..91aa829 100644
+--- toolkit/source/layout/core/flow.hxx
++++ toolkit/source/layout/core/flow.hxx
+@@ -63,6 +63,8 @@ protected:
+ public:
+     Flow();
+ 
++    bool emptyVisible ();
++
+     // css::awt::XLayoutContainer
+     virtual void SAL_CALL addChild( const css::uno::Reference< css::awt::XLayoutConstrains >& Child )
+         throw (css::uno::RuntimeException, css::awt::MaxChildrenException);
+@@ -87,8 +89,6 @@ public:
+     virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 nWidth )
+         throw(css::uno::RuntimeException);
+ 
+-PROPHELPER_SET_INFO
+-
+ private:
+     // shared between getMinimumSize() and getHeightForWidth()
+     css::awt::Size calculateSize( long nMaxWidth );
+diff --git toolkit/source/layout/core/helper.cxx toolkit/source/layout/core/helper.cxx
+index 7516454..d29b951 100644
+--- toolkit/source/layout/core/helper.cxx
++++ toolkit/source/layout/core/helper.cxx
+@@ -42,13 +42,12 @@
+ #include "proplist.hxx"
+ 
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <cstdio>
+ #undef DBG_ERROR
+-#define DBG_ERROR printf
++#define DBG_ERROR OSL_TRACE
+ #undef DBG_ERROR1
+-#define DBG_ERROR1 printf
++#define DBG_ERROR1 OSL_TRACE
+ #undef DBG_ERROR2
+-#define DBG_ERROR2 printf
++#define DBG_ERROR2 OSL_TRACE
+ #endif /* TEST_LAYOUT && !DBG_UTIL */
+ 
+ namespace layoutimpl
+@@ -357,6 +356,11 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
+     return OPropertySetHelper::queryInterface( rType );
+ }
+ 
++uno::Reference <beans::XPropertySetInfo> SAL_CALL PropHelper::getPropertySetInfo () throw (uno::RuntimeException)
++{
++    return css::uno::Reference <css::beans::XPropertySetInfo> (createPropertySetInfo (getInfoHelper ()));
++}
++
+ } // namespace layoutimpl
+ 
+ #include <awt/vclxbutton.hxx>
+diff --git toolkit/source/layout/core/helper.hxx toolkit/source/layout/core/helper.hxx
+index 806efd0..bc74690 100644
+--- toolkit/source/layout/core/helper.hxx
++++ toolkit/source/layout/core/helper.hxx
+@@ -106,23 +106,13 @@ public:
+     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue,
+                                                 sal_Int32 nHandle ) const;
+ 
+-    // you -must- use this macro in sub-classes that define new properties.
+-    // NB. 'static' ...
+-    // com::sun::star::beans::XMultiPropertySet
+-#define PROPHELPER_SET_INFO \
+-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL \
+-    getPropertySetInfo() throw(css::uno::RuntimeException) \
+-    { \
+-        static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( \
+-            createPropertySetInfo( getInfoHelper() ) ); \
+-        return xInfo; \
+-    }
+-    PROPHELPER_SET_INFO
++    virtual css::uno::Reference <css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo () throw (css::uno::RuntimeException);
+ 
+     struct Listener
      {
-         ChildProps( ChildData *pData );
-+	PROPHELPER_SET_INFO
+         virtual void propertiesChanged() = 0;
      };
++
+     void setChangeListener( Listener *pListener )
+     {
+         mpListener = pListener;
+diff --git toolkit/source/layout/core/proplist.cxx toolkit/source/layout/core/proplist.cxx
+index 857bb51..483730b 100644
+--- toolkit/source/layout/core/proplist.cxx
++++ toolkit/source/layout/core/proplist.cxx
+@@ -42,13 +42,12 @@
+ #include "helper.hxx"
  
- protected:
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <cstdio>
+ #undef DBG_ERROR
+-#define DBG_ERROR printf
++#define DBG_ERROR OSL_TRACE
+ #undef DBG_ERROR1
+-#define DBG_ERROR1 printf
++#define DBG_ERROR1 OSL_TRACE
+ #undef DBG_ERROR2
+-#define DBG_ERROR2 printf
++#define DBG_ERROR2 OSL_TRACE
+ #endif /* TEST_LAYOUT && !DBG_UTIL */
+ 
+ namespace layoutimpl
+diff --git toolkit/source/layout/core/root.cxx toolkit/source/layout/core/root.cxx
+index bb264f3..eafafca 100644
+--- toolkit/source/layout/core/root.cxx
++++ toolkit/source/layout/core/root.cxx
+@@ -32,7 +32,6 @@
+ #include "root.hxx"
+ 
+ #include <cassert>
+-#include <cstdio>
+ 
+ #include <com/sun/star/awt/WindowAttribute.hpp>
+ #include <com/sun/star/awt/XMessageBox.hpp>
+@@ -106,7 +105,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
+ 
+ void LayoutRoot::error( OUString const& message )
+ {
+-    printf( "%s\n", OUSTRING_CSTR( message ) );
++    OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
+     ShowMessageBox( mxFactory, mxToolkit,
+                     OUString::createFromAscii( "Fatal error" ),
+                     message );
+diff --git toolkit/source/layout/core/table.cxx toolkit/source/layout/core/table.cxx
+index 87c15e2..2beefc1 100644
+--- toolkit/source/layout/core/table.cxx
++++ toolkit/source/layout/core/table.cxx
+@@ -47,20 +47,20 @@ namespace layoutimpl
+ using namespace com::sun::star;
+ 
+ Table::ChildProps::ChildProps( Table::ChildData *pData )
+-    {
+-        addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
+-                 ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
++{
++    addProp( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ),
++             ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
+              &( pData->mbExpand[ 0 ] ) );
+-        addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
+-                 ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
++    addProp( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ),
++             ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
+              &( pData->mbExpand[ 1 ] ) );
+-        addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
+-                 ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
++    addProp( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ),
++             ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
+              &( pData->mnColSpan ) );
+-        addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
+-                 ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
++    addProp( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ),
++             ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
+              &( pData->mnRowSpan ) );
+-    }
++}
+ 
+ bool Table::ChildData::isVisible()
+ {
+@@ -79,21 +79,21 @@ Table::Table()
+ 
+ Table::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
+     : Box_Base::ChildData( xChild )
+-//    , mbExpand( { 0, 1 } )
++//    , mbExpand( { 1, 1 } )
+     , mnColSpan( 1 )
+     , mnRowSpan( 1 )
+     , mnLeftCol( 0 )
+     , mnRightCol( 0 )
+     , mnTopRow( 0 )
+     , mnBottomRow( 0 )
+-    {
+-    mbExpand[ 0 ] = 0;
++{
++    mbExpand[ 0 ] = 1;
+     mbExpand[ 1 ] = 1;
+ }
+ 
+ Table::ChildData*
+ Table::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
+-        {
++{
+     return new ChildData( xChild );
+ }
+ 
+@@ -106,9 +106,9 @@ Table::createChildProps( Box_Base::ChildData *pData )
+ void SAL_CALL
+ Table::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
+     throw( uno::RuntimeException, awt::MaxChildrenException )
+-        {
++{
+     if ( xChild.is() )
+-            {
++    {
+         Box_Base::addChild( xChild );
+         // cause of flicker
+         allocateChildAt( xChild, awt::Rectangle( 0,0,0,0 ) );
+@@ -240,14 +240,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
+     mnColExpandables =( mnRowExpandables = 0 );
+     maRequisition.Width =( maRequisition.Height = 0 );
+     for ( std::vector<GroupData>::iterator it = maCols.begin();
+-         it != maCols.end(); it++ )
++          it != maCols.end(); it++ )
+     {
+         maRequisition.Width += it->mnSize;
+         if ( it->mbExpand )
+             mnColExpandables++;
+     }
+     for ( std::vector<GroupData>::iterator it = maRows.begin();
+-         it != maRows.end(); it++ )
++          it != maRows.end(); it++ )
+     {
+         maRequisition.Height += it->mnSize;
+         if ( it->mbExpand )
 diff --git toolkit/source/layout/core/table.hxx toolkit/source/layout/core/table.hxx
-index dac2aaa..f1c882b 100644
+index dac2aaa..b41be25 100644
 --- toolkit/source/layout/core/table.hxx
 +++ toolkit/source/layout/core/table.hxx
-@@ -58,6 +58,7 @@ public:
-     struct ChildProps : public Box_Base::ChildProps
-     {
-         ChildProps( ChildData *pData );
-+	PROPHELPER_SET_INFO
-     };
+@@ -99,8 +99,6 @@ public:
+     virtual sal_Int32 SAL_CALL getHeightForWidth( sal_Int32 /*nWidth*/ )
+     throw(css::uno::RuntimeException)
+     { return maRequisition.Height; }
+-
+-    PROPHELPER_SET_INFO
+ };
  
- protected:
+ } //  namespace layoutimpl
+diff --git toolkit/source/layout/core/translate.cxx toolkit/source/layout/core/translate.cxx
+index d0fc9f7..b059984 100644
+--- toolkit/source/layout/core/translate.cxx
++++ toolkit/source/layout/core/translate.cxx
+@@ -58,13 +58,13 @@ getLocaleSubdirList( lang::Locale const& rLocale )
+ {
+     std::list<OUString> aSubdirs;
+     aSubdirs.push_front( OUString::createFromAscii( "." ) );
+-    aSubdirs.push_front( OUString::createFromAscii( "en_US" ) );
++    aSubdirs.push_front( OUString::createFromAscii( "en-US" ) );
+     if ( rLocale.Language.getLength() )
+         aSubdirs.push_front( rLocale.Language );
+     if ( rLocale.Country.getLength() )
+     {
+         OUString aLocaleCountry = rLocale.Language
+-            + OUString::createFromAscii( "_" )
++            + OUString::createFromAscii( "-" )
+             + rLocale.Country;
+         aSubdirs.push_front( aLocaleCountry );
+         if ( rLocale.Variant.getLength() )
 diff --git toolkit/src2xml/source/src2xml.py toolkit/src2xml/source/src2xml.py
 index 128cfa1..b03c5e6 100644
 --- toolkit/src2xml/source/src2xml.py
@@ -398,6 +894,38 @@
              }
          }
  
+diff --git toolkit/workben/layout/empty.xml toolkit/workben/layout/empty.xml
+new file mode 100644
+index 0000000..a8408e5
+--- /dev/null
++++ toolkit/workben/layout/empty.xml
+@@ -0,0 +1,26 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
++
++<dialog xmlns="http://openoffice.org/2007/layout";
++        xmlns:cnt="http://openoffice.org/2007/layout/container";
++        title="Empty Test" optimumsize="true" has_border="true" sizeable="true" moveable="true">
++  <vbox spacing="1" border="10">
++    <min-size min-width="200"/>
++    <fixedline height="1"/>
++    <vbox spacing="10">
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++      <vbox show="false"/>
++    </vbox>
++    <fixedline height="1"/>
++  </vbox>
++</dialog>
 diff --git toolkit/workben/layout/insert-sheet.xml toolkit/workben/layout/insert-sheet.xml
 index 0ce5843..517a24d 100644
 --- toolkit/workben/layout/insert-sheet.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]