Skip to content

C
core
Kaydet (Commit) b5465ea1 authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

Revert "bnc#758621: show preset texts in slide placeholder" 

This reverts commit 95bb9518.

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
üst 0752c18d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 36 deletions
include/filter/msfilter/svdfppt.hxx
Dosyayı görüntüle @ b5465ea1
......@@ -1200,7 +1200,7 @@ struct ImplPPTTextObj
explicit ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {};
};
class MSFILTER_DLLPUBLIC PPTTextObj
class PPTTextObj
{
ImplPPTTextObj* mpImplTextObj;
void ImplClear();
......
sd/source/filter/ppt/pptin.cxx
Dosyayı görüntüle @ b5465ea1
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment