summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorKatarina Machalkova <kmachalkova@suse.cz>2010-10-13 18:03:13 +0200
committerKatarina Machalkova <kmachalkova@suse.cz>2010-10-13 20:58:27 +0200
commit4464655f415bcbc624d60a60ee4424165530a529 (patch)
tree35ebfcc6021ed7fe7b66e8b9f95762ff83ec15fb /sfx2
parent8bc89efca80a5992a745e975068ade3bcfa358a8 (diff)
Merged pptx-autoplay-fix.diff from ooo-build
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/docfilt.hxx1
-rw-r--r--sfx2/inc/sfx2/objsh.hxx2
-rw-r--r--sfx2/source/doc/objstor.cxx3
3 files changed, 5 insertions, 1 deletions
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index f024fdb07c06..31d642026d0d 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 abf78db07be5..9c1a3fe0cfff 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 51f777620972..12e32b494ff8 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 );