Kaydet (Commit) 0e112e64 authored tarafından Christina Rossmanith's avatar Christina Rossmanith

Duplicate code: join ImportFrom and InsertFrom

üst 92e87955
...@@ -406,9 +406,9 @@ sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) ...@@ -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(); SfxItemSet* pSet = rMedium.GetItemSet();
if( pSet ) if( pSet )
......
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
virtual void Activate( sal_Bool bMDI ); virtual void Activate( sal_Bool bMDI );
virtual void Deactivate( 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 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 ConvertFrom( SfxMedium &rMedium );
virtual sal_Bool Save(); virtual sal_Bool Save();
virtual sal_Bool SaveAsOwnFormat( SfxMedium& rMedium ); virtual sal_Bool SaveAsOwnFormat( SfxMedium& rMedium );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment