filter/inc/filter/msfilter/svdfppt.hxx | 2 +-
sd/source/filter/ppt/pptin.cxx | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit fa51b81053cca46bc08d4e096314f08e681bf61c
Author: Jan Holesovsky <ke...@suse.cz>
Date: Wed May 15 09:37:27 2013 +0200
fdo#64586: Fix incorrect import non-empty placeholders.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index da82d7f..5c6baa9 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 c4ab6d2..ef0cf2b 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;
};
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
