[Libreoffice-commits] .: patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Thu Oct 14 07:37:49 PDT 2010
patches/dev300/oox-sc-notes.diff | 75
patches/dev300/ooxml-autoplay-fix.diff | 51
patches/dev300/ooxml-filters-calc.diff | 105
patches/dev300/ooxml-filters.diff | 410 -
patches/dev300/ooxml-sc-brk.diff | 13
patches/dev300/ooxml-sc-docpropsimp.diff | 85
patches/dev300/ooxml-sc-internal-hlink-export.diff | 39
patches/dev300/ooxml-sc-page-date-imp.diff | 174
patches/dev300/ooxml-sc-page-date.diff | 276 -
patches/dev300/ooxml-sc-paneexport.diff | 21
patches/dev300/ooxml-sc-showdropdown-fix.diff | 12
patches/dev300/ooxml-schema.diff | 19
patches/dev300/ooxml-sw-fix-2010-import-crash.diff | 13
patches/dev300/pptx-autoplay-fix.diff | 491 -
patches/dev300/xlsx-shared-oox-calc-export-export-pivot-content.diff | 50
patches/dev300/xlsx-shared-oox-calc-export-sotstorage-init.diff | 24
patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff | 11
patches/dev300/xlsx-shared-xlsx-export-cell-style-max-builtin.diff | 29
patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff | 36
patches/dev300/xlsx-shared-xlsx-export-perf-rowbuffer.diff | 270 -
patches/dev300/xlsx-shared-xlsx-export-set-xml-2007-flavour.diff | 25
patches/dev300/xlsx-shared-xlsx-export-simple-autofilter.diff | 68
patches/dev300/xlsx-shared-xlsx-export-skip-auto-format.diff | 29
patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff | 587 --
patches/dev300/xlsx-shared-xlsx-snapshot.diff | 2502 ----------
25 files changed, 5415 deletions(-)
New commits:
commit d85f0befe2b25212868327c8b4e77e399b104106
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Thu Oct 14 16:36:32 2010 +0200
Removed already merged patches
diff --git a/patches/dev300/oox-sc-notes.diff b/patches/dev300/oox-sc-notes.diff
deleted file mode 100644
index 3c26a43..0000000
--- a/patches/dev300/oox-sc-notes.diff
+++ /dev/null
@@ -1,75 +0,0 @@
---- sc/source/filter/excel/xeescher.cxx 2010-07-16 21:20:19.000000000 +0530
-+++ sc/source/filter/excel/xeescher.cxx 2010-08-09 17:23:46.000000000 +0530
-@@ -1000,7 +1000,12 @@ XclExpNote::XclExpNote( const XclExpRoot
- // get the main note text
- String aNoteText;
- if( pScNote )
-+ {
- aNoteText = pScNote->GetText();
-+ const EditTextObject *pEditObj = pScNote->GetEditTextObject();
-+ if( pEditObj )
-+ mpNoteContents = XclExpStringHelper::CreateString( rRoot, *pEditObj );
-+ }
- // append additional text
- ScGlobal::AddToken( aNoteText, rAddText, '\n', 2 );
- maOrigNoteText = aNoteText;
---- sc/source/ui/unoobj/notesuno.cxx 2010-08-08 23:28:11.000000000 +0530
-+++ sc/source/ui/unoobj/notesuno.cxx 2010-08-17 12:44:56.000000000 +0530
-@@ -56,16 +56,20 @@
- #include <svx/svditer.hxx>
- #include <svx/svdpage.hxx>
- #include <com/sun/star/drawing/XShapeDescriptor.hpp>
-+#include <editeng/unoprnms.hxx>
-
- using namespace com::sun::star;
-
- //------------------------------------------------------------------------
-
--// keine Properties fuer Text in Notizen
- const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
- {
- static SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] =
- {
-+ SVX_UNOEDIT_CHAR_PROPERTIES,
-+ SVX_UNOEDIT_FONT_PROPERTIES,
-+ SVX_UNOEDIT_PARA_PROPERTIES,
-+ SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
- {0,0,0,0,0,0}
- };
- static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
---- oox/source/xls/commentsbuffer.cxx 2010-08-08 23:27:58.000000000 +0530
-+++ oox/source/xls/commentsbuffer.cxx 2010-08-17 12:36:40.000000000 +0530
-@@ -36,6 +36,10 @@
- #include "oox/xls/addressconverter.hxx"
- #include "oox/xls/drawingfragment.hxx"
-
-+
-+#include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/text/XTextRange.hpp>
-+
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Exception;
-@@ -49,6 +53,10 @@ using ::com::sun::star::sheet::XSheetAnn
- using ::com::sun::star::sheet::XSheetAnnotations;
- using ::com::sun::star::sheet::XSheetAnnotationsSupplier;
-
-+using ::com::sun::star::text::XText;
-+using ::com::sun::star::text::XTextRange;
-+
-+
- namespace oox {
- namespace xls {
-
-@@ -109,6 +118,11 @@ void Comment::finalizeImport()
- Reference< XSheetAnnotation > xAnno( xAnnoAnchor->getAnnotation(), UNO_SET_THROW );
- Reference< XSheetAnnotationShapeSupplier > xAnnoShapeSupp( xAnno, UNO_QUERY_THROW );
- Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
-+ Reference <XText> xText( xAnnoShape, UNO_QUERY_THROW );
-+ Reference <XTextRange> xTextRange( xText, UNO_QUERY_THROW );
-+ xTextRange->setString( OUString::createFromAscii("") ); // Clear contents
-+ maModel.mxText->convert( xText, -1 );
-+
- // convert shape formatting
- if( const ::oox::vml::ShapeBase* pNoteShape = getVmlDrawing().getNoteShape( aNotePos ) )
- {
diff --git a/patches/dev300/ooxml-autoplay-fix.diff b/patches/dev300/ooxml-autoplay-fix.diff
deleted file mode 100644
index 1d02ce9..0000000
--- a/patches/dev300/ooxml-autoplay-fix.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git filter/source/config/fragments/fcfg_impress.mk filter/source/config/fragments/fcfg_impress.mk
-index 43447cb..b5625ef 100644
---- filter/source/config/fragments/fcfg_impress.mk
-+++ filter/source/config/fragments/fcfg_impress.mk
-@@ -18,7 +18,8 @@ T4_IMPRESS = \
- MS_PowerPoint_2007_XML_AutoPlay\
- MS_PowerPoint_2007_XML_Template\
- impress_OOXML_Presentation\
-- impress_OOXML_Presentation_Template
-+ impress_OOXML_Presentation_Template\
-+ impress_OOXML_Presentation_AutoPlay
-
- # -----------------------------------------------
- # count = 20
-@@ -38,7 +39,8 @@ F4_IMPRESS = \
- impress_MS_PowerPoint_2007_XML_AutoPlay\
- impress_MS_PowerPoint_2007_XML_Template\
- impress_OOXML\
-- impress_OOXML_Template
-+ impress_OOXML_Template\
-+ impress_OOXML_AutoPlay
-
- # -----------------------------------------------
- # count = 12
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
-@@ -0,0 +1,11 @@
-+<node oor:name="Impress Office Open XML AutoPlay" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
-+ <prop oor:name="UserData"/>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation AutoPlay</value></prop>
-+ <prop oor:name="FileFormatVersion"/>
-+ <prop oor:name="Type"><value>Office Open XML Presentation AutoPlay</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-+</node>
---- /dev/null
-+++ filter/source/config/fragments/types/impress_OOXML_Presentation_AutoPlay.xcu
-@@ -0,0 +1,10 @@
-+<node oor:name="Office Open XML Presentation AutoPlay" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>ppsx</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Impress Office Open XML AutoPlay</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation AutoPlay</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
diff --git a/patches/dev300/ooxml-filters-calc.diff b/patches/dev300/ooxml-filters-calc.diff
deleted file mode 100644
index 46a7ff0..0000000
--- a/patches/dev300/ooxml-filters-calc.diff
+++ /dev/null
@@ -1,105 +0,0 @@
---- filter/source/config/fragments/fcfg_calc.mk 2010-04-09 16:13:42.000000000 +0530
-+++ filter/source/config/fragments/fcfg_calc.mk 2010-05-07 11:19:25.000000000 +0530
-@@ -27,7 +27,9 @@ T4_CALC = \
- calc_MS_Excel_2003_XML \
- MS_Excel_2007_XML \
- MS_Excel_2007_XML_Template \
-- MS_Excel_2007_Binary
-+ MS_Excel_2007_Binary \
-+ calc_OOXML \
-+ calc_OOXML_Template
-
- # -----------------------------------------------
- # count = 28
-@@ -57,7 +59,9 @@ F4_CALC = \
- MS_Excel_2003_XML \
- calc_MS_Excel_2007_XML \
- calc_MS_Excel_2007_XML_Template \
-- calc_MS_Excel_2007_Binary
-+ calc_MS_Excel_2007_Binary \
-+ calc_OOXML \
-+ calc_OOXML_Template
-
- # -----------------------------------------------
- # count = 12
-@@ -76,7 +80,9 @@ F4_UI_CALC = \
- MS_Excel_2003_XML_ui \
- calc_MS_Excel_2007_XML_ui \
- calc_MS_Excel_2007_XML_Template_ui \
-- calc_MS_Excel_2007_Binary_ui
-+ calc_MS_Excel_2007_Binary_ui \
-+ calc_OOXML_ui \
-+ calc_OOXML_Template_ui
-
- # -----------------------------------------------
- # count = 0
---- filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu 2010-05-07 10:42:42.000000000 +0530
-@@ -0,0 +1,6 @@
-+<node oor:name="Calc Office Open XML Template">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Spreadsheet Template</value>
-+ <value xml:lang="de">Office Open XML Spreadsheet Vorlage</value>
-+ </prop>
-+</node>
---- filter/source/config/fragments/filters/calc_OOXML_Template.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/filters/calc_OOXML_Template.xcu 2010-05-07 10:18:37.000000000 +0530
-@@ -0,0 +1,10 @@
-+<node oor:name="Calc Office Open XML Template" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
-+ <prop oor:name="UserData"><value>OOXML</value></prop>
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>Office Open XML Spreadsheet Template</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-+</node>
---- filter/source/config/fragments/filters/calc_OOXML_ui.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/filters/calc_OOXML_ui.xcu 2010-05-07 10:37:16.000000000 +0530
-@@ -0,0 +1,6 @@
-+<node oor:name="Calc Office Open XML">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Spreadsheet</value>
-+ <value xml:lang="de">Office Open XML Spreadsheet</value>
-+ </prop>
-+</node>
---- filter/source/config/fragments/filters/calc_OOXML.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/filters/calc_OOXML.xcu 2010-05-07 10:16:41.000000000 +0530
-@@ -0,0 +1,10 @@
-+<node oor:name="Calc Office Open XML" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
-+ <prop oor:name="UserData"><value>OOXML</value></prop>
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>Office Open XML Spreadsheet</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-+</node>
---- filter/source/config/fragments/types/calc_OOXML_Template.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/types/calc_OOXML_Template.xcu 2010-05-07 10:50:30.000000000 +0530
-@@ -0,0 +1,10 @@
-+<node oor:name="Office Open XML Spreadsheet Template" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>xltx xltm</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>false</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Calc Office Open XML Template</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Spreadsheet Template</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
---- filter/source/config/fragments/types/calc_OOXML.xcu 1970-01-01 05:30:00.000000000 +0530
-+++ filter/source/config/fragments/types/calc_OOXML.xcu 2010-05-07 10:47:38.000000000 +0530
-@@ -0,0 +1,10 @@
-+<node oor:name="Office Open XML Spreadsheet" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>xlsx xlsm</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>false</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Calc Office Open XML</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Spreadsheet</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
deleted file mode 100644
index 42afe64..0000000
--- a/patches/dev300/ooxml-filters.diff
+++ /dev/null
@@ -1,410 +0,0 @@
----
- filter/source/config/fragments/fcfg_impress.mk | 11 +++++--
- filter/source/config/fragments/fcfg_writer.mk | 12 ++++++--
- .../source/config/fragments/filters/OOXML_Text.xcu | 14 ++++++++++
- .../fragments/filters/OOXML_Text_Template.xcu | 14 ++++++++++
- .../fragments/filters/OOXML_Text_Template_ui.xcu | 6 ++++
- .../config/fragments/filters/OOXML_Text_ui.xcu | 6 ++++
- .../impress_MS_PowerPoint_2007_XML_Template.xcu | 1 +
- .../config/fragments/filters/impress_OOXML.xcu | 12 ++++++++
- .../fragments/filters/impress_OOXML_Template.xcu | 12 ++++++++
- .../filters/impress_OOXML_Template_ui.xcu | 5 +++
- .../config/fragments/filters/impress_OOXML_ui.xcu | 5 +++
- .../fragments/types/impress_OOXML_Presentation.xcu | 10 +++++++
- .../types/impress_OOXML_Presentation_Template.xcu | 10 +++++++
- .../source/config/fragments/types/writer_OOXML.xcu | 12 ++++++++
- .../fragments/types/writer_OOXML_Template.xcu | 12 ++++++++
- oox/inc/oox/core/filterbase.hxx | 8 +++++
- oox/source/core/filterbase.cxx | 28 ++++++++++++++++++++
- 17 files changed, 172 insertions(+), 6 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_ui.xcu
- create mode 100644 filter/source/config/fragments/filters/impress_OOXML.xcu
- create mode 100644 filter/source/config/fragments/filters/impress_OOXML_Template.xcu
- create mode 100644 filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
- create mode 100644 filter/source/config/fragments/filters/impress_OOXML_ui.xcu
- create mode 100644 filter/source/config/fragments/types/impress_OOXML_Presentation.xcu
- create mode 100644 filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu
- create mode 100644 filter/source/config/fragments/types/writer_OOXML.xcu
- create mode 100644 filter/source/config/fragments/types/writer_OOXML_Template.xcu
-
-diff --git filter/source/config/fragments/fcfg_impress.mk filter/source/config/fragments/fcfg_impress.mk
-index 2e354c8..43447cb 100644
---- filter/source/config/fragments/fcfg_impress.mk
-+++ filter/source/config/fragments/fcfg_impress.mk
-@@ -16,7 +16,9 @@ T4_IMPRESS = \
- draw8\
- MS_PowerPoint_2007_XML\
- MS_PowerPoint_2007_XML_AutoPlay\
-- MS_PowerPoint_2007_XML_Template
-+ MS_PowerPoint_2007_XML_Template\
-+ impress_OOXML_Presentation\
-+ impress_OOXML_Presentation_Template
-
- # -----------------------------------------------
- # count = 20
-@@ -34,7 +36,9 @@ F4_IMPRESS = \
- impress8_draw\
- impress_MS_PowerPoint_2007_XML\
- impress_MS_PowerPoint_2007_XML_AutoPlay\
-- impress_MS_PowerPoint_2007_XML_Template
-+ impress_MS_PowerPoint_2007_XML_Template\
-+ impress_OOXML\
-+ impress_OOXML_Template
-
- # -----------------------------------------------
- # count = 12
-@@ -47,7 +51,8 @@ F4_UI_IMPRESS = \
- impress8_template_ui \
- impress8_draw_ui \
- impress_MS_PowerPoint_2007_XML_ui \
-- impress_MS_PowerPoint_2007_XML_Template_ui
-+ impress_OOXML_ui\
-+ impress_OOXML_Template_ui
-
- # -----------------------------------------------
- # count = 0
-diff --git filter/source/config/fragments/fcfg_writer.mk filter/source/config/fragments/fcfg_writer.mk
-index 34d785f..930e2bd 100644
---- filter/source/config/fragments/fcfg_writer.mk
-+++ filter/source/config/fragments/fcfg_writer.mk
-@@ -30,7 +30,9 @@ T4_WRITER = \
- writer8 \
- writer_MS_Word_2003_XML \
- writer_MS_Word_2007_XML \
-- writer_MS_Word_2007_XML_Template
-+ writer_MS_Word_2007_XML_Template \
-+ writer_OOXML \
-+ writer_OOXML_Template
-
- # -----------------------------------------------
- # count = 39
-@@ -62,7 +64,9 @@ F4_WRITER = \
- writer8_template \
- MS_Word_2003_XML \
- MS_Word_2007_XML \
-- MS_Word_2007_XML_Template
-+ MS_Word_2007_XML_Template \
-+ OOXML_Text \
-+ OOXML_Text_Template
-
- # -----------------------------------------------
- # count = 14
-@@ -78,7 +82,9 @@ F4_UI_WRITER = \
- writer8_template_ui \
- MS_Word_2003_XML_ui \
- MS_Word_2007_XML_ui \
-- MS_Word_2007_XML_Template_ui
-+ MS_Word_2007_XML_Template_ui \
-+ OOXML_Text_ui \
-+ OOXML_Text_Template_ui
-
- # -----------------------------------------------
- # count = 0
-diff --git filter/source/config/fragments/filters/OOXML_Text.xcu filter/source/config/fragments/filters/OOXML_Text.xcu
-new file mode 100644
-index 0000000..9943af5
---- /dev/null
-+++ filter/source/config/fragments/filters/OOXML_Text.xcu
-@@ -0,0 +1,14 @@
-+ <node oor:name="Office Open XML Text" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
-+ <prop oor:name="UserData"><value></value></prop>
-+ <prop oor:name="UIName">
-+ <value xml:lang="x-default">Office Open XML Text</value>
-+ </prop>
-+ <!-- ISO/IEC 29500:2008 -->
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>writer_OOXML</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/filters/OOXML_Text_Template.xcu filter/source/config/fragments/filters/OOXML_Text_Template.xcu
-new file mode 100644
-index 0000000..ffc9dfd
---- /dev/null
-+++ filter/source/config/fragments/filters/OOXML_Text_Template.xcu
-@@ -0,0 +1,14 @@
-+ <node oor:name="Office Open XML Text Template" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
-+ <prop oor:name="UserData"><value></value></prop>
-+ <prop oor:name="UIName">
-+ <value xml:lang="x-default">Office Open XML Text Template</value>
-+ </prop>
-+ <!-- ISO/IEC 29500:2008 -->
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>writer_OOXML_Text_Template</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
-new file mode 100644
-index 0000000..e790fb7
---- /dev/null
-+++ filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
-@@ -0,0 +1,6 @@
-+ <node oor:name="Office Open XML Text Template">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Text Template</value>
-+ <value xml:lang="de">Office Open XML Text Vorlage</value>
-+ </prop>
-+ </node>
-diff --git filter/source/config/fragments/filters/OOXML_Text_ui.xcu filter/source/config/fragments/filters/OOXML_Text_ui.xcu
-new file mode 100644
-index 0000000..483f23d
---- /dev/null
-+++ filter/source/config/fragments/filters/OOXML_Text_ui.xcu
-@@ -0,0 +1,6 @@
-+ <node oor:name="Office Open XML Text">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Text</value>
-+ <value xml:lang="de">Office Open XML Text</value>
-+ </prop>
-+ </node>
-diff --git filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
-index c8cf6d1..eb9fea6 100644
---- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
-+++ filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
-@@ -3,6 +3,7 @@
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
- <prop oor:name="UserData"/>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Microsoft PowerPoint 2007 XML Template</value></prop>
- <prop oor:name="FileFormatVersion"/>
- <prop oor:name="Type"><value>MS PowerPoint 2007 XML Template</value></prop>
- <prop oor:name="TemplateName"/>
-diff --git filter/source/config/fragments/filters/impress_OOXML.xcu filter/source/config/fragments/filters/impress_OOXML.xcu
-new file mode 100644
-index 0000000..d1a5adb
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_OOXML.xcu
-@@ -0,0 +1,12 @@
-+<node oor:name="Impress Office Open XML" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
-+ <prop oor:name="UserData"><value>OOXML</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation</value></prop>
-+ <!-- ISO/IEC 29500:2008 -->
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>Office Open XML Presentation</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-+</node>
-diff --git filter/source/config/fragments/filters/impress_OOXML_Template.xcu filter/source/config/fragments/filters/impress_OOXML_Template.xcu
-new file mode 100644
-index 0000000..e9febe1
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_OOXML_Template.xcu
-@@ -0,0 +1,12 @@
-+<node oor:name="Impress Office Open XML Template" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
-+ <prop oor:name="UserData"><value>OOXML</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation Template</value></prop>
-+ <!-- ISO/IEC 29500:2008 -->
-+ <prop oor:name="FileFormatVersion"><value>1</value></prop>
-+ <prop oor:name="Type"><value>Office Open XML Presentation Template</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-+</node>
-diff --git filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
-new file mode 100644
-index 0000000..f33346d
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
-@@ -0,0 +1,5 @@
-+<node oor:name="Office Open XML Presentation Template">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Presentation Template</value>
-+ </prop>
-+</node>
-diff --git filter/source/config/fragments/filters/impress_OOXML_ui.xcu filter/source/config/fragments/filters/impress_OOXML_ui.xcu
-new file mode 100644
-index 0000000..cadc369
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_OOXML_ui.xcu
-@@ -0,0 +1,5 @@
-+<node oor:name="Office Open XML Presentation">
-+ <prop oor:name="UIName">
-+ <value xml:lang="en-US">Office Open XML Presentation</value>
-+ </prop>
-+</node>
-diff --git filter/source/config/fragments/types/impress_OOXML_Presentation.xcu filter/source/config/fragments/types/impress_OOXML_Presentation.xcu
-new file mode 100644
-index 0000000..501f2e4
---- /dev/null
-+++ filter/source/config/fragments/types/impress_OOXML_Presentation.xcu
-@@ -0,0 +1,10 @@
-+<node oor:name="Office Open XML Presentation" oor:op="replace">
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>pptx pptm</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Impress Office Open XML</value></prop>
-+ <prop oor:name="UIName"><value>Office Open XML Presentation</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
-diff --git filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu
-new file mode 100644
-index 0000000..c2ea660
---- /dev/null
-+++ filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu
-@@ -0,0 +1,10 @@
-+<node oor:name="Office Open XML Presentation Template" oor:op="replace">
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>potm potx</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Impress Office Open XML Template</value></prop>
-+ <prop oor:name="UIName"><value>Office Open XML Presentation Template</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
-diff --git filter/source/config/fragments/types/writer_OOXML.xcu filter/source/config/fragments/types/writer_OOXML.xcu
-new file mode 100644
-index 0000000..346b00e
---- /dev/null
-+++ filter/source/config/fragments/types/writer_OOXML.xcu
-@@ -0,0 +1,12 @@
-+ <node oor:name="writer_OOXML" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>docx docm</value></prop>
-+ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value></prop>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Office Open XML Text</value></prop>
-+ <prop oor:name="UIName">
-+ <value>Office Open XML Text Document</value>
-+ </prop>
-+ <prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/types/writer_OOXML_Template.xcu filter/source/config/fragments/types/writer_OOXML_Template.xcu
-new file mode 100644
-index 0000000..566e08d
---- /dev/null
-+++ filter/source/config/fragments/types/writer_OOXML_Template.xcu
-@@ -0,0 +1,12 @@
-+ <node oor:name="writer_OOXML_Text_Template" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>dotx dotm</value></prop>
-+ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.wordprocessingml.template</value></prop>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Office Open XML Text Template</value></prop>
-+ <prop oor:name="UIName">
-+ <value>Office Open XML Text Template</value>
-+ </prop>
-+ <prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
-+ </node>
-diff --git oox/inc/oox/core/filterbase.hxx oox/inc/oox/core/filterbase.hxx
-index a4edef5..47373a5 100644
---- oox/inc/oox/core/filterbase.hxx
-+++ oox/inc/oox/core/filterbase.hxx
-@@ -75,6 +75,12 @@ namespace core {
-
- // ============================================================================
-
-+enum OoxmlVersion
-+{
-+ ECMA_DIALECT,
-+ ISOIEC_29500_2008
-+};
-+
- struct FilterBaseImpl;
-
- typedef ::cppu::WeakImplHelper5<
-@@ -98,6 +104,8 @@ public:
- /** Returns true, if filter is an export filter. */
- bool isExportFilter() const;
-
-+ OoxmlVersion getVersion( );
-+
- /** Derived classes implement import of the entire document. */
- virtual bool importDocument() = 0;
-
-diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx
-index eb4b31d..ed85c49 100755
---- oox/source/core/filterbase.cxx
-+++ oox/source/core/filterbase.cxx
-@@ -27,6 +27,7 @@
-
- #include "oox/core/filterbase.hxx"
- #include <set>
-+#include <com/sun/star/container/XNameAccess.hpp>
- #include <com/sun/star/frame/XModel.hpp>
- #include <com/sun/star/task/XStatusIndicator.hpp>
- #include <com/sun/star/task/XInteractionHandler.hpp>
-@@ -63,6 +64,7 @@ using ::com::sun::star::io::XStream;
- using ::com::sun::star::task::XStatusIndicator;
- using ::com::sun::star::task::XInteractionHandler;
- using ::com::sun::star::graphic::XGraphic;
-+using ::com::sun::star::container::XNameAccess;
- using ::comphelper::MediaDescriptor;
- using ::comphelper::SequenceAsHashMap;
- using ::oox::ole::OleObjectHelper;
-@@ -140,6 +142,7 @@ struct FilterBaseImpl
- MediaDescriptor maMediaDesc;
- OUString maFileUrl;
- StorageRef mxStorage;
-+ OoxmlVersion meVersion;
-
- GraphicHelperRef mxGraphicHelper; /// Graphic and graphic object handling.
- ModelObjHelperRef mxModelObjHelper; /// Tables to create new named drawing objects.
-@@ -168,6 +171,7 @@ struct FilterBaseImpl
-
- FilterBaseImpl::FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
- meDirection( FILTERDIRECTION_UNKNOWN ),
-+ meVersion( ECMA_DIALECT ),
- mxGlobalFactory( rxGlobalFactory )
- {
- OSL_ENSURE( mxGlobalFactory.is(), "FilterBaseImpl::FilterBaseImpl - missing service factory" );
-@@ -235,6 +239,11 @@ bool FilterBase::isExportFilter() const
- return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
- }
-
-+OoxmlVersion FilterBase::getVersion( )
-+{
-+ return mxImpl->meVersion;
-+}
-+
- // ----------------------------------------------------------------------------
-
- Any FilterBase::getArgument( const OUString& rArgName ) const
-@@ -582,6 +591,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
- mxImpl->mxTargetFrame = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_FRAME(), Reference< XFrame >() );
- mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
- mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
-+
-+ // Check for ISO OOXML
-+ OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() );
-+ try
-+ {
-+ Reference< XNameAccess > xFilters( getGlobalFactory()->createInstance(
-+ CREATE_OUSTRING( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY_THROW );
-+ Any aValues = xFilters->getByName( sFilterName );
-+ Sequence<PropertyValue > aPropSeq;
-+ aValues >>= aPropSeq;
-+ SequenceAsHashMap aProps( aPropSeq );
-+
-+ sal_Int32 nVersion = aProps.getUnpackedValueOrDefault( CREATE_OUSTRING( "FileFormatVersion" ), sal_Int32( 0 ) );
-+ mxImpl->meVersion = OoxmlVersion( nVersion );
-+ }
-+ catch ( Exception& )
-+ {
-+ // Not ISO OOXML
-+ }
- }
-
- GraphicHelper* FilterBase::implCreateGraphicHelper() const
---
-1.7.0.1
-
diff --git a/patches/dev300/ooxml-sc-brk.diff b/patches/dev300/ooxml-sc-brk.diff
deleted file mode 100644
index 7eebdab..0000000
--- a/patches/dev300/ooxml-sc-brk.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- oox/source/xls/worksheetfragment.cxx 2010-07-16 21:21:27.000000000 +0530
-+++ oox/source/xls/worksheetfragment.cxx 2010-07-19 14:46:13.000000000 +0530
-@@ -570,8 +570,8 @@ void OoxWorksheetFragment::importBrk( co
- {
- PageBreakModel aModel;
- aModel.mnColRow = rAttribs.getInteger( XML_id, 0 );
-- aModel.mnMin = rAttribs.getInteger( XML_id, 0 );
-- aModel.mnMax = rAttribs.getInteger( XML_id, 0 );
-+ aModel.mnMin = rAttribs.getInteger( XML_min, aModel.mnColRow );
-+ aModel.mnMax = rAttribs.getInteger( XML_max, aModel.mnColRow );
- aModel.mbManual = rAttribs.getBool( XML_man, false );
- setPageBreak( aModel, bRowBreak );
- }
diff --git a/patches/dev300/ooxml-sc-docpropsimp.diff b/patches/dev300/ooxml-sc-docpropsimp.diff
deleted file mode 100644
index cbf004f..0000000
--- a/patches/dev300/ooxml-sc-docpropsimp.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- oox/inc/oox/core/xmlfilterbase.hxx 2010-05-11 19:14:26.000000000 +0530
-+++ oox/inc/oox/core/xmlfilterbase.hxx 2010-07-14 13:40:19.000000000 +0530
-@@ -224,6 +224,8 @@ public:
- @return *this
- */
- XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties );
-+
-+ void importDocumentProperties() throw();
-
- protected:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
---- oox/source/core/xmlfilterbase.cxx 2010-05-11 19:14:26.000000000 +0530
-+++ oox/source/core/xmlfilterbase.cxx 2010-07-14 13:40:30.000000000 +0530
-@@ -80,6 +80,22 @@ using ::sax_fastparser::FastSerializerHe
- using ::sax_fastparser::FastSerializerHelper;
- using ::sax_fastparser::FSHelperPtr;
-
-+
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-+#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
-+#include <com/sun/star/beans/XPropertySet.hpp>
-+#include <comphelper/processfactory.hxx>
-+#include <comphelper/mediadescriptor.hxx>
-+#include <oox/core/filterdetect.hxx>
-+#include <comphelper/storagehelper.hxx>
-+
-+using ::com::sun::star::uno::XComponentContext;
-+using ::com::sun::star::document::XOOXMLDocumentPropertiesImporter;
-+using ::com::sun::star::document::XDocumentPropertiesSupplier;
-+using ::com::sun::star::beans::XPropertySet;
-+using ::com::sun::star::lang::XComponent;
-+
-+
- namespace oox {
- namespace core {
-
-@@ -114,6 +130,22 @@ XmlFilterBaseImpl::XmlFilterBaseImpl() :
- }
-
- // ============================================================================
-+static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiServiceFactory > aFactory)
-+{
-+ Reference< XComponentContext > xContext;
-+ try
-+ {
-+ Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY );
-+ if( xFactProp.is() )
-+ xFactProp->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xContext;
-+ }
-+ catch( Exception& )
-+ {}
-+
-+ return xContext;
-+}
-+
-+// ============================================================================
-
- XmlFilterBase::XmlFilterBase( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
- FilterBase( rxGlobalFactory ),
-@@ -187,6 +219,25 @@ XmlFilterBase::~XmlFilterBase()
-
- // ----------------------------------------------------------------------------
-
-+void XmlFilterBase::importDocumentProperties() throw()
-+{
-+ Reference< XMultiServiceFactory > xFactory( getGlobalFactory(), UNO_QUERY );
-+ MediaDescriptor aMediaDesc( getMediaDescriptor() );
-+ Reference< XInputStream > xInputStream;
-+ ::oox::core::FilterDetect aDetector( xFactory );
-+ xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
-+ Reference< XComponent > xModel( getModel(), UNO_QUERY );
-+ Reference< XComponentContext > xContext = lcl_getComponentContext(getGlobalFactory());
-+ Reference< XStorage > xDocumentStorage (
-+ ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( OFOPXML_STORAGE_FORMAT_STRING, xInputStream ) );
-+ Reference< XInterface > xTemp = xContext->getServiceManager()->createInstanceWithContext(
-+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OOXMLDocumentPropertiesImporter")),
-+ xContext);
-+ Reference< XOOXMLDocumentPropertiesImporter > xImporter( xTemp, UNO_QUERY );
-+ Reference< XDocumentPropertiesSupplier > xPropSupplier( xModel, UNO_QUERY);
-+ xImporter->importProperties( xDocumentStorage, xPropSupplier->getDocumentProperties() );
-+}
-+
- OUString XmlFilterBase::getFragmentPathFromFirstType( const OUString& rType )
- {
- // importRelations() caches the relations map for subsequence calls
diff --git a/patches/dev300/ooxml-sc-internal-hlink-export.diff b/patches/dev300/ooxml-sc-internal-hlink-export.diff
deleted file mode 100644
index d50f70b..0000000
--- a/patches/dev300/ooxml-sc-internal-hlink-export.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- sc/source/filter/excel/xecontent.cxx.old 2010-09-01 11:41:13.000000000 +0200
-+++ sc/source/filter/excel/xecontent.cxx 2010-09-01 11:32:53.000000000 +0200
-@@ -463,7 +463,16 @@
- else if( rUrl.GetChar( 0 ) == '#' ) // hack for #89066#
- {
- String aTextMark( rUrl.Copy( 1 ) );
-- aTextMark.SearchAndReplace( '.', '!' );
-+
-+ xub_StrLen nSepPos = aTextMark.SearchAndReplace( '.', '!' );
-+ String aSheetName( aTextMark.Copy(0, nSepPos));
-+
-+ if ( aSheetName.Search(' ') != STRING_NOTFOUND && aSheetName.GetChar(0) != '\'')
-+ {
-+ aTextMark.Insert('\'', nSepPos);
-+ aTextMark.Insert('\'', 0);
-+ }
-+
- mxTextMark.reset( new XclExpString( aTextMark, EXC_STR_FORCEUNICODE, 255 ) );
- }
-
-@@ -540,13 +549,15 @@
-
- void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
- {
-- OUString sId = rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(),
-+ OUString sId = msTarget.getLength() ? rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(),
- XclXmlUtils::ToOUString( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" ),
- msTarget,
-- XclXmlUtils::ToOUString( "External" ) );
-+ XclXmlUtils::ToOUString( "External" ) ) : OUString();
- rStrm.GetCurrentStream()->singleElement( XML_hyperlink,
- XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(),
-- FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
-+ FSNS( XML_r, XML_id ), sId.getLength()
-+ ? XclXmlUtils::ToOString( sId ).getStr()
-+ : NULL,
- XML_location, mxTextMark.get() != NULL
- ? XclXmlUtils::ToOString( *mxTextMark ).getStr()
- : NULL,
diff --git a/patches/dev300/ooxml-sc-page-date-imp.diff b/patches/dev300/ooxml-sc-page-date-imp.diff
deleted file mode 100644
index ecdc2b0..0000000
--- a/patches/dev300/ooxml-sc-page-date-imp.diff
+++ /dev/null
@@ -1,174 +0,0 @@
---- oox/util/makefile.mk 2010-06-03 03:22:23.000000000 +0530
-+++ oox/util/makefile.mk 2010-07-16 13:39:27.000000000 +0530
-@@ -78,6 +78,7 @@ SHL1STDLIBS= \
- $(SVLLIB) \
- $(MSFILTERLIB) \
- $(UNOTOOLSLIB) \
-+ $(XMLOFFLIB) \
- $(TOOLSLIB)
-
- # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
---- oox/inc/oox/xls/pagesettings.hxx 2010-06-03 03:22:23.000000000 +0530
-+++ oox/inc/oox/xls/pagesettings.hxx 2010-07-15 17:18:24.000000000 +0530
-@@ -58,6 +58,8 @@ struct PageSettingsModel
- double mfHeaderMargin; /// Margin between top edge of page and begin of header.
- double mfFooterMargin; /// Margin between end of footer and bottom edge of page.
- sal_Int32 mnPaperSize; /// Paper size (enumeration).
-+ sal_Int32 mnPaperWidth; /// Paper width in twips
-+ sal_Int32 mnPaperHeight; /// Paper height in twips
- sal_Int32 mnCopies; /// Number of copies to print.
- sal_Int32 mnScale; /// Page scale (zoom in percent).
- sal_Int32 mnFirstPage; /// First page number.
---- oox/source/xls/pagesettings.cxx 2010-06-03 03:22:23.000000000 +0530
-+++ oox/source/xls/pagesettings.cxx 2010-07-16 19:52:02.000000000 +0530
-@@ -49,6 +49,8 @@
- #include "oox/xls/excelhandlers.hxx"
- #include "oox/xls/stylesbuffer.hxx"
- #include "oox/xls/unitconverter.hxx"
-+#include "tools/mapunit.hxx"
-+#include "xmloff/xmluconv.hxx"
-
- using ::rtl::OString;
- using ::rtl::OStringBuffer;
-@@ -129,6 +131,8 @@ PageSettingsModel::PageSettingsModel() :
- mfHeaderMargin( OOX_MARGIN_DEFAULT_HF ),
- mfFooterMargin( OOX_MARGIN_DEFAULT_HF ),
- mnPaperSize( 1 ),
-+ mnPaperWidth( 0 ),
-+ mnPaperHeight( 0 ),
- mnCopies( 1 ),
- mnScale( 100 ),
- mnFirstPage( 1 ),
-@@ -187,8 +191,13 @@ void PageSettings::importPageMargins( co
-
- void PageSettings::importPageSetup( const Relations& rRelations, const AttributeList& rAttribs )
- {
-+ OUString aStr;
- maModel.maBinSettPath = rRelations.getFragmentPathFromRelId( rAttribs.getString( R_TOKEN( id ), OUString() ) );
- maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 );
-+ aStr = rAttribs.getString ( XML_paperWidth, OUString() );
-+ SvXMLUnitConverter::convertMeasure( maModel.mnPaperWidth, aStr, MAP_100TH_MM );
-+ aStr = rAttribs.getString ( XML_paperHeight, OUString() );
-+ SvXMLUnitConverter::convertMeasure( maModel.mnPaperHeight, aStr, MAP_100TH_MM );
- maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 );
- maModel.mnScale = rAttribs.getInteger( XML_scale, 100 );
- maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 );
-@@ -208,8 +217,13 @@ void PageSettings::importPageSetup( cons
-
- void PageSettings::importChartPageSetup( const Relations& rRelations, const AttributeList& rAttribs )
- {
-+ OUString aStr;
- maModel.maBinSettPath = rRelations.getFragmentPathFromRelId( rAttribs.getString( R_TOKEN( id ), OUString() ) );
- maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 );
-+ aStr = rAttribs.getString ( XML_paperWidth, OUString() );
-+ SvXMLUnitConverter::convertMeasure( maModel.mnPaperWidth, aStr, MAP_100TH_MM );
-+ aStr = rAttribs.getString ( XML_paperHeight, OUString() );
-+ SvXMLUnitConverter::convertMeasure( maModel.mnPaperHeight, aStr, MAP_100TH_MM );
- maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 );
- maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 );
- maModel.mnHorPrintRes = rAttribs.getInteger( XML_horizontalDpi, 600 );
-@@ -1141,13 +1155,29 @@ void PageSettingsConverter::writePageSet
- bLandscape = bChartSheet;
-
- // paper size
-- if( rModel.mbValidSettings && (0 < rModel.mnPaperSize) && (rModel.mnPaperSize < static_cast< sal_Int32 >( STATIC_ARRAY_SIZE( spPaperSizeTable ) )) )
-+ if( !rModel.mbValidSettings )
- {
-- const ApiPaperSize& rPaperSize = spPaperSizeTable[ rModel.mnPaperSize ];
-- Size aSize( rPaperSize.mnWidth, rPaperSize.mnHeight );
-- if( bLandscape )
-- ::std::swap( aSize.Width, aSize.Height );
-- rPropSet.setProperty( PROP_Size, aSize );
-+ Size aSize;
-+ bool bValid = false;
-+
-+ if( (0 < rModel.mnPaperSize) && (rModel.mnPaperSize < static_cast< sal_Int32 >( STATIC_ARRAY_SIZE( spPaperSizeTable ) )) )
-+ {
-+ const ApiPaperSize& rPaperSize = spPaperSizeTable[ rModel.mnPaperSize ];
-+ aSize = Size( rPaperSize.mnWidth, rPaperSize.mnHeight );
-+ bValid = true;
-+ }
-+ if( rModel.mnPaperWidth > 0 && rModel.mnPaperHeight > 0 )
-+ {
-+ aSize = Size( rModel.mnPaperWidth, rModel.mnPaperHeight );
-+ bValid = true;
-+ }
-+
-+ if( bValid )
-+ {
-+ if( bLandscape )
-+ ::std::swap( aSize.Width, aSize.Height );
-+ rPropSet.setProperty( PROP_Size, aSize );
-+ }
- }
-
- // header/footer
---- oox/inc/oox/xls/workbooksettings.hxx 2010-05-11 19:09:37.000000000 +0530
-+++ oox/inc/oox/xls/workbooksettings.hxx 2010-07-14 16:07:06.000000000 +0530
-@@ -57,6 +57,7 @@ struct WorkbookSettingsModel
- sal_Int32 mnUpdateLinksMode; /// Specifies how external links are updated.
- sal_Int32 mnDefaultThemeVer; /// Default theme version.
- bool mbDateMode1904; /// True = null date is 1904-01-01.
-+ bool mbDateCompatibility; /// False = null date is 1899-12-30.
- bool mbSaveExtLinkValues; /// True = save cached cell values for external links.
-
- explicit WorkbookSettingsModel();
-@@ -148,7 +149,7 @@ public:
-
- private:
- /** Updates date mode and unit converter nulldate. */
-- void setDateMode( bool bDateMode1904 );
-+ void setDateMode( bool bDateMode1904, bool bDateCompatibility=true );
-
- private:
- FileSharingModel maFileSharing;
---- oox/source/xls/workbooksettings.cxx 2010-05-11 19:14:03.000000000 +0530
-+++ oox/source/xls/workbooksettings.cxx 2010-07-14 16:17:16.000000000 +0530
-@@ -35,6 +35,7 @@
- #include "oox/helper/propertyset.hxx"
- #include "oox/helper/recordinputstream.hxx"
- #include "oox/core/filterbase.hxx"
-+#include "oox/core/xmlfilterbase.hxx"
- #include "oox/xls/biffinputstream.hxx"
- #include "oox/xls/unitconverter.hxx"
-
-@@ -136,7 +141,7 @@ void WorkbookSettings::importWorkbookPr(
- maBookSettings.mnUpdateLinksMode = rAttribs.getToken( XML_updateLinks, XML_userSet );
- maBookSettings.mnDefaultThemeVer = rAttribs.getInteger( XML_defaultThemeVersion, -1 );
- maBookSettings.mbSaveExtLinkValues = rAttribs.getBool( XML_saveExternalLinkValues, true );
-- setDateMode( rAttribs.getBool( XML_date1904, false ) );
-+ setDateMode( rAttribs.getBool( XML_date1904, false ), rAttribs.getBool( XML_dateCompatibility, true ) );
- }
-
- void WorkbookSettings::importCalcPr( const AttributeList& rAttribs )
-@@ -341,13 +346,27 @@ sal_Int16 WorkbookSettings::getApiShowOb
-
- Date WorkbookSettings::getNullDate() const
- {
-- static const Date saDate1900( 30, 12, 1899 ), saDate1904( 1, 1, 1904 );
-+ static const Date saDate1900 ( 30, 12, 1899 );
-+ static const Date saDate1904 ( 1, 1, 1904 );
-+ static const Date saDateBackCompatibility1900( 31, 12, 1899 );
-+
-+ if( getOoxFilter().getVersion() == oox::core::ISOIEC_29500_2008 )
-+ {
-+ if( !maBookSettings.mbDateCompatibility )
-+ return saDate1900;
-+
-+ return maBookSettings.mbDateMode1904 ? saDate1904 :
-+ saDateBackCompatibility1900;
-+ }
-+
- return maBookSettings.mbDateMode1904 ? saDate1904 : saDate1900;
- }
-
--void WorkbookSettings::setDateMode( bool bDateMode1904 )
-+void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility )
- {
-- maBookSettings.mbDateMode1904 = bDateMode1904;
-+ maBookSettings.mbDateMode1904 = bDateMode1904;
-+ maBookSettings.mbDateCompatibility = bDateCompatibility;
-+
- getUnitConverter().finalizeNullDate( getNullDate() );
- }
-
diff --git a/patches/dev300/ooxml-sc-page-date.diff b/patches/dev300/ooxml-sc-page-date.diff
deleted file mode 100644
index 36f5077..0000000
--- a/patches/dev300/ooxml-sc-page-date.diff
+++ /dev/null
@@ -1,276 +0,0 @@
---- sc/source/filter/excel/excrecds.cxx 2010-06-16 16:47:12.000000000 +0530
-+++ sc/source/filter/excel/excrecds.cxx 2010-06-16 16:58:30.000000000 +0530
-@@ -360,6 +360,7 @@ Exc1904::Exc1904( ScDocument& rDoc )
- {
- Date* pDate = rDoc.GetFormatTable()->GetNullDate();
- bVal = pDate ? (*pDate == Date( 1, 1, 1904 )) : FALSE;
-+ bDateCompatibility = pDate ? !( *pDate == Date( 30, 12, 1899 )) : FALSE;
- }
-
-
-@@ -371,9 +372,21 @@ UINT16 Exc1904::GetNum( void ) const
-
- void Exc1904::SaveXml( XclExpXmlStream& rStrm )
- {
-- rStrm.WriteAttributes(
-+ bool bISOIEC = ( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 );
-+
-+ if( bISOIEC )
-+ {
-+ rStrm.WriteAttributes(
-+ XML_dateCompatibility, XclXmlUtils::ToPsz( bDateCompatibility ),
-+ FSEND );
-+ }
-+
-+ if( !bISOIEC || bDateCompatibility )
-+ {
-+ rStrm.WriteAttributes(
- XML_date1904, XclXmlUtils::ToPsz( bVal ),
- FSEND );
-+ }
- }
-
-
-diff -upr sc/source/filter/excel/xepage.cxx sc/source/filter/excel/xepage.cxx
---- sc/source/filter/excel/xepage.cxx 2010-06-16 16:47:12.000000000 +0530
-+++ sc/source/filter/excel/xepage.cxx 2010-06-16 17:01:37.000000000 +0530
-@@ -96,25 +96,37 @@ XclExpSetup::XclExpSetup( const XclPageD
-
- void XclExpSetup::SaveXml( XclExpXmlStream& rStrm )
- {
-- rStrm.GetCurrentStream()->singleElement( XML_pageSetup,
-- XML_paperSize, OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr(),
-- XML_scale, OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr(),
-- XML_firstPageNumber, OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr(),
-- XML_fitToWidth, OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr(),
-- XML_fitToHeight, OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr(),
-- XML_pageOrder, mrData.mbPrintInRows ? "overThenDown" : "downThenOver",
-- XML_orientation, mrData.mbPortrait ? "portrait" : "landscape", // OOXTODO: "default"?
-- XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ),
-- XML_blackAndWhite, XclXmlUtils::ToPsz( mrData.mbBlackWhite ),
-- XML_draft, XclXmlUtils::ToPsz( mrData.mbDraftQuality ),
-- XML_cellComments, mrData.mbPrintNotes ? "atEnd" : "none", // OOXTODO: "asDisplayed"?
-- XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ),
-- // OOXTODO: XML_errors, // == displayed|blank|dash|NA
-- XML_horizontalDpi, OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr(),
-- XML_verticalDpi, OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr(),
-- XML_copies, OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr(),
-- // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ),
-- FSEND );
-+ sax_fastparser::FastAttributeList* pAttrList=rStrm.GetCurrentStream()->createAttrList();
-+ if( rStrm.getVersion() != oox::core::ISOIEC_29500_2008 ||
-+ mrData.mnStrictPaperSize != EXC_PAPERSIZE_USER )
-+ {
-+ pAttrList->add( XML_paperSize, OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr() );
-+ }
-+ else
-+ {
-+ pAttrList->add( XML_paperWidth, OString::valueOf( (sal_Int32) mrData.mnPaperWidth ).concat(OString("mm")).getStr() );
-+ pAttrList->add( XML_paperHeight, OString::valueOf( (sal_Int32) mrData.mnPaperHeight ).concat(OString("mm")).getStr() );
-+ // pAttrList->add( XML_paperUnits, "mm" );
-+ }
-+ pAttrList->add( XML_scale, OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr() );
-+ pAttrList->add( XML_firstPageNumber, OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr() );
-+ pAttrList->add( XML_fitToWidth, OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr() );
-+ pAttrList->add( XML_fitToHeight, OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr() );
-+ pAttrList->add( XML_pageOrder, mrData.mbPrintInRows ? "overThenDown" : "downThenOver" );
-+ pAttrList->add( XML_orientation, mrData.mbPortrait ? "portrait" : "landscape" ); // OOXTODO: "default"?
-+ pAttrList->add( XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ) );
-+ pAttrList->add( XML_blackAndWhite, XclXmlUtils::ToPsz( mrData.mbBlackWhite ) );
-+ pAttrList->add( XML_draft, XclXmlUtils::ToPsz( mrData.mbDraftQuality ) );
-+ pAttrList->add( XML_cellComments, mrData.mbPrintNotes ? "atEnd" : "none" ); // OOXTODO: "asDisplayed"?
-+ pAttrList->add( XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ) );
-+ // OOXTODO: XML_errors, // == displayed|blank|dash|NA
-+ pAttrList->add( XML_horizontalDpi, OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr() );
-+ pAttrList->add( XML_verticalDpi, OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr() );
-+ pAttrList->add( XML_copies, OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr() );
-+ // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ),
-+
-+ ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > aAttrs(pAttrList);
-+ rStrm.GetCurrentStream()->singleElement( XML_pageSetup, aAttrs );
- }
-
- void XclExpSetup::WriteBody( XclExpStream& rStrm )
-diff -upr sc/source/filter/excel/xlpage.cxx sc/source/filter/excel/xlpage.cxx
---- sc/source/filter/excel/xlpage.cxx 2010-06-16 16:47:12.000000000 +0530
-+++ sc/source/filter/excel/xlpage.cxx 2010-06-16 17:05:16.000000000 +0530
-@@ -36,6 +36,7 @@
- #include <editeng/brshitem.hxx>
- #include "global.hxx"
- #include "xlconst.hxx"
-+#include <oox/core/xmlfilterbase.hxx>
-
- // Paper size =================================================================
-
-@@ -48,6 +49,8 @@ struct XclPaperSize
-
- #define IN2TWIPS( v ) ((long)((v) * EXC_TWIPS_PER_INCH + 0.5))
- #define MM2TWIPS( v ) ((long)((v) * EXC_TWIPS_PER_INCH / CM_PER_INCH / 10.0 + 0.5))
-+#define TWIPS2MM( v ) ((long)((v - 0.5) / EXC_TWIPS_PER_INCH * CM_PER_INCH * 10.0))
-+
-
- static const XclPaperSize pPaperSizeTable[] =
- {
-@@ -189,6 +192,8 @@ void XclPageData::SetDefaults()
- mfHdrLeftMargin = mfHdrRightMargin = XclTools::GetInchFromHmm( EXC_MARGIN_DEFAULT_HLR );
- mfFtrLeftMargin = mfFtrRightMargin = XclTools::GetInchFromHmm( EXC_MARGIN_DEFAULT_FLR );
- mnPaperSize = EXC_PAPERSIZE_DEFAULT;
-+ mnPaperWidth = 0;
-+ mnPaperHeight = 0;
- mnCopies = 1;
- mnStartPage = 0;
- mnScaling = 100;
-@@ -222,7 +227,7 @@ Size XclPageData::GetScPaperSize() const
- return aSize;
- }
-
--void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait )
-+void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait, bool bStrictSize )
- {
- mbPortrait = bPortrait;
- mnPaperSize = 0;
-@@ -230,6 +235,20 @@ void XclPageData::SetScPaperSize( const
- long nHeight = bPortrait ? rSize.Height() : rSize.Width();
- long nMaxWDiff = 80;
- long nMaxHDiff = 50;
-+
-+ mnPaperWidth = TWIPS2MM( nWidth );
-+ mnPaperHeight = TWIPS2MM( nHeight );
-+ if( bStrictSize )
-+ {
-+ nMaxWDiff = 5;
-+ nMaxHDiff = 5;
-+ mnStrictPaperSize = EXC_PAPERSIZE_USER;
-+ }
-+ else
-+ {
-+ mnPaperSize = 0;
-+ }
-+
- for( const XclPaperSize* pEntry = pPaperSizeTable; pEntry != STATIC_TABLE_END( pPaperSizeTable ); ++pEntry )
- {
- long nWDiff = Abs( pEntry->mnWidth - nWidth );
-@@ -237,11 +256,18 @@ void XclPageData::SetScPaperSize( const
- if( ((nWDiff <= nMaxWDiff) && (nHDiff < nMaxHDiff)) ||
- ((nWDiff < nMaxWDiff) && (nHDiff <= nMaxHDiff)) )
- {
-- mnPaperSize = static_cast< sal_uInt16 >( pEntry - pPaperSizeTable );
-+ sal_uInt16 nIndex = static_cast< sal_uInt16 >( pEntry - pPaperSizeTable );
-+ if( !bStrictSize )
-+ mnPaperSize = nIndex;
-+ else
-+ mnStrictPaperSize = mnPaperSize = nIndex;
-+
- nMaxWDiff = nWDiff;
- nMaxHDiff = nHDiff;
- }
- }
-+ if( !bStrictSize )
-+ SetScPaperSize( rSize, bPortrait, sal_True );
- }
-
- // ============================================================================
-diff -upr sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx
---- sc/source/filter/inc/excrecds.hxx 2010-06-16 16:47:12.000000000 +0530
-+++ sc/source/filter/inc/excrecds.hxx 2010-06-16 16:53:42.000000000 +0530
-@@ -286,6 +286,8 @@ public:
- virtual UINT16 GetNum( void ) const;
-
- virtual void SaveXml( XclExpXmlStream& rStrm );
-+private:
-+ BOOL bDateCompatibility;
- };
-
-
-diff -upr sc/source/filter/inc/xlpage.hxx sc/source/filter/inc/xlpage.hxx
---- sc/source/filter/inc/xlpage.hxx 2010-06-16 16:47:12.000000000 +0530
-+++ sc/source/filter/inc/xlpage.hxx 2010-06-16 16:52:20.000000000 +0530
-@@ -89,6 +89,7 @@ const sal_uInt16 EXC_SETUP_STARTPAGE
- const sal_uInt16 EXC_SETUP_NOTES_END = 0x0200;
-
- const sal_uInt16 EXC_PAPERSIZE_DEFAULT = 0;
-+const sal_uInt16 EXC_PAPERSIZE_USER = 0xFFFF;
-
- // ============================================================================
-
-@@ -118,6 +119,9 @@ struct XclPageData : ScfNoCopy
- double mfFtrLeftMargin; /// Left margin to footer.
- double mfFtrRightMargin; /// Right margin to footer.
- sal_uInt16 mnPaperSize; /// Index into paper size table.
-+ sal_uInt16 mnStrictPaperSize; /// Same as papersize - but for ooxml (considering stricter dimensions)
-+ sal_uInt16 mnPaperWidth; /// Paper Width in mm
-+ sal_uInt16 mnPaperHeight; /// Paper Height in mm
- sal_uInt16 mnCopies; /// Number of copies.
- sal_uInt16 mnStartPage; /// Start page number.
- sal_uInt16 mnScaling; /// Scaling in percent.
-@@ -147,7 +151,7 @@ struct XclPageData : ScfNoCopy
- /** Returns the real paper size (twips) from the paper size index and paper orientation. */
- Size GetScPaperSize() const;
- /** Sets the Excel paper size index and paper orientation from Calc paper size (twips). */
-- void SetScPaperSize( const Size& rSize, bool bPortrait );
-+ void SetScPaperSize( const Size& rSize, bool bPortrait, bool bStrict = sal_False );
- };
-
- // ============================================================================
---- oox/source/token/tokens.txt 2010-05-11 19:09:37.000000000 +0530
-+++ oox/source/token/tokens.txt 2010-06-04 19:55:41.000000000 +0530
-@@ -478,6 +478,7 @@ alg
- algIdExt
- algIdExtSource
- algn
-+algorithmName
- alias
- aliases
- aliceBlue
-@@ -1091,6 +1092,7 @@ char
- charRg
- charSpace
- character
-+characterSet
- characterSpacingControl
- characteristic
- charset
-@@ -1270,6 +1272,7 @@ confettiGrays
- confettiOutline
- confettiStreamers
- confettiWhite
-+conformance
- conn
- connDist
- connRout
-@@ -1576,6 +1579,7 @@ date
- date1904
- dateAx
- dateBetween
-+dateCompatibility
- dateEqual
- dateFormat
- dateGroupItem
-@@ -2495,6 +2499,7 @@ harsh
- hasCustomPrompt
- hash
- hashData
-+hashValue
- hc
- hd2
- hd4
-@@ -3700,8 +3705,11 @@ panose
- panose1
- papayaWhip
- paperClips
-+paperHeight
- paperSize
- paperSrc
-+paperUnits
-+paperWidth
- papyrus
- par
- parOf
-@@ -4277,6 +4285,7 @@ saka
- salmon
- salt
- saltData
-+saltValue
- sameClick
- sameDir
- sampData
diff --git a/patches/dev300/ooxml-sc-paneexport.diff b/patches/dev300/ooxml-sc-paneexport.diff
deleted file mode 100644
index 85bbc0d..0000000
--- a/patches/dev300/ooxml-sc-paneexport.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- sc/source/filter/excel/xestream.cxx 2010-06-03 15:44:46.000000000 +0530
-+++ sc/source/filter/excel/xestream.cxx 2010-07-06 19:10:49.000000000 +0530
-@@ -47,6 +47,7 @@
- #include "compiler.hxx"
-
- #include <../../ui/inc/docsh.hxx>
-+#include <../../ui/inc/viewdata.hxx>
- #include <excdoc.hxx>
-
- #include <oox/core/tokens.hxx>
-@@ -1146,6 +1148,10 @@ bool XclExpXmlStream::exportDocument() t
- pShell->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
- }
- #endif
-+ // Get the viewsettings before processing
-+ if( pShell->GetViewData() )
-+ pShell->GetViewData()->WriteExtOptions( mpRoot->GetExtDocOptions() );
-+
- OUString const workbook = CREATE_OUSTRING( "xl/workbook.xml" );
- PushStream( CreateOutputStream( workbook, workbook,
- Reference <XOutputStream>(),
diff --git a/patches/dev300/ooxml-sc-showdropdown-fix.diff b/patches/dev300/ooxml-sc-showdropdown-fix.diff
deleted file mode 100644
index d24f59e..0000000
--- a/patches/dev300/ooxml-sc-showdropdown-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- sc/source/filter/excel/xecontent.cxx 2010-07-16 21:20:19.000000000 +0530
-+++ sc/source/filter/excel/xecontent.cxx 2010-07-23 15:49:41.000000000 +0530
-@@ -1169,7 +1169,8 @@ void XclExpDV::SaveXml( XclExpXmlStream&
- XML_operator, lcl_GetOperatorType( mnFlags ),
- XML_prompt, XESTRING_TO_PSZ( maPromptText ),
- XML_promptTitle, XESTRING_TO_PSZ( maPromptTitle ),
-- XML_showDropDown, XclXmlUtils::ToPsz( ! ::get_flag( mnFlags, EXC_DV_SUPPRESSDROPDOWN ) ),
-+ // showDropDown should have been showNoDropDown - check oox/xlsx import for details
-+ XML_showDropDown, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_DV_SUPPRESSDROPDOWN ) ),
- XML_showErrorMessage, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_DV_SHOWERROR ) ),
- XML_showInputMessage, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_DV_SHOWPROMPT ) ),
- XML_sqref, XclXmlUtils::ToOString( maScRanges ).getStr(),
diff --git a/patches/dev300/ooxml-schema.diff b/patches/dev300/ooxml-schema.diff
deleted file mode 100644
index b667c05..0000000
--- a/patches/dev300/ooxml-schema.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- oox/source/core/xmlfilterbase.cxx 2010-05-11 19:14:26.000000000 +0530
-+++ oox/source/core/xmlfilterbase.cxx 2010-06-15 12:49:44.000000000 +0530
-@@ -485,9 +489,13 @@ writeElement( FSHelperPtr pDoc, sal_Int3
- static void
- writeCoreProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProperties )
- {
-- rSelf.addRelation(
-- CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" ),
-- CREATE_OUSTRING( "docProps/core.xml" ) );
-+ OUString sValue;
-+ if( rSelf.getVersion() == oox::core::ISOIEC_29500_2008 )
-+ sValue = CREATE_OUSTRING( "http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties" );
-+ else
-+ sValue = CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" );
-+
-+ rSelf.addRelation( sValue, CREATE_OUSTRING( "docProps/core.xml" ) );
- FSHelperPtr pCoreProps = rSelf.openFragmentStreamWithSerializer(
- CREATE_OUSTRING( "docProps/core.xml" ),
- CREATE_OUSTRING( "application/vnd.openxmlformats-package.core-properties+xml" ) );
diff --git a/patches/dev300/ooxml-sw-fix-2010-import-crash.diff b/patches/dev300/ooxml-sw-fix-2010-import-crash.diff
deleted file mode 100644
index b994614..0000000
--- a/patches/dev300/ooxml-sw-fix-2010-import-crash.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- writerfilter/source/filter/ImportFilter.cxx.old 2010-06-18 10:31:57.000000000 +0200
-+++ writerfilter/source/filter/ImportFilter.cxx 2010-07-13 17:03:08.000000000 +0200
-@@ -98,7 +98,9 @@
-
- writerfilter::dmapper::SourceDocumentType eType =
- (m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007" ) ) ||
-- m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007_Template" ) )) ?
-+ m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007_Template" ) ) ||
-+ m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML" ) ) ||
-+ m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML_Text_Template" ) )) ?
- writerfilter::dmapper::DOCUMENT_OOXML : writerfilter::dmapper::DOCUMENT_DOC;
- writerfilter::Stream::Pointer_t pStream(new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, eType));
- //create the tokenizer and domain mapper
diff --git a/patches/dev300/pptx-autoplay-fix.diff b/patches/dev300/pptx-autoplay-fix.diff
deleted file mode 100644
index cb382f9..0000000
--- a/patches/dev300/pptx-autoplay-fix.diff
+++ /dev/null
@@ -1,491 +0,0 @@
----
- filter/source/config/cache/constant.hxx | 2 +
- filter/source/config/cache/filtercache.cxx | 6 +++
- filter/source/config/fragments/fcfg_impress.mk | 4 ++
- .../filters/MS_PowerPoint_97_AutoPlay.xcu | 13 +++++++
- .../impress_MS_PowerPoint_2007_XML_AutoPlay.xcu | 10 ++++++
- .../types/MS_PowerPoint_2007_XML_AutoPlay.xcu | 10 ++++++
- .../fragments/types/impress_MS_PowerPoint_97.xcu | 2 +-
- .../types/impress_MS_PowerPoint_97_AutoPlay.xcu | 12 +++++++
- framework/inc/filterflags.h | 3 ++
- framework/source/constant/filter.cxx | 2 +
- framework/source/inc/constant/filter.hxx | 2 +
- oox/source/core/filterdetect.cxx | 4 ++
- sd/inc/strmname.h | 1 +
- sd/source/ui/docshell/docshel4.cxx | 35 +++++++++++++++++++-
- sd/source/ui/inc/DrawDocShell.hxx | 1 +
- sd/source/ui/slideshow/slideshow.cxx | 25 ++++++++++++++
- sd/source/ui/slideshow/slideshowimpl.cxx | 3 +-
- sd/source/ui/unoidl/sddetect.cxx | 8 +++--
- sd/source/ui/view/ViewShellBase.cxx | 1 -
- sfx2/inc/sfx2/docfilt.hxx | 1 +
- sfx2/inc/sfx2/objsh.hxx | 2 +-
- sfx2/source/doc/objstor.cxx | 3 ++
- 22 files changed, 142 insertions(+), 8 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
- create mode 100644 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
- create mode 100644 filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
- create mode 100644 filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
-
-diff --git filter/source/config/cache/constant.hxx filter/source/config/cache/constant.hxx
-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_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_ENCRYPTION 0x01000000 // 16777216
- #define FLAGVAL_PASSWORDTOMODIFY 0x02000000 // 33554432
- #define FLAGVAL_PREFERRED 0x10000000 // 268435456
-+#define FLAGVAL_STARTPRESENTATION 0x20000000 // 268435456
- #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_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 );
- if ((nFlags & FLAGVAL_SILENTEXPORT ) == FLAGVAL_SILENTEXPORT ) lFlagNames.push_back(FLAGNAME_SILENTEXPORT );
- if ((nFlags & FLAGVAL_SUPPORTSSELECTION) == FLAGVAL_SUPPORTSSELECTION) lFlagNames.push_back(FLAGNAME_SUPPORTSSELECTION);
-@@ -2302,6 +2303,11 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence<
- nField |= FLAGVAL_PREFERRED;
- continue;
- }
-+ if (pNames[i].equals(FLAGNAME_STARTPRESENTATION))
-+ {
-+ nField |= FLAGVAL_STARTPRESENTATION;
-+ continue;
-+ }
- if (pNames[i].equals(FLAGNAME_READONLY))
- {
- nField |= FLAGVAL_READONLY;
-diff --git filter/source/config/fragments/fcfg_impress.mk filter/source/config/fragments/fcfg_impress.mk
-index f5c1c7d..2e354c8 100644
---- filter/source/config/fragments/fcfg_impress.mk
-+++ filter/source/config/fragments/fcfg_impress.mk
-@@ -5,6 +5,7 @@ all_fragments+=impress
- T4_IMPRESS = \
- draw_StarOffice_XML_Draw \
- impress_MS_PowerPoint_97 \
-+ impress_MS_PowerPoint_97_AutoPlay \
- impress_MS_PowerPoint_97_Vorlage \
- impress_StarOffice_XML_Impress \
- impress_StarOffice_XML_Impress_Template \
-@@ -14,12 +15,14 @@ T4_IMPRESS = \
- impress8_template\
- draw8\
- MS_PowerPoint_2007_XML\
-+ MS_PowerPoint_2007_XML_AutoPlay\
- MS_PowerPoint_2007_XML_Template
-
- # -----------------------------------------------
- # count = 20
- F4_IMPRESS = \
- MS_PowerPoint_97 \
-+ MS_PowerPoint_97_AutoPlay \
- MS_PowerPoint_97_Vorlage \
- impress_StarOffice_XML_Draw \
- StarOffice_XML__Impress_ \
-@@ -30,6 +33,7 @@ F4_IMPRESS = \
- impress8_template\
- impress8_draw\
- impress_MS_PowerPoint_2007_XML\
-+ impress_MS_PowerPoint_2007_XML_AutoPlay\
- impress_MS_PowerPoint_2007_XML_Template
-
- # -----------------------------------------------
-diff --git filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
-new file mode 100644
-index 0000000..c19eeb4
---- /dev/null
-+++ filter/source/config/fragments/filters/MS_PowerPoint_97_AutoPlay.xcu
-@@ -0,0 +1,13 @@
-+ <node oor:name="MS PowerPoint 97 AutoPlay" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN STARTPRESENTATION</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"/>
-+ <prop oor:name="UserData"><value>sdfilt</value></prop>
-+ <prop oor:name="UIName">
-+ <value xml:lang="x-default">Microsoft PowerPoint 97/2000/XP</value>
-+ </prop>
-+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
-+ <prop oor:name="Type"><value>impress_MS_PowerPoint_97_AutoPlay</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
-new file mode 100644
-index 0000000..7a2e17f
---- /dev/null
-+++ filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
-@@ -0,0 +1,10 @@
-+<node oor:name="Impress MS PowerPoint 2007 XML AutoPlay" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
-+ <prop oor:name="UserData"/>
-+ <prop oor:name="FileFormatVersion"/>
-+ <prop oor:name="Type"><value>MS PowerPoint 2007 XML AutoPlay</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-+</node>
-diff --git filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
-new file mode 100644
-index 0000000..681b7b5
---- /dev/null
-+++ filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu
-@@ -0,0 +1,10 @@
-+<node oor:name="MS PowerPoint 2007 XML AutoPlay" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>ppsx</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML AutoPlay</value></prop>
-+ <prop oor:name="UIName"><value xml:lang="x-default">Microsoft PowerPoint 2007 XML</value></prop>
-+ <prop oor:name="ClipboardFormat"/>
-+</node>
-diff --git filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
-index 3584127..c7a17a9 100644
---- filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
-+++ filter/source/config/fragments/types/impress_MS_PowerPoint_97.xcu
-@@ -1,7 +1,7 @@
- <node oor:name="impress_MS_PowerPoint_97" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
- <prop oor:name="URLPattern"/>
-- <prop oor:name="Extensions"><value>ppt pps</value></prop>
-+ <prop oor:name="Extensions"><value>ppt</value></prop>
- <prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"><value>MS PowerPoint 97</value></prop>
-diff --git filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
-new file mode 100644
-index 0000000..7cf518c
---- /dev/null
-+++ filter/source/config/fragments/types/impress_MS_PowerPoint_97_AutoPlay.xcu
-@@ -0,0 +1,12 @@
-+ <node oor:name="impress_MS_PowerPoint_97_AutoPlay" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>pps</value></prop>
-+ <prop oor:name="MediaType"><value>application/vnd.ms-powerpoint</value></prop>
-+ <prop oor:name="Preferred"><value>false</value></prop>
-+ <prop oor:name="PreferredFilter"><value>MS PowerPoint 97 AutoPlay</value></prop>
-+ <prop oor:name="UIName">
-+ <value>Microsoft PowerPoint 97/2000/XP</value>
-+ </prop>
-+ <prop oor:name="ClipboardFormat"/>
-+ </node>
-# FIXME ooo330-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 ooo330-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
-+++ oox/source/core/filterdetect.cxx
-@@ -203,6 +203,10 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r
- rContentType.equalsAscii( "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" ) )
- return CREATE_OUSTRING( "MS PowerPoint 2007 XML" );
-
-+ if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml" ) ||
-+ rContentType.equalsAscii( "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml" ) )
-+ return CREATE_OUSTRING( "MS PowerPoint 2007 XML AutoPlay" );
-+
- if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ) ||
- rContentType.equalsAscii( "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" ) )
- return CREATE_OUSTRING( "MS PowerPoint 2007 XML Template" );
-diff --git sd/inc/strmname.h sd/inc/strmname.h
-index ed555b8..f4d717b 100644
---- sd/inc/strmname.h
-+++ sd/inc/strmname.h
-@@ -42,6 +42,7 @@ static const String pPreviewName( RTL_CONSTASCII_USTRINGPARAM( "StarDrawTemplate
- // PowerPoint-Filter
- static const String pFilterPowerPoint97( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97" ));
- static const String pFilterPowerPoint97Template( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97 Vorlage" ));
-+static const String pFilterPowerPoint97AutoPlay( RTL_CONSTASCII_USTRINGPARAM( "MS PowerPoint 97 AutoPlay" ));
-
- // XML content stream
- static const String pStarDrawXMLContent( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ));
-diff --git sd/source/ui/docshell/docshel4.cxx sd/source/ui/docshell/docshel4.cxx
-index 39ed73c..e6ded69 100755
---- sd/source/ui/docshell/docshel4.cxx
-+++ sd/source/ui/docshell/docshel4.cxx
-@@ -454,6 +454,37 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium )
-
- /*************************************************************************
- |*
-+|* ImportFrom: load from 3rd party format
-+|*
-+\************************************************************************/
-+
-+sal_Bool DrawDocShell::ImportFrom( SfxMedium &rMedium )
-+{
-+ const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium);
-+
-+ SfxItemSet* pSet = rMedium.GetItemSet();
-+ if( pSet )
-+ {
-+ if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&&
-+ ( (SfxBoolItem&) ( pSet->Get( SID_DOC_STARTPRESENTATION ) ) ).GetValue() )
-+ {
-+ mpDoc->SetStartWithPresentation( true );
-+
-+ // tell SFX to change viewshell when in preview mode
-+ if( IsPreview() )
-+ {
-+ SfxItemSet *pMediumSet = GetMedium()->GetItemSet();
-+ if( pMediumSet )
-+ pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 1 ) );
-+ }
-+ }
-+ }
-+
-+ return bRet;
-+}
-+
-+/*************************************************************************
-+|*
- |* ConvertFrom: aus Fremdformat laden
- |*
- \************************************************************************/
-@@ -484,7 +515,9 @@ BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium )
- }
- }
-
-- if( aFilterName == pFilterPowerPoint97 || aFilterName == pFilterPowerPoint97Template)
-+ if( aFilterName == pFilterPowerPoint97
-+ || aFilterName == pFilterPowerPoint97Template
-+ || aFilterName == pFilterPowerPoint97AutoPlay)
- {
- mpDoc->StopWorkStartupDelay();
- bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();
-diff --git sd/source/ui/inc/DrawDocShell.hxx sd/source/ui/inc/DrawDocShell.hxx
-index 2709340..23b565a 100755
---- sd/source/ui/inc/DrawDocShell.hxx
-+++ sd/source/ui/inc/DrawDocShell.hxx
-@@ -88,6 +88,7 @@ public:
- virtual void Activate( BOOL bMDI );
- virtual void Deactivate( BOOL bMDI );
- virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-+ virtual sal_Bool ImportFrom( SfxMedium &rMedium );
- virtual BOOL ConvertFrom( SfxMedium &rMedium );
- virtual BOOL Save();
- virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium );
-diff --git sd/source/ui/slideshow/slideshow.cxx sd/source/ui/slideshow/slideshow.cxx
-index d78e1b1..4e21359 100755
---- sd/source/ui/slideshow/slideshow.cxx
-+++ sd/source/ui/slideshow/slideshow.cxx
-@@ -33,6 +33,8 @@
- #include <com/sun/star/drawing/framework/XControllerManager.hpp>
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <comphelper/serviceinfohelper.hxx>
-+#include <com/sun/star/frame/XDispatchProvider.hpp>
-+#include <com/sun/star/util/URL.hpp>
-
- #include <cppuhelper/bootstrap.hxx>
-
-@@ -69,6 +71,7 @@ using ::com::sun::star::awt::XWindow;
- using namespace ::sd;
- using namespace ::cppu;
- using namespace ::vos;
-+using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::presentation;
- using namespace ::com::sun::star::drawing;
-@@ -775,6 +778,28 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
- if( pDrawViewShell )
- pDrawViewShell->SwitchPage( (USHORT)xController->getRestoreSlide() );
- }
-+
-+ if( pViewShell->GetDoc()->IsStartWithPresentation() )
-+ {
-+ pViewShell->GetDoc()->SetStartWithPresentation( false );
-+
-+ Reference<frame::XDispatchProvider> xProvider(pViewShell->GetViewShellBase().GetController()->getFrame(),
-+ UNO_QUERY);
-+ if( xProvider.is() )
-+ {
-+ util::URL aURL;
-+ aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseFrame");
-+
-+ uno::Reference< frame::XDispatch > xDispatch(
-+ xProvider->queryDispatch(
-+ aURL, ::rtl::OUString(), 0));
-+ if( xDispatch.is() )
-+ {
-+ xDispatch->dispatch(aURL,
-+ uno::Sequence< beans::PropertyValue >());
-+ }
-+ }
-+ }
- }
- }
- mpCurrentViewShellBase = 0;
-diff --git sd/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
-index 9e987ff..a287db2 100755
---- sd/source/ui/slideshow/slideshowimpl.cxx
-+++ sd/source/ui/slideshow/slideshowimpl.cxx
-@@ -3487,7 +3487,8 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException)
- if( mpShowWindow )
- {
- mpShowWindow->SetEndMode();
-- pause();
-+ if( !mpViewShell->GetDoc()->IsStartWithPresentation() )
-+ pause();
- }
- }
- }
-diff --git sd/source/ui/unoidl/sddetect.cxx sd/source/ui/unoidl/sddetect.cxx
-index a55b84e..f8168d6 100644
---- sd/source/ui/unoidl/sddetect.cxx
-+++ sd/source/ui/unoidl/sddetect.cxx
-@@ -354,10 +354,12 @@ SdFilterDetect::~SdFilterDetect()
- String aFileName(aMedium.GetName());
- aFileName.ToUpperAscii();
-
-- if( aFileName.SearchAscii( ".POT" ) == STRING_NOTFOUND )
-- pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
-- else
-+ if( aFileName.SearchAscii( ".POT" ) != STRING_NOTFOUND )
- pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template );
-+ else if( aFileName.SearchAscii( ".PPS" ) != STRING_NOTFOUND )
-+ pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97AutoPlay );
-+ else
-+ pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
- }
- }
- else
-diff --git sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/ViewShellBase.cxx
-index 15f7b26..c0a3ff6 100644
---- sd/source/ui/view/ViewShellBase.cxx
-+++ sd/source/ui/view/ViewShellBase.cxx
-@@ -487,7 +487,6 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
- {
- if( GetViewFrame() )
- {
-- GetDocument()->SetStartWithPresentation( false );
- GetViewFrame()->GetDispatcher()->Execute(
- SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON );
- }
-diff --git sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/docfilt.hxx
-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_PREFERED 0x10000000L
-+#define SFX_FILTER_STARTPRESENTATION 0x20000000L
-
- #define SFX_FILTER_VERSION_NONE 0
- #define SFX_FILTER_NOTINSTALLED SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
-diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
-index 4202177..ed0432a 100644
---- sfx2/inc/sfx2/objsh.hxx
-+++ sfx2/inc/sfx2/objsh.hxx
-@@ -353,7 +353,7 @@ public:
- sal_Bool SaveCompletedChildren( sal_Bool bSuccess );
-
- sal_Bool InsertFrom( SfxMedium &rMedium );
-- sal_Bool ImportFrom( SfxMedium &rMedium );
-+ virtual sal_Bool ImportFrom( SfxMedium &rMedium );
- sal_Bool ExportTo( SfxMedium &rMedium );
-
- // xmlsec05, check with SFX team
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index 24e6c30..3e0ed06 100644
---- sfx2/source/doc/objstor.cxx
-+++ sfx2/source/doc/objstor.cxx
-@@ -715,6 +715,9 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
- sal_uInt32 nError = HandleFilter( pMedium, this );
- if ( nError != ERRCODE_NONE )
- SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-+
-+ if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION)
-+ pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, TRUE) );
- }
-
- EnableSetModified( sal_False );
---
-1.7.0.1
-
diff --git a/patches/dev300/xlsx-shared-oox-calc-export-export-pivot-content.diff b/patches/dev300/xlsx-shared-oox-calc-export-export-pivot-content.diff
deleted file mode 100644
index 14a5913..0000000
--- a/patches/dev300/xlsx-shared-oox-calc-export-export-pivot-content.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2602c2c2ab3882a882ce8871d81973e5d5b524b4 Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke at gnu.org>
-Date: Mon, 27 Jul 2009 11:27:36 +0200
-Subject: [PATCH] OOXML: Disable pivot cache export. Fixes content-bit of n#505917.
-
- * Modified sc/source/filter/excel/xepivot.cxx
----
- sc/source/filter/excel/xepivot.cxx | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index 57409c1..217e01d 100644
---- sc/source/filter/excel/xepivot.cxx
-+++ sc/source/filter/excel/xepivot.cxx
-@@ -740,6 +740,8 @@ void XclExpPivotCache::Save( XclExpStream& rStrm )
- void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm )
- {
- DBG_ASSERT( mbValid, "XclExpPivotCache::Save - invalid pivot cache" );
-+#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream
-+ results in a broken .xlsx */
- sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream();
- OUString sId = OUStringBuffer()
- .appendAscii("rId")
-@@ -758,6 +760,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm )
- // create the pivot cache storage stream
- // OOXTODO: WriteCacheStream();
- rWorkbook->endElement( XML_pivotCache );
-+#endif /* XLSX_PIVOT_CACHE */
- }
-
- // private --------------------------------------------------------------------
-@@ -1844,12 +1847,15 @@ void XclExpPivotTableManager::WritePivotCaches( XclExpStream& rStrm )
-
- void XclExpPivotTableManager::WritePivotCachesXml( XclExpXmlStream& rStrm )
- {
-+#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream
-+ results in a broken .xlsx */
- if( maPCacheList.IsEmpty() )
- return;
- sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream();
- rWorkbook->startElement( XML_pivotCaches, FSEND );
- maPCacheList.SaveXml( rStrm );
- rWorkbook->endElement( XML_pivotCaches );
-+#endif /* XLSX_PIVOT_CACHE */
- }
-
- void XclExpPivotTableManager::WritePivotTables( XclExpStream& rStrm, SCTAB nScTab )
---
-1.6.0.rc1.49.g98a8
-
diff --git a/patches/dev300/xlsx-shared-oox-calc-export-sotstorage-init.diff b/patches/dev300/xlsx-shared-oox-calc-export-sotstorage-init.diff
deleted file mode 100644
index a255923..0000000
--- a/patches/dev300/xlsx-shared-oox-calc-export-sotstorage-init.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- sc/source/filter/excel/xestream.cxx.old 2010-03-03 17:00:07.000000000 +0100
-+++ sc/source/filter/excel/xestream.cxx 2010-03-03 17:00:08.000000000 +0100
-@@ -58,6 +58,10 @@
- #include <formula/grammar.hxx>
- #include <oox/export/drawingml.hxx>
-
-+#include <sfx2/docfile.hxx>
-+#include <sfx2/objsh.hxx>
-+#include <sfx2/app.hxx>
-+
- #define DEBUG_XL_ENCRYPTION 0
-
- using ::com::sun::star::beans::PropertyValue;
-@@ -1124,7 +1128,9 @@ bool XclExpXmlStream::exportDocument() t
- {
- ScDocShell* pShell = getDocShell();
- ScDocument* pDoc = pShell->GetDocument();
-- SotStorageRef rStorage = dynamic_cast <SotStorage*>( Reference<XStorage>( pShell->GetStorage() ).get() );
-+ SfxMedium* pMedium = pShell->GetMedium();
-+ SvStream* pMediumStream = pMedium->GetOutStream();
-+ SotStorageRef rStorage = new SotStorage( pMediumStream, false );
-
- XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, *pDoc, RTL_TEXTENCODING_DONTKNOW );
- aData.meOutput = EXC_OUTPUT_XML_2007;
diff --git a/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff b/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff
deleted file mode 100644
index 074a80b..0000000
--- a/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sc/source/filter/excel/xetable.cxx
-+++ sc/source/filter/excel/xetable.cxx
-@@ -933,7 +933,7 @@
-
- rWorksheet->startElement( XML_f,
- // OOXTODO: XML_t, ST_CellFormulaType
-- XML_aca, XclXmlUtils::ToPsz( mxTokArr->IsVolatile() || (mxAddRec.is() && mxAddRec->IsVolatile()) ),
-+ XML_aca, XclXmlUtils::ToPsz( (mxTokArr.is() && mxTokArr->IsVolatile()) || (mxAddRec.is() && mxAddRec->IsVolatile()) ),
- // OOXTODO: XML_ref, ST_Ref
- // OOXTODO: XML_dt2D, bool
- // OOXTODO: XML_dtr, bool
diff --git a/patches/dev300/xlsx-shared-xlsx-export-cell-style-max-builtin.diff b/patches/dev300/xlsx-shared-xlsx-export-cell-style-max-builtin.diff
deleted file mode 100644
index 5de5ff4..0000000
--- a/patches/dev300/xlsx-shared-xlsx-export-cell-style-max-builtin.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0d05955d4ef899fd310d41ae4134803abaa83d6b Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke at gnu.org>
-Date: Wed, 10 Jun 2009 14:59:58 +0200
-Subject: [PATCH] [OOXML]: calc export: respect CELL_STYLE_MAX_BUILTIN_ID=55. Fixes n#497563.
-
- * Modified sc/source/filter/excel/xestyle.cxx
----
- sc/source/filter/excel/xestyle.cxx | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx
-index d5c5499..bf49bef 100644
---- sc/source/filter/excel/xestyle.cxx
-+++ sc/source/filter/excel/xestyle.cxx
-@@ -2213,7 +2213,10 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
- rStrm.GetCurrentStream()->singleElement( XML_cellStyle,
- XML_name, sName.getStr(),
- XML_xfId, OString::valueOf( nXFId ).getStr(),
-- XML_builtinId, OString::valueOf( (sal_Int32) mnStyleId ).getStr(),
-+/* mso-excel 2007 complains when it finds builtinId >= 55, it is not
-+ * bothered by multiple 54 values. */
-+#define CELL_STYLE_MAX_BUILTIN_ID 55
-+ XML_builtinId, OString::valueOf( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(),
- // OOXTODO: XML_iLevel,
- // OOXTODO: XML_hidden,
- XML_customBuiltin, XclXmlUtils::ToPsz( ! IsBuiltIn() ),
---
-1.6.0.rc1.49.g98a8
-
diff --git a/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff b/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
deleted file mode 100644
index 09767d9..0000000
--- a/patches/dev300/xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
-index 7a57718..36ab09e 100644
---- sc/source/filter/excel/xestream.cxx
-+++ sc/source/filter/excel/xestream.cxx
-@@ -1129,9 +1129,10 @@ bool XclExpXmlStream::exportDocument() throw()
- {
- ScDocShell* pShell = getDocShell();
- ScDocument* pDoc = pShell->GetDocument();
-- SfxMedium* pMedium = pShell->GetMedium();
-- SvStream* pMediumStream = pMedium->GetOutStream();
-- SotStorageRef rStorage = new SotStorage( pMediumStream, false );
-+ // NOTE: Don't use SotStorage or SvStream any more, and never call
-+ // SfxMedium::GetOutStream() anywhere in the xlsx export filter code!
-+ // Instead, write via XOutputStream instance.
-+ SotStorageRef rStorage = static_cast<SotStorage*>(NULL);
-
- XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, *pDoc, RTL_TEXTENCODING_DONTKNOW );
- aData.meOutput = EXC_OUTPUT_XML_2007;
-@@ -1147,7 +1148,7 @@ bool XclExpXmlStream::exportDocument() throw()
- mpRoot = &aRoot;
- aRoot.GetOldRoot().pER = &aRoot;
- aRoot.GetOldRoot().eDateiTyp = Biff8;
--
-+#if 0 // FIXME: Re-write this block without using SotStorage.
- if ( SvtFilterOptions* pOptions = SvtFilterOptions::Get() )
- if ( pShell && pOptions->IsLoadExcelBasicStorage() )
- if ( sal_uInt32 nError
-@@ -1158,7 +1159,7 @@ bool XclExpXmlStream::exportDocument() throw()
- {
- pShell->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
- }
--
-+#endif
- OUString const workbook = CREATE_OUSTRING( "xl/workbook.xml" );
- PushStream( CreateOutputStream( workbook, workbook,
- Reference <XOutputStream>(),
diff --git a/patches/dev300/xlsx-shared-xlsx-export-perf-rowbuffer.diff b/patches/dev300/xlsx-shared-xlsx-export-perf-rowbuffer.diff
deleted file mode 100644
index 6383433..0000000
--- a/patches/dev300/xlsx-shared-xlsx-export-perf-rowbuffer.diff
+++ /dev/null
@@ -1,270 +0,0 @@
-diff --git sc/source/filter/inc/xetable.hxx sc/source/filter/inc/xetable.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list