Kaydet (Commit) 749bd87e authored tarafından Caolán McNamara's avatar Caolán McNamara

drop the functional parts

appears to work without it as far as I can see

Change-Id: Ibe19addeeb38f853a515aef36d6bc83d338e1c0b
üst 2f7b92c5
......@@ -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);
......
......@@ -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&)
......
......@@ -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;
......
......@@ -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()
{
......
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