[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                              |    4 ---
 patches/dev300/sfx2-template-category-labels.diff |   27 ----------------------
 2 files changed, 31 deletions(-)

New commits:
commit 6e8e92f1a443244bfc640bd45ad0f3a932fc5f36
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:59:06 2011 +0200

    pushed sfx2-template-category-labels.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 59fcadc..4226982 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -513,10 +513,6 @@ office-cfg-linux-common-template-dir.diff, pmladek
 # handling of the issue. See discussion in bnc#525331. --tml
 # session-management.diff, i#63156, rodo
 
-# add new category "Labels" for blank Labels, calling cards, CD labels, etc.
-# will not push it upstream because it will be obsoleted by upcomming kendy's work
-sfx2-template-category-labels.diff, pmladek
-
 [ DebianBaseOnly ]
 sensible-ooomua.diff
 sensible-browser.diff
diff --git a/patches/dev300/sfx2-template-category-labels.diff b/patches/dev300/sfx2-template-category-labels.diff
deleted file mode 100644
index 59c2528..0000000
--- a/patches/dev300/sfx2-template-category-labels.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- sfx2/source/doc/doctempl.src |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git sfx2/source/doc/doctempl.src sfx2/source/doc/doctempl.src
-index de5e0ba..dbf2a99 100644
---- sfx2/source/doc/doctempl.src
-+++ sfx2/source/doc/doctempl.src
-@@ -43,6 +43,7 @@ StringArray TEMPLATE_SHORT_NAMES_ARY
-         < "layout" ; > ;
-         < "presnt" ; > ;
-         < "misc" ; > ;
-+        < "labels" ; > ;
-     };
- };
- 
-@@ -60,6 +61,7 @@ StringArray TEMPLATE_LONG_NAMES_ARY
-         < "Presentation Backgrounds" ; > ;
-         < "Presentations" ; > ;
-         < "Miscellaneous" ; > ;
-+        < "Labels" ; > ;
-     };
- 
-     };
--- 
-1.7.0.1
-