diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-19 16:26:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-22 11:35:58 +0200 |
| commit | 2a7119021edea8346e4673d57cac3f051a5d0968 (patch) | |
| tree | 684157f1cc18839f6307fd5730d917e52368640a /oox/source/ppt/pptshapecontext.cxx | |
| parent | c70f22b9a56d19efa58329dcd5095804d1864513 (diff) | |
bnc#880448: Improved handling of placeholder shapes
If subTitle placeholder is not found, try body instead of title.
And use body text styles instead of title, for subTitle.
Also improve PPTShape::findPlaceholder to find placeholder
with just nSecondSubType type without the same index.
Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d
Diffstat (limited to 'oox/source/ppt/pptshapecontext.cxx')
| -rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index c80134fea2d2..c0117aa85b5d 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -96,7 +96,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con case XML_subTitle : // slide/layout nFirstPlaceholder = XML_subTitle; - nSecondPlaceholder = XML_title; + nSecondPlaceholder = XML_body; break; case XML_obj : // slide/layout @@ -140,7 +140,8 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con } if ( pPlaceholder.get() ) { - OSL_TRACE("shape %s will get shape reference %s applied", OUStringToOString(mpShapePtr->getId(), RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString(pPlaceholder->getId(), RTL_TEXTENCODING_UTF8 ).getStr()); + SAL_INFO("oox.ppt","shape " << mpShapePtr->getId() << + " will get shape reference " << pPlaceholder->getId() << " applied"); mpShapePtr->applyShapeReference( *pPlaceholder.get() ); PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); if ( pPPTShape ) |