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

[jannieuw svn gnome org]

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

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

	* patches/dev300/layout-simple-dialogs-sw.diff: New file with update
	for layout.hxx wordcount dialog cleanup.

	* patches/dev300/apply: Add it.  Fixes compiling sw.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 25 13:14:54 2008
@@ -2158,6 +2158,7 @@
 layout-simple-dialogs-sc-localize.diff
 layout-simple-dialogs-sc.diff
 layout-simple-dialogs-svx.diff
+layout-simple-dialogs-sw.diff
 layout-simple-dialogs-toolkit.diff
 
 # FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)

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:14:54 2008
@@ -41,6 +41,45 @@
  	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