[Libreoffice-commits] .: sd/source

[Christina Rossmanith]

 sd/source/ui/docshell/docshel4.cxx |    4 ++--
 sd/source/ui/inc/DrawDocShell.hxx  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 763b4a7f9611d9d28a77fffed9e4296d6b2015c1
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Tue May 31 13:56:08 2011 +0200

    Duplicate code: join ImportFrom and InsertFrom

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index ce7e946..9f9d8a5 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -406,9 +406,9 @@ sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
 |*
 \************************************************************************/
 
-sal_Bool DrawDocShell::ImportFrom( SfxMedium &rMedium )
+sal_Bool DrawDocShell::ImportFrom( SfxMedium &rMedium, bool bInsert )
 {
-    const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium);
+    const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium, bInsert);
 
     SfxItemSet* pSet = rMedium.GetItemSet();
     if( pSet )
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 7ed7f13..e74aeaf 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -90,7 +90,7 @@ public:
     virtual void	        Activate( sal_Bool bMDI );
     virtual void	        Deactivate( sal_Bool bMDI );
     virtual sal_Bool            InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-    virtual sal_Bool        ImportFrom( SfxMedium &rMedium );
+    virtual sal_Bool        ImportFrom( SfxMedium &rMedium, bool bInsert=false );
     virtual sal_Bool            ConvertFrom( SfxMedium &rMedium );
     virtual sal_Bool	        Save();
     virtual sal_Bool            SaveAsOwnFormat( SfxMedium& rMedium );