[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                       |    2 --
 patches/dev300/layout-localize-fix-sc.diff |   21 ---------------------
 2 files changed, 23 deletions(-)

New commits:
commit 7e732b4f9fac0988e8a2757b0218485fb0a90f71
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:38:23 2011 +0300

    sc uses gbuild, no makefile to patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 225e666..ee626de 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1219,8 +1219,6 @@ sd-update-relative-links.diff, n#355674, i#55224, rodo
 layout-post-cws-layoutdialogs2-mysteriously-missing.diff
 layout-post-cws-layoutdialogs2-edit-noop-reversal.diff, n#552450
 
-layout-localize-fix-sc.diff
-
 # Enable layout'ed dialogs.
 # FIXME: do not enable the layout dialogs by default; there are still problems with them (resizing, look, ...)
 #layout-default-enable-config_office.diff, janneke
diff --git a/patches/dev300/layout-localize-fix-sc.diff b/patches/dev300/layout-localize-fix-sc.diff
deleted file mode 100644
index f1ac6dc..0000000
--- a/patches/dev300/layout-localize-fix-sc.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- sc/uiconfig/layout/makefile.mk |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git sc/uiconfig/layout/makefile.mk sc/uiconfig/layout/makefile.mk
-index 4a6e5ed..0b19c02 100644
---- sc/uiconfig/layout/makefile.mk
-+++ sc/uiconfig/layout/makefile.mk
-@@ -57,3 +57,9 @@ localize.sdf: $(PRJ)/source/ui/miscdlgs/localize.sdf $(PRJ)/source/ui/src/locali
-     grep sortdlg.src $(PRJ)/source/ui/src/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SCDLG_SORT/\t/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' -e 's/\tRID_SCPAGE_SORT_OPTIONS/\t/' -e 's/\tRID_SCPAGE_SORT_FIELDS/\t/' > sort-options-$@
-     echo '#empty' | cat - insert-sheet-$@ move-copy-sheet-$@ sort-options-$@ > $@
-     rm -f *-$@
-+
-+$(PRJ)/source/ui/miscdlgs/localize.sdf:
-+    touch $@
-+
-+$(PRJ)/source/ui/src/localize.sdf:
-+    touch $@
--- 
-1.7.0.1
-