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

[jannieuw svn gnome org]

Author: jannieuw
Date: Fri Jul 25 19:30:10 2008
New Revision: 13397
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13397&view=rev

Log:
2008-07-25  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-tab-scp2.diff:
	* patches/dev300/layout-tab-svx.diff: New file.  Fixes ooinstall
	and prepares for next set of patches.

	* patches/dev300/apply: Add them.


Added:
   trunk/patches/dev300/layout-tab-scp2.diff
   trunk/patches/dev300/layout-tab-svx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 25 19:30:10 2008
@@ -2158,6 +2158,8 @@
 layout-tab-sfx2.diff
 layout-tab-sc-localize.diff
 layout-tab-sc.diff
+layout-tab-scp2.diff
+layout-tab-svx.diff
 
 # convert some simple dialogs to layout engine
 layout-simple-dialogs-offapi.diff

Added: trunk/patches/dev300/layout-tab-scp2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-tab-scp2.diff	Fri Jul 25 19:30:10 2008
@@ -0,0 +1,30 @@
+diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
+index 477f992..6808269 100644
+--- scp2/source/layout/layout.scp
++++ scp2/source/layout/layout.scp
+@@ -35,11 +35,11 @@ Directory gid_Dir_Share_Layout
+     DosName = "layout";
+ End
+ 
+-File gid_File_Zip_Sw_Layout
++File gid_File_Zip_Sc_Layout
+    Dir = gid_Dir_Share_Layout;
+    USER_FILE_BODY;
+    Styles = (ARCHIVE, PATCH);
+-   Name = "sw-layout.zip";
++   Name = "sc-layout.zip";
+ End
+ 
+ File gid_File_Zip_Svx_Layout
+@@ -48,3 +48,11 @@ File gid_File_Zip_Svx_Layout
+    Styles = (ARCHIVE, PATCH);
+    Name = "svx-layout.zip";
+ End
++
++File gid_File_Zip_Sw_Layout
++   Dir = gid_Dir_Share_Layout;
++   USER_FILE_BODY;
++   Styles = (ARCHIVE, PATCH);
++   Name = "sw-layout.zip";
++End
++

Added: trunk/patches/dev300/layout-tab-svx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-tab-svx.diff	Fri Jul 25 19:30:10 2008
@@ -0,0 +1,33 @@
+diff --git svx/source/dialog/zoom.cxx svx/source/dialog/zoom.cxx
+index c52bd67..ef1b8e2 100644
+--- svx/source/dialog/zoom.cxx
++++ svx/source/dialog/zoom.cxx
+@@ -36,6 +36,7 @@
+ #endif
+ 
+ // include ---------------------------------------------------------------
++
+ #include <tools/shl.hxx>
+ #include <svtools/itemset.hxx>
+ #include <svtools/itempool.hxx>
+@@ -45,9 +46,7 @@
+ #define _SVX_ZOOM_CXX
+ 
+ #include <svx/dialogs.hrc>
+-#if !ENABLE_LAYOUT
+ #include "zoom.hrc"
+-#endif /* !ENABLE_LAYOUT */
+ 
+ #include "zoom.hxx"
+ #include <svx/zoomitem.hxx>
+diff --git svx/uiconfig/layout/layout.mk svx/uiconfig/layout/layout.mk
+index 88164bb..8c939b0 100644
+--- svx/uiconfig/layout/layout.mk
++++ svx/uiconfig/layout/layout.mk
+@@ -1,5 +1,5 @@
+ # TODO: move to solenv/inc
+-# copies: sw/uiconfig/layout svx/uiconfig/layout
++# copies: sc/uiconfig/layout svx/uiconfig/layout sw/uiconfig/layout
+ 
+ TRALAY=tralay
+ XML_DEST=$(DLLDEST)