[Libreoffice-commits] .: 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply                                                         |    3 -
 patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff |   27 ----------
 patches/dev300/writer-navigation-buttons.diff                                |    9 +--
 3 files changed, 5 insertions(+), 34 deletions(-)

New commits:
commit a95f7e45ff701e249045f878c6bffd6b8a8396ce
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 19 21:31:54 2010 +0200

    make writer-navigation-buttons.diff apply again

diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index aeaee22..28cb98b 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -184,11 +184,12 @@ diff --git sw/inc/helpid.h sw/inc/helpid.h
 index 9f5c6ad..f0658f1 100644
 --- sw/inc/helpid.h
 +++ sw/inc/helpid.h
-@@ -982,3 +982,4 @@
- #define HID_MM_HEADER_12                            (HID_BASE + 2279)
+@@ -982,3 +982,5 @@
  #define HID_MM_HEADER_13                            (HID_BASE + 2280)
- 
-+#define HID_NAVIGATION_TOOLBOX                      (HID_BASE + 2281)
+
+ #define HID_TITLEPAGE                                                          (HID_BASE + 2281)
++
++#define HID_NAVIGATION_TOOLBOX                      (HID_BASE + 2282)
 diff --git sw/inc/shellid.hxx sw/inc/shellid.hxx
 index 65af848..e3ef3e6 100644
 --- sw/inc/shellid.hxx
commit caeeb9c4e81253b8315d53a97512bcd5646b141b
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 19 21:29:17 2010 +0200

    pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff is also obsolete

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 980d081..b872ddc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2064,9 +2064,6 @@ base64.diff, i#100620, hmth
 #Create langpack and full installers
 ooop-langpack-policy.diff
 
-[ OOXMLExport and OpenGLTransitions ]
-pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
-
 [ OOXMLExport ]
 # hack to ignore writerfilter when odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff b/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
deleted file mode 100644
index 5b43010..0000000
--- a/patches/dev300/pptx-filter-as-a-separate-lib-sd-build-lst-with-transogl.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- sd/prj/build.lst |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git sd/prj/build.lst sd/prj/build.lst
-index 3ebc326..39a07df 100644
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -33,6 +33,7 @@ sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
- sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
- sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
- sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
-+sd	sd\source\filter\pptx					nmake	-	all	sd_pptx sd_inc NULL
- sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
- sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
- sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
-@@ -44,6 +45,6 @@ sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc N
- sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
- sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
- sd	sd\source\ui\annotations				nmake	-	all sd_uiannotations sd_inc NULL
--sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-+sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
- sd	sd\xml									nmake	-	all	sd_xml NULL
- sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
--- 
-1.7.0.1
-