diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-15 09:37:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-15 10:05:59 +0200 |
| commit | 87018a47b879bdf942e4ac4124a161aab928806d (patch) | |
| tree | 360fd0a286560b1ad2cd877a002ad83d066fb838 /sd | |
| parent | e00faa6f01ea4437c25c64cb5b7fa7fbfdfdb9f2 (diff) | |
fdo#64586: Fix incorrect import non-empty placeholders.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 1e15c3d5c2a2..84bd8f65ff17 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2321,6 +2321,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj sal_Bool bVertical = sal_False; if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { + bEmptyPresObj = ( pTextObj->Count() == 0 ) || ( pTextObj->Count() == 1 && pTextObj->First()->GetTextSize() == 0 ); switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; @@ -2347,8 +2348,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break; } } - else - bEmptyPresObj = sal_False; }; } } |