[Libreoffice-commits] .: patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Tue Oct 19 12:27:25 PDT 2010
patches/dev300/layout-disabled-layout-build-fix.diff | 10 ++---
patches/dev300/oox-xlsx-import-fix-connector-shape.diff | 4 +-
patches/dev300/sfx2-privateprotectedpublic.diff | 12 +++---
patches/dev300/smoketest-officeconnection-fix.diff | 4 +-
patches/dev300/transogl-transitions-sd.diff | 32 ++++++++--------
5 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 9fb73ba21b3fc89d128afe40850f7dd7fde17f54
Author: Rene Engelhard <rene at debian.org>
Date: Tue Oct 19 21:27:05 2010 +0200
make patches apply again
diff --git a/patches/dev300/layout-disabled-layout-build-fix.diff b/patches/dev300/layout-disabled-layout-build-fix.diff
index 363cf4b..b65ccde 100644
--- a/patches/dev300/layout-disabled-layout-build-fix.diff
+++ b/patches/dev300/layout-disabled-layout-build-fix.diff
@@ -6,21 +6,21 @@ diff --git sfx2/inc/sfx2/layout.hxx sfx2/inc/sfx2/layout.hxx
index 836a762..b4e145c 100644
--- sfx2/inc/sfx2/layout.hxx
+++ sfx2/inc/sfx2/layout.hxx
-@@ -61,6 +61,7 @@ public:
+@@ -49,6 +49,7 @@
+ SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0);
};
- #endif
-
+
+#if ENABLE_LAYOUT
class SFX2_DLLPUBLIC SfxTabPage
: public ::SfxTabPage
, public InPlug
-@@ -73,6 +74,7 @@ public:
+@@ -61,6 +62,7 @@
Size GetOptimalSize (WindowSizeType eType) const;
void FreeResource ();
};
+#endif
} // end namespace layout
-
+
#endif /* _SFX2_LAYOUT_HXX */
--
1.7.0.1
diff --git a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
index 0d80be2..64e0ad5 100644
--- a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
+++ b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
@@ -8,9 +8,9 @@ diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
index eed2241..765a559 100644
--- oox/source/drawingml/shape.cxx
+++ oox/source/drawingml/shape.cxx
-@@ -44,6 +44,7 @@
- #include <com/sun/star/beans/XMultiPropertySet.hpp>
+@@ -47,6 +47,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+ #include <com/sun/star/xml/AttributeData.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
+#include <com/sun/star/drawing/ConnectorType.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
diff --git a/patches/dev300/sfx2-privateprotectedpublic.diff b/patches/dev300/sfx2-privateprotectedpublic.diff
index fe3bc11..fefb913 100644
--- a/patches/dev300/sfx2-privateprotectedpublic.diff
+++ b/patches/dev300/sfx2-privateprotectedpublic.diff
@@ -27,18 +27,18 @@ index 6f84e0c..55d0199 100644
SfxItemSet* pOutSet;
TabDlg_Impl* pImpl;
USHORT* pRanges;
-@@ -121,9 +124,10 @@ friend class SfxTabDialogController;
+@@ -119,9 +119,10 @@
+ DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
- //#endif
-
+
-protected:
+public:
- virtual short Ok();
+ virtual short Ok();
// wird im Sfx gel"oscht!
+protected:
- virtual SfxItemSet* CreateInputItemSet( USHORT nId );
+ virtual SfxItemSet* CreateInputItemSet( USHORT nId );
// wird *nicht* im Sfx gel"oscht!
- virtual const SfxItemSet* GetRefreshedSet();
+ virtual const SfxItemSet* GetRefreshedSet();
--
1.7.0.1
diff --git a/patches/dev300/smoketest-officeconnection-fix.diff b/patches/dev300/smoketest-officeconnection-fix.diff
index 49efd7a..28b195a 100644
--- a/patches/dev300/smoketest-officeconnection-fix.diff
+++ b/patches/dev300/smoketest-officeconnection-fix.diff
@@ -2,9 +2,9 @@ diff --git test/source/cpp/officeconnection.cxx test/source/cpp/officeconnection
index 96f735a..9222c3a 100644
--- test/source/cpp/officeconnection.cxx
+++ test/source/cpp/officeconnection.cxx
-@@ -108,6 +108,10 @@ void OfficeConnection::setUp() {
+@@ -112,6 +112,10 @@
argSoffice.copy(RTL_CONSTASCII_LENGTH("path:"))).pData,
- args, sizeof args / sizeof args[0], 0, 0, 0, envs,
+ args, SAL_N_ELEMENTS( args ), 0, 0, 0, envs,
envs == 0 ? 0 : 1, &process_));
+ // ooo-build soffice.bin doesn't block
+ // desc string is already set up so below will try to connect
diff --git a/patches/dev300/transogl-transitions-sd.diff b/patches/dev300/transogl-transitions-sd.diff
index 19b0645..1b3b6b2 100644
--- a/patches/dev300/transogl-transitions-sd.diff
+++ b/patches/dev300/transogl-transitions-sd.diff
@@ -8,22 +8,22 @@ diff --git sd/prj/build.lst sd/prj/build.lst
index 381e9bc..3ebc326 100644
--- sd/prj/build.lst
+++ sd/prj/build.lst
-@@ -34,7 +34,7 @@ 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\grf nmake - all sd_grf sd_inc NULL
--sd sd\source\filter\xml nmake - all sd_xml 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
- sd sd\source\ui\animations nmake - all sd_animations sd_inc NULL
- sd sd\source\ui\slideshow nmake - all sd_slideshow sd_sdi sd_inc NULL
-@@ -44,5 +44,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_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_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
+@@ -35,7 +35,7 @@
+ 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_xml 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
+ sd sd\source\ui\animations nmake - all sd_animations sd_inc NULL
+ sd sd\source\ui\slideshow nmake - all sd_slideshow sd_sdi sd_inc NULL
+@@ -45,5 +45,6 @@
+ 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_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_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
diff --git sd/xml/makefile.mk sd/xml/makefile.mk
new file mode 100644
More information about the Libreoffice-commits
mailing list