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:04:27 +0200 |
| commit | fa51b81053cca46bc08d4e096314f08e681bf61c (patch) | |
| tree | c416d86bb6355ac241716f6b73938b77931fe94b | |
| parent | 3ac499832916b912fcaad5b8f1a9dd432ab90446 (diff) | |
fdo#64586: Fix incorrect import non-empty placeholders.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index da82d7fbca9a..5c6baa965f9b 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -1199,7 +1199,7 @@ struct ImplPPTTextObj ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; }; -class PPTTextObj +class MSFILTER_DLLPUBLIC PPTTextObj { ImplPPTTextObj* mpImplTextObj; void ImplClear(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index c4ab6d2cdb3c..ef0cf2bdcf09 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2340,6 +2340,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; @@ -2366,8 +2367,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break; } } - else - bEmptyPresObj = sal_False; }; } } |