diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-10 20:27:40 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-13 11:03:35 +0200 |
| commit | c8f1d9140b898e1b63fe12f049738b8333202561 (patch) | |
| tree | 3035e0a792b2e30ae42598cde55986e3d5cc6d4f | |
| parent | bnc#758621: We don't need this index for anything. (diff) | |
| download | core-c8f1d9140b898e1b63fe12f049738b8333202561.tar.gz core-c8f1d9140b898e1b63fe12f049738b8333202561.zip | |
bnc#758621: Set presentation object as non-empty only if not a placeholder.
Based on work of Felix Zhang <fezhang@suse.com>, thank you!
Change-Id: I26c7cef17b9a5f3d73107b5c974983e58c347d52
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 5b88e50ed0f6..c4ab6d2cdb3c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2340,8 +2340,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj sal_Bool bVertical = sal_False; if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { - if ( pTextObj->Count() ) - bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; @@ -2356,7 +2354,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj default : { - if ( !pTextObj->Count() ) + if ( pTextObj->Count() == 0 ) { switch ( nPlaceholderId ) { @@ -2368,6 +2366,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break; } } + else + bEmptyPresObj = sal_False; }; } } |