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

[jannieuw svn gnome org]

Author: jannieuw
Date: Fri Jul 25 13:21:26 2008
New Revision: 13387
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13387&view=rev

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

	* patches/dev300/layout-simple-dialogs-sw.diff: Really add.

	* patches/dev300/layout-simple-dialogs-svx.diff: Revert pending
	cleanup.


Added:
   trunk/patches/dev300/layout-simple-dialogs-sw.diff
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	Fri Jul 25 13:21:26 2008
@@ -41,45 +41,6 @@
  	Link aLink = LINK( this, SvxZoomDialog, UserHdl );
      a100Btn.SetClickHdl( aLink );
      aOptimalBtn.SetClickHdl( aLink );
-diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
-deleted file mode 100644
-index 8c939b0..0000000
---- svx/uiconfig/layout/layout.mk
-+++ /dev/null
-@@ -1,33 +0,0 @@
--# TODO: move to solenv/inc
--# copies: sc/uiconfig/layout svx/uiconfig/layout sw/uiconfig/layout
--
--TRALAY=tralay
--XML_DEST=$(DLLDEST)
--XML_LANGS=$(alllangiso)
--
--ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)/$i/$j))
--
--# Must remove the -j (no duplicate base file names) flag
--ZIPUPDATE=-u
--XML_ZIP = $(PRJNAME)-layout
--
--ALLTAR: $(XML_ZIP)
--
--$(XML_ZIP): $(ALL_XMLS)
--
--ZIP1DIR=$(XML_DEST)
--ZIP1TARGET=$(XML_ZIP)
--ZIP1LIST=$(ALL_XMLS:s $(XML_DEST)/@@)
--
--$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
--	-$(MKDIR) $(@:d)
--	@echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
--	$(TRALAY) -m localize.sdf -o $(XML_DEST) -l $(XML_LANGS:f:t" -l ") $<
--
--$(XML_DEST)/%.xml: %.xml
--	-$(MKDIR) $(@:d)
--	$(COPY) $< $@
--
--# Don't want to overwrite filled localize.sdf with empty template
--template.sdf:
--	$(foreach,i,$(XML_FILES) $(TRALAY) -l en-US $i) > $@
 diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
 index abed333..f6a76a4 100644
 --- svx/uiconfig/layout/zoom.xml

Added: trunk/patches/dev300/layout-simple-dialogs-sw.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-simple-dialogs-sw.diff	Fri Jul 25 13:21:26 2008
@@ -0,0 +1,45 @@
+diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
+index 1f16883..17ca965 100644
+--- sw/source/ui/dialog/makefile.mk
++++ sw/source/ui/dialog/makefile.mk
+@@ -42,10 +42,6 @@ LIBTARGET=no
+ .INCLUDE :  settings.mk
+ .INCLUDE :  $(PRJ)$/inc$/sw.mk
+ 
+-.IF "$(ENABLE_LAYOUT)" == "TRUE"
+-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+-.ENDIF # ENABLE_LAYOUT == TRUE
+-
+ # --- Files --------------------------------------------------------
+ 
+ SRS1NAME=$(TARGET)
+diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
+index 8639a68..8ae35e6 100644
+--- sw/source/ui/dialog/wordcountdialog.cxx
++++ sw/source/ui/dialog/wordcountdialog.cxx
+@@ -41,6 +41,15 @@
+ #include <layout/layout-pre.hxx>
+ #include <wordcountdialog.hrc>
+ 
++#if ENABLE_LAYOUT
++#undef SW_RES
++#define SW_RES(x) #x
++#undef SfxModalDialog
++#define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id )
++#define SW_WORDCOUNTDIALOG_HRC
++#include <helpid.h>
++#endif /* ENABLE_LAYOUT */
++
+ /*-- 06.04.2004 16:05:55---------------------------------------------------
+ 
+   -----------------------------------------------------------------------*/
+@@ -67,6 +76,9 @@ SwWordCountDialog::SwWordCountDialog(Window* pParent) :
+ #pragma warning (default : 4355)
+ #endif
+ {
++#if ENABLE_LAYOUT
++    SetHelpId (HID_DLG_WORDCOUNT);
++#endif /* ENABLE_LAYOUT */
+     FreeResource();
+ }
+ /*-- 06.04.2004 16:05:56---------------------------------------------------