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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Jul 24 17:42:19 2008
New Revision: 13380
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13380&view=rev

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

	* layout-simple-dialogs-svx.diff: New file.

	* patches/dev300/apply: Oops, add another missing patch from
	GIT.  Thanks *again* Noel.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 24 17:42:19 2008
@@ -2157,6 +2157,7 @@
 layout-simple-dialogs-offapi.diff
 layout-simple-dialogs-sc-localize.diff
 layout-simple-dialogs-sc.diff
+layout-simple-dialogs-svx.diff
 layout-simple-dialogs-toolkit.diff
 
 # FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)

Added: trunk/patches/dev300/layout-simple-dialogs-svx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-simple-dialogs-svx.diff	Thu Jul 24 17:42:19 2008
@@ -0,0 +1,107 @@
+diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
+index 06aaa90..247f726 100644
+--- svx/source/dialog/makefile.mk
++++ svx/source/dialog/makefile.mk
+@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE :  settings.mk
+ .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+ 
+-.IF "$(ENABLE_LAYOUT)" == "TRUE"
+-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+-.ENDIF # ENABLE_LAYOUT == TRUE
+-
+ .IF "$(ENABLE_GTK)" != ""
+ CFLAGS+=-DENABLE_GTK
+ .ENDIF
+diff --git a/svx/source/dialog/zoom.cxx b/svx/source/dialog/zoom.cxx
+index ef1b8e2..50dc336 100644
+--- svx/source/dialog/zoom.cxx
++++ svx/source/dialog/zoom.cxx
+@@ -56,6 +56,13 @@
+ 
+ #include <layout/layout-pre.hxx>
+ 
++#if ENABLE_LAYOUT
++#undef SVX_RES
++#define SVX_RES(x) #x
++#undef SfxModalDialog
++#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
++#endif /* ENABLE_LAYOUT */
++
+ // static ----------------------------------------------------------------
+ 
+ static USHORT pRanges[] =
+@@ -217,6 +224,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
+ 	bModified	( FALSE )
+ 
+ {
++#if ENABLE_LAYOUT
++    SetHelpId (SID_ATTR_ZOOM);
++#endif /* ENABLE_LAYOUT */
+ 	Link aLink = LINK( this, SvxZoomDialog, UserHdl );
+     a100Btn.SetClickHdl( aLink );
+     aOptimalBtn.SetClickHdl( aLink );
+diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
+index abed333..f6a76a4 100644
+--- svx/uiconfig/layout/zoom.xml
++++ svx/uiconfig/layout/zoom.xml
+@@ -12,13 +12,13 @@
+ 	<hbox spacing="0" border="0">
+ 	    <vbox spacing="5" border="5">
+ 		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
+-		<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   _label="Optimal"/>
+-		<radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
+-		<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" _label="Page Width"/>
+-		<radiobutton radiogroup="zoom" id="BTN_100"   _label="100 %"/>
++		<radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL"   _label="Optimal"/>
++		<radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
++		<radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
++		<radiobutton radiogroup="zoom-factor" id="BTN_100"   _label="100 %"/>
+ 		<hbox cnt:expand="false" cnt:fill="true">
+ 		    <align cnt:expand="false" cnt:fill="true">
+-			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" _label="Variable"/>
++			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
+ 		    </align>
+ 		    <flow cnt:padding="10" cnt:expand="false"/>
+ 		    <metricfield id="ED_USER" value-step="1"
+@@ -30,11 +30,11 @@
+ 	    </vbox>
+ 	    <vbox spacing="5" border="5">
+ 		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
+-		<radiobutton radiogroup="zoom" id="BTN_AUTOMATIC" _label="~Automatic"/>
+-		<radiobutton radiogroup="zoom" id="BTN_SINGLE"    _label="~Single page"/>
++		<radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
++		<radiobutton radiogroup="zoom-layout" id="BTN_SINGLE"    _label="~Single page"/>
+ 		<hbox cnt:expand="false" cnt:fill="true">
+ 		    <align cnt:expand="false" cnt:fill="true">
+-			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_COLUMNS" _label="~Columns"/>
++			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
+ 		    </align>
+ 		    <flow cnt:padding="10" cnt:expand="false"/>
+ 		    <metricfield id="ED_COLUMNS" value-step="1"
+@@ -48,7 +48,7 @@
+ 		<hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
+ 	    </vbox>
+ 	</hbox>
+-	<fixedline cnt:padding="1" id="FL_BOTTOM"/>
++        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
+ 	<dialogbuttonhbox border="5" spacing="5">
+ 	    <flow/>
+ 	    <okbutton     id="BTN_ZOOM_OK"/>
+diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk
+index 028a32e..4831744 100644
+--- svx/util/makefile.pmk
++++ svx/util/makefile.pmk
+@@ -36,12 +36,6 @@ CDEFS += -DSVX_DLLIMPLEMENTATION
+ CFLAGS+=-DENABLE_GTK
+ .ENDIF
+ 
+-.IF "$(ENABLE_LAYOUT)" == "TRUE"
+-CFLAGS+=-DENABLE_LAYOUT=1
+-.ELSE
+-CFLAGS+=-DENABLE_LAYOUT=0
+-.ENDIF # ENABLE_LAYOUT == TRUE
+-
+ # set default symbol visibility / scope to hidden
+ .IF "$(COMNAME)" == "gcc3"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"