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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 1e37373efdd7..b971c93c8930 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2177,6 +2177,8 @@ 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 ); @@ -2284,6 +2286,8 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, } } } + AfterLoading(rMedium, aFilterName); + return bRtn; } catch (const packages::zip::ZipIOException&) |