diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-12 17:39:21 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-12 18:05:26 +0200 |
| commit | b5465ea16383975357a774128a3432cb2a4a5d27 (patch) | |
| tree | 4c55ba7536be674cf4f0847345d2926542920d76 | |
| parent | 0752c18df9a975ffa182a4a7bc86e0bcadd58aec (diff) | |
Revert "bnc#758621: show preset texts in slide placeholder"
This reverts commit 95bb951826c7fbaafb055008416f4f1d5cfc95dc.
Mid-air collision :-) I've been working on an improvement based on this patch
when Muthu pushed it - the following commits are based on the Felix's work,
thank you Felix!
Change-Id: I12d649219911815e6b97d62f4584fa4d258d8917
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 42 |
2 files changed, 8 insertions, 36 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index f21323c68904..2fbf096aec58 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1200,7 +1200,7 @@ struct ImplPPTTextObj explicit ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; }; -class MSFILTER_DLLPUBLIC PPTTextObj +class PPTTextObj { ImplPPTTextObj* mpImplTextObj; void ImplClear(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 6b43d072e761..30e90f2ec456 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2322,7 +2322,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) ) { - sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId; sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId; sal_uInt16 i = 0; if ( eAktPageKind == PPT_SLIDEPAGE ) @@ -2333,7 +2332,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } - if ( i < 8 || nPlacementId == 0xffffffff ) + if ( i < 8 ) { PresObjKind ePresObjKind = PRESOBJ_NONE; sal_Bool bEmptyPresObj = sal_True; @@ -2341,40 +2340,18 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { if ( pTextObj->Count() ) - if ( pTextObj->Count() > 1 || pTextObj->First()->GetTextSize() ) - bEmptyPresObj = sal_False; + bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_TITLE : - case PPT_PLACEHOLDER_CENTEREDTITLE : - { - ePresObjKind = PRESOBJ_TITLE; - aPresentationText = pPage->GetPresObjText( ePresObjKind ); - break; - } + case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_VERTICALTEXTBODY : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_BODY : - { - ePresObjKind = PRESOBJ_OUTLINE; - aPresentationText = pPage->GetPresObjText( ePresObjKind ); - break; - } - case PPT_PLACEHOLDER_SUBTITLE : - { - ePresObjKind = PRESOBJ_TEXT; - aPresentationText = pPage->GetPresObjText( ePresObjKind ); - break; - } - case PPT_PLACEHOLDER_OBJECT : - { - ePresObjKind = PRESOBJ_OBJECT; - aPresentationText = pPage->GetPresObjText( ePresObjKind ); - break; - } + case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; + case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; + case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE default : { @@ -2383,6 +2360,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_MEDIACLIP : + case PPT_PLACEHOLDER_OBJECT : ePresObjKind = PRESOBJ_OBJECT; break; case PPT_PLACEHOLDER_GRAPH : ePresObjKind = PRESOBJ_CHART; break; case PPT_PLACEHOLDER_TABLE : ePresObjKind = PRESOBJ_TABLE; break; case PPT_PLACEHOLDER_CLIPART : ePresObjKind = PRESOBJ_GRAPHIC; break; @@ -2413,12 +2391,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( !bEmptyPresObj ) { pPage->InsertPresObj( pRet, ePresObjKind ); - if ( !pText->HasText() ) - { - SdrOutliner* pOutl = ((SdDrawDocument*)(pPage->GetModel()))->GetInternalOutliner(); - if ( aPresentationText.Len() ) - pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText ); - } } else { |