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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Nov 13 16:34:15 2008
New Revision: 14498
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14498&view=rev

Log:
2008-11-13  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layoutdialogs2-development.diff: Use dash (-)
	instead of underscore (_) to separate language modifiers.  Fixes
	en_GB etc.  Update awk+sed localize generation rules.  Fixes
	multiple (wrong) titles in Find & Replace (en_GB locale, eg).


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

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Thu Nov 13 16:34:15 2008
@@ -1,3 +1,73 @@
+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.
+
+
+diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk
+index 4688e04..4832e5c 100644
+--- sc/uiconfig/layout/makefile.mk
++++ sc/uiconfig/layout/makefile.mk
+@@ -60,8 +60,8 @@ all .PHONY:
+ .INCLUDE :  target.mk
+ 
+ localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/localize.sdf
+-	grep instbdlg.src $(PRJ)/source/ui/miscdlgs/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\insert-sheet.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@
+-	grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(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\\move-copy-sheet.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/' > move-copy-sheet-$@
+-	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", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sort-options-$@
++	grep instbdlg.src $(PRJ)/source/ui/miscdlgs/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\insert-sheet.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_INSERT_TABLE/\t/' -e 's/\t_label/\tRID_SCDLG_INSERT_TABLE_title/' > insert-sheet-$@
++	grep -E 'miscdlgs.src.*(FT_DEST|FT_INSERT|STR_NEWDOC|RID_SCDLG_MOVETAB|BTN_COPY)' $(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\\move-copy-sheet.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_MOVETAB/\t/' -e 's/\t_label/\tRID_SCDLG_MOVETAB_title/'> move-copy-sheet-$@
++	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.