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

sd/source/filter/ppt/pptin.cxx

@@ -2321,8 +2321,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;
@@ -2337,7 +2335,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
 
                             default :
                             {
-                                if ( !pTextObj->Count() )
+                                if ( pTextObj->Count() == 0 )
                                 {
                                     switch ( nPlaceholderId )
                                     {
@@ -2349,6 +2347,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
                                         case PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
                                     }
                                 }
+                                else
+                                    bEmptyPresObj = sal_False;
                             };
                         }
                     }