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

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Sep 17 09:20:55 2008
New Revision: 13911
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13911&view=rev

Log:
2008-09-17  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-svx.diff: Rename
	find-&-replace.xml to find-and-replace.xml.  This fixes the split
	build even when layout-simple-dialogs-solenv.diff is erroneously
	not getting applied.  Thanks, Petr.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-simple-dialogs-svx.diff

Modified: trunk/patches/dev300/layout-simple-dialogs-svx.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-svx.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-svx.diff	Wed Sep 17 09:20:55 2008
@@ -46,9 +46,8 @@
 
  .IF "$(ENABLE_GTK)" != ""
  CFLAGS+=-DENABLE_GTK
- .ENDIF
 diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
-index 4e9d1ca..40b41eb 100644
+index 4e9d1ca..b1dc3fe 100644
 --- svx/source/dialog/srchdlg.cxx
 +++ svx/source/dialog/srchdlg.cxx
 @@ -78,6 +78,8 @@
@@ -93,7 +92,7 @@
 +
 +#if ENABLE_LAYOUT
 +#undef SfxModelessDialog
-+#define SfxModelessDialog(sfx_bindings, child, parent, id) Dialog( parent, "find-&-replace.xml", id )
++#define SfxModelessDialog(sfx_bindings, child, parent, id) Dialog( parent, "find-and-replace.xml", id )
 +#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
 +#else /* !ENABLE_LAYOUT */
 +#define SVX_RES_PLAIN SVX_RES
@@ -357,18 +356,18 @@
 +++ svx/source/table/localize.sdf
 @@ -0,0 +1 @@
 +
-diff --git a/svx/uiconfig/layout/find-&-replace.xml b/svx/uiconfig/layout/find-&-replace.xml
+diff --git a/svx/uiconfig/layout/find-and-replace.xml b/svx/uiconfig/layout/find-and-replace.xml
 new file mode 100644
-index 0000000..78d8006
+index 0000000..0a2e5c7
 --- /dev/null
-+++ svx/uiconfig/layout/find-&-replace.xml
++++ svx/uiconfig/layout/find-and-replace.xml
 @@ -0,0 +1,111 @@
 +<?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.  !-->
 +
-+<modelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" show="false" sizeable="true" moveable="true" output-size="true" id="RID_SVXDLG_SEARCH" sv-look="true" _text="Find &amp; Replace" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
++<modelessdialog _title="Find &amp; Replace" help-id="SID_SEARCH_DLG" closable="true" closeable="true" sizeable="true" moveable="true" output-size="true" id="RID_SVXDLG_SEARCH" sv-look="true" _text="Find &amp; Replace" xmlns="http://openoffice.org/2007/layout"; xmlns:cnt="http://openoffice.org/2007/layout/container";>
 +    <vbox spacing="5" border="5">
 +	<string id="RID_SVXSTR_SEARCH_STYLES" _text="Including Styles"/>
 +	<string id="RID_SVXSTR_SEARCH" _text="(Search)"/>
@@ -427,7 +426,7 @@
 +            <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" _text="~Close" cnt:expand="false"/>
++		<cancelbutton id="BTN_CLOSE" tabstop="true" _label="~Close" cnt:expand="false"/>
 +            </dialogbuttonhbox>
 +	</hbox>
 +        <fixedline show="false" id="FL_OPTIONS"/>
@@ -514,7 +513,7 @@
 -template.sdf:
 -	$(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
 diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
-index 2c8ccc8..a700b01 100644
+index 2c8ccc8..685c82a 100644
 --- svx/uiconfig/layout/makefile.mk
 +++ svx/uiconfig/layout/makefile.mk
 @@ -39,7 +39,10 @@ TARGET=layout
@@ -523,17 +522,23 @@
  
 -XML_FILES=zoom.xml
 +XML_FILES=\
-+ "find-&-replace.xml"\
++ "find-and-replace.xml"\
 + zoom.xml\
 +#
  
  .INCLUDE : layout.mk
  
 diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
-index abed333..f6a76a4 100644
+index abed333..5938643 100644
 --- svx/uiconfig/layout/zoom.xml
 +++ svx/uiconfig/layout/zoom.xml
-@@ -12,13 +12,13 @@
+@@ -7,18 +7,18 @@
+              xmlns:cnt="http://openoffice.org/2007/layout/container";
+              id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
+ 	     help-id="SID_ATTR_ZOOM"
+-             has_border="true" sizeable="true" moveable="true">
++             has_border="true" sizeable="true" moveable="true" closeable="true">
+     <vbox spacing="5" border="5">
  	<hbox spacing="0" border="0">
  	    <vbox spacing="5" border="5">
  		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>