diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-05-31 13:56:08 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-06-03 17:47:08 +0200 |
| commit | 0e112e64f73df89dc5d2d6d504e2839c8b500c14 (patch) | |
| tree | 4bad67c987ef4fda8b7e54112fd465ca60b38fb8 /sd/source/ui | |
| parent | 92e87955954bdbd07fe103611077e6409f3f4a0d (diff) | |
Duplicate code: join ImportFrom and InsertFrom
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index ec5988eb28e8..abf69e0493c5 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 12baddf142cc..02f225d20cb9 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 ); |