[Libreoffice-commits] .: 2 commits - formula/inc sfx2/inc sfx2/source

[Katarina Machalkova]

 formula/inc/formula/tokenarray.hxx |    1 +
 sfx2/inc/sfx2/docfilt.hxx          |    1 +
 sfx2/inc/sfx2/objsh.hxx            |    2 +-
 sfx2/source/doc/objstor.cxx        |    3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9621cfed7cc81baac5b87581049a3662eb997cd3
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Wed Oct 13 18:03:13 2010 +0200

    Merged pptx-autoplay-fix.diff from ooo-build

diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 9c6c0b1..7fa7142 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -70,6 +70,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 a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index d168399..6070bd1 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -368,7 +368,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 a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a52bd04..7cc9fea 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -598,6 +598,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 );
commit b21cb20e7bf8e6ee2f917652622deed39ba420a0
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Wed Oct 13 17:45:27 2010 +0200

    Merged xlsx-shared-xlsx-snapshot.diff from ooo-build

diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index ff1cabb..5bbfaf4 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -28,6 +28,7 @@
 #ifndef FORMULA_TOKENARRAY_HXX
 #define FORMULA_TOKENARRAY_HXX
 
+#include <limits.h>
 #include "formula/token.hxx"
 #include "formula/ExternalReferenceHelper.hxx"
 #include <tools/solar.h>