diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-13 10:45:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-13 10:45:18 +0200 |
| commit | 71fa700450e6fee186bc117e6d95a382d53ad2c4 (patch) | |
| tree | 2f5efb112783fd9e1063be0830c3793cfbfee3a7 /sd | |
| parent | 27a5c5c0c776d62cc219c2505e2df88ee1905a84 (diff) | |
Revert "bnc#758621: show preset texts in slide placeholder."
This reverts commit 27a5c5c0c776d62cc219c2505e2df88ee1905a84.
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!
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 37c230449acb..8fa0545e430f 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2311,7 +2311,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 ) @@ -2322,7 +2321,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; @@ -2330,40 +2329,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 : { @@ -2372,6 +2349,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; @@ -2402,12 +2380,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 { |