[ooo-build-commit] .: patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Jul 30 09:46:27 PDT 2010
patches/dev300/apply | 7 -
patches/dev300/pptx-autoplay-fix.diff | 155 +++++++++++++++++-----------------
2 files changed, 83 insertions(+), 79 deletions(-)
New commits:
commit 9579a8fbae3641ab877b71c0c134b62a38b47a63
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Fri Jul 30 18:44:43 2010 +0200
Updated pptx-autoplay-fix.diff for ooo320-m2
* patches/dev300/pptx-autoplay-fix.diff: updated for ooo320-m2
* patches/dev300/apply: enabled again:
* pptx-autoplay-fix.diff
* ooxml-filters.diff
* ooxml-autoplay-fix.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8f3497e..4063110 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3001,8 +3001,9 @@ wmf-mm-text-1.diff, n#417818, rodo
# FIXME dev300-m83 sd-create-table-height-fix.diff, i#100275, thorsten
[ OOXML ]
-# FIXME ooo330-m2 pptx-autoplay-fix.diff, n#485645, thorsten
-# FIXME ooo330-m2 ooxml-filters.diff, cbosdo
+# FIXME ooo330-m2: disabled some hunks; the files were probably completely
+pptx-autoplay-fix.diff, n#485645, thorsten
+ooxml-filters.diff, cbosdo
[ OOXMLExportDevel ]
ooxml-filters-calc.diff, muthusuba
@@ -3019,7 +3020,7 @@ ooxml-sc-brk.diff, muthusuba
ooxml-sw-fix-2010-import-crash.diff, bubli
# depends on pptx-autoplay-fix.diff
-# FIXME ooo330-m2 ooxml-autoplay-fix.diff, tml
+ooxml-autoplay-fix.diff, tml
[ UbuntuHardyOnly ]
diff --git a/patches/dev300/pptx-autoplay-fix.diff b/patches/dev300/pptx-autoplay-fix.diff
index 69abff4..80e64a7 100644
--- a/patches/dev300/pptx-autoplay-fix.diff
+++ b/patches/dev300/pptx-autoplay-fix.diff
@@ -32,28 +32,28 @@ index 4ec4bf2..f1fefd7 100644
--- filter/source/config/cache/constant.hxx
+++ filter/source/config/cache/constant.hxx
@@ -130,6 +130,7 @@ extern rtl::OUString pFilterStrings[];
- #define FLAGNAME_OWN _FILTER_CONFIG_FROM_ASCII_("OWN" )
#define FLAGNAME_PACKED _FILTER_CONFIG_FROM_ASCII_("PACKED" )
+ #define FLAGNAME_PASSWORDTOMODIFY _FILTER_CONFIG_FROM_ASCII_("PASSWORDTOMODIFY" )
#define FLAGNAME_PREFERRED _FILTER_CONFIG_FROM_ASCII_("PREFERRED" )
+#define FLAGNAME_STARTPRESENTATION _FILTER_CONFIG_FROM_ASCII_("STARTPRESENTATION")
#define FLAGNAME_READONLY _FILTER_CONFIG_FROM_ASCII_("READONLY" )
#define FLAGNAME_SILENTEXPORT _FILTER_CONFIG_FROM_ASCII_("SILENTEXPORT" )
#define FLAGNAME_SUPPORTSSELECTION _FILTER_CONFIG_FROM_ASCII_("SUPPORTSSELECTION")
@@ -155,6 +156,7 @@ extern rtl::OUString pFilterStrings[];
- #define FLAGVAL_OWN 0x00000020 // 32
- #define FLAGVAL_PACKED 0x00100000 // 1048576
+ #define FLAGVAL_ENCRYPTION 0x01000000 // 16777216
+ #define FLAGVAL_PASSWORDTOMODIFY 0x02000000 // 33554432
#define FLAGVAL_PREFERRED 0x10000000 // 268435456
+#define FLAGVAL_STARTPRESENTATION 0x20000000 // 268435456
- #define FLAGVAL_READONLY 0x00010000 // 65536
- #define FLAGVAL_SILENTEXPORT 0x00200000 // 2097152
- #define FLAGVAL_SUPPORTSSELECTION 0x00000400 // 1024
+ #define FLAGVAL_ALL 0xffffffff // 4294967295
+
+ /** @short uno service names of our document services
diff --git filter/source/config/cache/filtercache.cxx filter/source/config/cache/filtercache.cxx
index 0edbb81..544f819 100644
--- filter/source/config/cache/filtercache.cxx
+++ filter/source/config/cache/filtercache.cxx
@@ -2204,6 +2204,7 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam
- if ((nFlags & FLAGVAL_OWN ) == FLAGVAL_OWN ) lFlagNames.push_back(FLAGNAME_OWN );
if ((nFlags & FLAGVAL_PACKED ) == FLAGVAL_PACKED ) lFlagNames.push_back(FLAGNAME_PACKED );
+ if ((nFlags & FLAGVAL_PASSWORDTOMODIFY ) == FLAGVAL_PASSWORDTOMODIFY ) lFlagNames.push_back(FLAGNAME_PASSWORDTOMODIFY );
if ((nFlags & FLAGVAL_PREFERRED ) == FLAGVAL_PREFERRED ) lFlagNames.push_back(FLAGNAME_PREFERRED );
+ if ((nFlags & FLAGVAL_STARTPRESENTATION) == FLAGVAL_STARTPRESENTATION) lFlagNames.push_back(FLAGNAME_STARTPRESENTATION);
if ((nFlags & FLAGVAL_READONLY ) == FLAGVAL_READONLY ) lFlagNames.push_back(FLAGNAME_READONLY );
@@ -188,74 +188,77 @@ index 0000000..7cf518c
+ </prop>
+ <prop oor:name="ClipboardFormat"/>
+ </node>
-diff --git framework/inc/filterflags.h framework/inc/filterflags.h
-index b2f6382..dd65fb7 100644
---- framework/inc/filterflags.h
-+++ framework/inc/filterflags.h
-@@ -60,6 +60,7 @@ namespace framework{
- #define FILTERFLAGNAME_SILENTEXPORT DECLARE_ASCII("SilentExport" ) // x
- #define FILTERFLAGNAME_BROWSERPREFERED DECLARE_ASCII("BrowserPrefered" ) // deprecated
- #define FILTERFLAGNAME_PREFERED DECLARE_ASCII("Prefered" ) // x
-+#define FILTERFLAGNAME_STARTPRESENTATION DECLARE_ASCII("StartPresentation") // x
-
- #define FILTERFLAG_IMPORT 0x00000001L // 1
- #define FILTERFLAG_EXPORT 0x00000002L // 2
-@@ -86,6 +87,7 @@ namespace framework{
- #define FILTERFLAG_BROWSERPREFERED 0x00400000L // 4194304
- //FREE! ... 0x00800000L
- #define FILTERFLAG_PREFERED 0x10000000L // 268435456
-+#define FILTERFLAG_STARTPRESENTATION 0x20000000L
-
- class FlagCheck
- {
-@@ -143,6 +145,7 @@ class FlagCheck
- nCheck &= ~FILTERFLAG_SILENTEXPORT;
- nCheck &= ~FILTERFLAG_BROWSERPREFERED;
- nCheck &= ~FILTERFLAG_PREFERED;
-+ nCheck &= ~FILTERFLAG_STARTPRESENTATION;
- return(nCheck == 0);
- }
-
-diff --git framework/source/constant/filter.cxx framework/source/constant/filter.cxx
-index 38f92a5..ccbfec6 100644
---- framework/source/constant/filter.cxx
-+++ framework/source/constant/filter.cxx
-@@ -89,6 +89,7 @@ const ::rtl::OUString Filter::FLAGNAME_PACKED = ::rtl
- const ::rtl::OUString Filter::FLAGNAME_SILENTEXPORT = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SilentExport" ));
- const ::rtl::OUString Filter::FLAGNAME_BROWSERPREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BrowserPrefered" ));
- const ::rtl::OUString Filter::FLAGNAME_PREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefered" ));
-+const ::rtl::OUString Filter::FLAGNAME_STARTPRESENTATION = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPresentation"));
-
- const sal_Int32 Filter::FLAGVALUE_IMPORT = 0x00000001L; // 1
- const sal_Int32 Filter::FLAGVALUE_EXPORT = 0x00000002L; // 2
-@@ -114,6 +115,7 @@ const sal_Int32 Filter::FLAGVALUE_PACKED = 0x001
- const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x00200000L; // 2097152
- const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304
- const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456
-+const sal_Int32 Filter::FLAGVALUE_STARTPRESENTATION = 0x20000000L;
-
- } // namespace constant
- } // namespace framework
-diff --git framework/source/inc/constant/filter.hxx framework/source/inc/constant/filter.hxx
-index 20f7ad4..3c66506 100644
---- framework/source/inc/constant/filter.hxx
-+++ framework/source/inc/constant/filter.hxx
-@@ -91,6 +91,7 @@ struct Filter
- static const ::rtl::OUString FLAGNAME_SILENTEXPORT;
- static const ::rtl::OUString FLAGNAME_BROWSERPREFERED;
- static const ::rtl::OUString FLAGNAME_PREFERED;
-+ static const ::rtl::OUString FLAGNAME_STARTPRESENTATION;
-
- static const sal_Int32 FLAGVALUE_IMPORT;
- static const sal_Int32 FLAGVALUE_EXPORT;
-@@ -117,6 +118,7 @@ struct Filter
- static const sal_Int32 FLAGVALUE_BROWSERPREFERED;
- //FREE! ... 0x00800000L
- static const sal_Int32 FLAGVALUE_PREFERED;
-+ static const sal_Int32 FLAGVALUE_STARTPRESENTATION;
-
- };
-
+# FIXME ooo3230-m2: it seems that this file completely removed; can't find any new location
+#diff --git framework/inc/filterflags.h framework/inc/filterflags.h
+#index b2f6382..dd65fb7 100644
+#--- framework/inc/filterflags.h
+#+++ framework/inc/filterflags.h
+#@@ -60,6 +60,7 @@ namespace framework{
+# #define FILTERFLAGNAME_SILENTEXPORT DECLARE_ASCII("SilentExport" ) // x
+# #define FILTERFLAGNAME_BROWSERPREFERED DECLARE_ASCII("BrowserPrefered" ) // deprecated
+# #define FILTERFLAGNAME_PREFERED DECLARE_ASCII("Prefered" ) // x
+#+#define FILTERFLAGNAME_STARTPRESENTATION DECLARE_ASCII("StartPresentation") // x
+#
+# #define FILTERFLAG_IMPORT 0x00000001L // 1
+# #define FILTERFLAG_EXPORT 0x00000002L // 2
+#@@ -86,6 +87,7 @@ namespace framework{
+# #define FILTERFLAG_BROWSERPREFERED 0x00400000L // 4194304
+# //FREE! ... 0x00800000L
+# #define FILTERFLAG_PREFERED 0x10000000L // 268435456
+#+#define FILTERFLAG_STARTPRESENTATION 0x20000000L
+#
+# class FlagCheck
+# {
+#@@ -143,6 +145,7 @@ class FlagCheck
+# nCheck &= ~FILTERFLAG_SILENTEXPORT;
+# nCheck &= ~FILTERFLAG_BROWSERPREFERED;
+# nCheck &= ~FILTERFLAG_PREFERED;
+#+ nCheck &= ~FILTERFLAG_STARTPRESENTATION;
+# return(nCheck == 0);
+# }
+#
+# FIXME ooo3230-m2: it seems that this file completely removed; can't find any new location
+#diff --git framework/source/constant/filter.cxx framework/source/constant/filter.cxx
+#index 38f92a5..ccbfec6 100644
+#--- framework/source/constant/filter.cxx
+#+++ framework/source/constant/filter.cxx
+#@@ -89,6 +89,7 @@ const ::rtl::OUString Filter::FLAGNAME_PACKED = ::rtl
+# const ::rtl::OUString Filter::FLAGNAME_SILENTEXPORT = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SilentExport" ));
+# const ::rtl::OUString Filter::FLAGNAME_BROWSERPREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BrowserPrefered" ));
+# const ::rtl::OUString Filter::FLAGNAME_PREFERED = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prefered" ));
+#+const ::rtl::OUString Filter::FLAGNAME_STARTPRESENTATION = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPresentation"));
+#
+# const sal_Int32 Filter::FLAGVALUE_IMPORT = 0x00000001L; // 1
+# const sal_Int32 Filter::FLAGVALUE_EXPORT = 0x00000002L; // 2
+#@@ -114,6 +115,7 @@ const sal_Int32 Filter::FLAGVALUE_PACKED = 0x001
+# const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x00200000L; // 2097152
+# const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304
+# const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456
+#+const sal_Int32 Filter::FLAGVALUE_STARTPRESENTATION = 0x20000000L;
+#
+# } // namespace constant
+# } // namespace framework
+# FIXME ooo3230-m2: it seems that this file completely removed; can't find any new location
+#diff --git framework/source/inc/constant/filter.hxx framework/source/inc/constant/filter.hxx
+#index 20f7ad4..3c66506 100644
+#--- framework/source/inc/constant/filter.hxx
+#+++ framework/source/inc/constant/filter.hxx
+#@@ -91,6 +91,7 @@ struct Filter
+# static const ::rtl::OUString FLAGNAME_SILENTEXPORT;
+# static const ::rtl::OUString FLAGNAME_BROWSERPREFERED;
+# static const ::rtl::OUString FLAGNAME_PREFERED;
+#+ static const ::rtl::OUString FLAGNAME_STARTPRESENTATION;
+#
+# static const sal_Int32 FLAGVALUE_IMPORT;
+# static const sal_Int32 FLAGVALUE_EXPORT;
+#@@ -117,6 +118,7 @@ struct Filter
+# static const sal_Int32 FLAGVALUE_BROWSERPREFERED;
+# //FREE! ... 0x00800000L
+# static const sal_Int32 FLAGVALUE_PREFERED;
+#+ static const sal_Int32 FLAGVALUE_STARTPRESENTATION;
+#
+# };
+#
diff --git oox/source/core/filterdetect.cxx oox/source/core/filterdetect.cxx
index 42463a2..6ad7c73 100644
--- oox/source/core/filterdetect.cxx
@@ -449,8 +452,8 @@ index f7ed7db..d1d176f 100644
--- sfx2/inc/sfx2/docfilt.hxx
+++ sfx2/inc/sfx2/docfilt.hxx
@@ -65,6 +65,7 @@
+ #define SFX_FILTER_PASSWORDTOMODIFY 0x02000000L
- #define SFX_FILTER_BROWSERPREFERED 0x00400000L
#define SFX_FILTER_PREFERED 0x10000000L
+#define SFX_FILTER_STARTPRESENTATION 0x20000000L
More information about the ooo-build-commit
mailing list