diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-05-04 19:09:00 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-05-19 01:45:42 +0000 |
| commit | bd3ed061de068a03a7c75f093c9a9bd7b6f3ba57 (patch) | |
| tree | 56dfbd1f5d11c61c8849923da70f9e19e1127540 /sd/source | |
| parent | ac47f00f57ceee1d759393321b87477fa094b111 (diff) | |
tdf#49561: PPT import: Avoid to override formatting from StyleTextPropAtom
Change-Id: Id874cb369b08eb7f8226413c6541fe6cd18eceaa
Reviewed-on: https://gerrit.libreoffice.org/24662
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2d770248c026..8eac912e254c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2287,7 +2287,9 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; default: break; } + pText = static_cast<SdrTextObj*>(SdrPowerPointImport::ApplyTextObj( pTextObj, pText, pPageCapsule, pSheet, ppStyleSheetAry )); + if ( pPlaceHolder && pPlaceHolder->nPlaceholderId != PptPlaceholder::NONE ) { if ( eAktPageKind == PPT_MASTERPAGE ) @@ -2330,7 +2332,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj rItemSet.Put( pText->GetMergedItemSet() ); } } - pText->NbcSetStyleSheet( pSheet2, false ); } SfxItemSet aTempAttr( mpDoc->GetPool() ); |