diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-26 08:03:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 16:29:16 +0100 |
| commit | 2f7b92c5bbd1b1aaa857a41457d866e04ce603a2 (patch) | |
| tree | bbd081a0abfc9316a41aa3f1e8836bc2281d9e8e /include | |
| parent | 587f178ba457e4eb221a3e078f16efa6c3217646 (diff) | |
Resolves: #i124914# reset certain language dependent pool defaults...
before importing a document via <SfxObjectShell::ImportFrom(..)> (used for
OOXML *.docx import)
(cherry picked from commit 920bf1164fe0c3d232dc0f7d476eec1660f4690e)
Conflicts:
sfx2/inc/sfx2/objsh.hxx
sw/inc/docsh.hxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/app/docstyle.cxx
Change-Id: Id32bd6a8ef081dd4af4d832aa42317de7f64184f
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/objsh.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 1cb8e910af05..6ca8ddb82355 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -177,6 +177,15 @@ 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); |