diff options
| -rw-r--r-- | include/sfx2/objsh.hxx | 9 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 4 | ||||
| -rw-r--r-- | sw/inc/docsh.hxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 10 |
4 files changed, 0 insertions, 29 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 6ca8ddb82355..1cb8e910af05 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -177,15 +177,6 @@ private: // sal_False := new object bool bIsInGenerateThumbnail; //optimize thumbnail generate and store procedure to improve odt saving performance, i120030 - -protected: - // methods called in implementation of <ImportFrom(..)> - virtual void BeforeLoading(SfxMedium&, - const OUString&) {} - - virtual void AfterLoading(SfxMedium&, - const OUString&) {} - private: SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties> & i_xDocProps); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index b971c93c8930..1e37373efdd7 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2177,8 +2177,6 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, { OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); - BeforeLoading(rMedium, aFilterName); - uno::Reference< lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); uno::Reference < lang::XMultiServiceFactory > xFilterFact ( xMan->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY ); @@ -2286,8 +2284,6 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, } } } - AfterLoading(rMedium, aFilterName); - return bRtn; } catch (const packages::zip::ZipIOException&) diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 230b267d0391..2aeafa6912bd 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -143,12 +143,6 @@ protected: /// override to update text fields virtual void DoFlushDocInfo() SAL_OVERRIDE; - // override <SfxObjectShell>'s method which is called in - // <SfxObjectShell::ImportFrom(..)>. - // <SfxObjectShell::ImportFrom(..)> is used by current import of Microsoft - // Word documents in OOXML file format. - virtual void BeforeLoading(SfxMedium&, const ::rtl::OUString&) SAL_OVERRIDE; - public: using SotObject::GetInterface; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 23816813ab64..bffe05521330 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -300,16 +300,6 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) return bOk; } -void SwDocShell::BeforeLoading(SfxMedium&, const ::rtl::OUString&) -{ - if (mpDoc == NULL) - { - return; - } - - mpDoc->RemoveAllFmtLanguageDependencies(); -} - // Saving the Default-Format, Stg present bool SwDocShell::Save() { |