impress193: #162822# fixed font size problem with presentation objects

9 files changed, 29 insertions, 9 deletions

diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index f4228ab24790..d6cab48f6bb5 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -127,6 +127,7 @@ public:
     ::rtl::OUString                 getName( ) { return msName; }
     void                            setId( const rtl::OUString& rId ) { msId = rId; }
     void                            setHidden( sal_Bool bHidden ) { mbHidden = bHidden; }
+    sal_Bool                        getHidden() const { return mbHidden; };
     void                            setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; }
     sal_Int32                       getSubType() const { return mnSubType; }
     void                            setSubTypeIndex( sal_uInt32 nSubTypeIndex ) { mnSubTypeIndex = nSubTypeIndex; }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 50ded9b2753b..97c3b4a5374a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -374,8 +374,8 @@ Reference< XShape > Shape::createAndInsert(
 
         if ( mbHidden )
         {
-            const OUString sHidden( CREATE_OUSTRING( "NumberingLevel" ) );
-            xSet->setPropertyValue( sHidden, Any( mbHidden ) );
+            const OUString sHidden( CREATE_OUSTRING( "Visible" ) );
+            xSet->setPropertyValue( sHidden, Any( !mbHidden ) );
         }
 
         Reference< document::XActionLockable > xLockable( mxShape, UNO_QUERY );
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index 56ce53767641..e1bd51f852ad 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
+#include "oox/helper/attributelist.hxx"
 #include "oox/drawingml/shapegroupcontext.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
@@ -70,9 +71,13 @@ Reference< XFastContextHandler > ShapeGroupContext::createFastChildContext( sal_
     switch( getToken( aElementToken ) )
     {
     case XML_cNvPr:
+    {
+        AttributeList aAttribs( xAttribs );
+        mpGroupShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) );
         mpGroupShapePtr->setId( xAttribs->getOptionalValue( XML_id ) );
         mpGroupShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
         break;
+    }
     case XML_ph:
         mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) );
         mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx
index 07a71c0855a1..901db49802d9 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -33,8 +33,8 @@ TextListStyle::TextListStyle()
 {
     for ( int i = 0; i < 9; i++ )
     {
-        maListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties ) );
-        maAggregationListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties ) );
+        maListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties() ) );
+        maAggregationListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties() ) );
     }
 }
 
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index eb3b3503452e..bfe3ead6ca04 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -169,6 +169,7 @@ void PPTShape::addShape(
                 }
             }
 
+/*
             // use placeholder index if possible
             if( mnSubType && getSubTypeIndex() && rSlidePersist.getMasterPersist().get() ) {
                 oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
@@ -182,8 +183,7 @@ void PPTShape::addShape(
                 aMasterTextListStyle = pNewTextListStyle;
                 }
             }
-
-
+*/
             if ( sServiceName.getLength() )
             {
                 if ( !aMasterTextListStyle.get() )
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 01681b6b404a..c59638553018 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
+#include "oox/helper/attributelist.hxx"
 #include "oox/ppt/pptshape.hxx"
 #include "oox/ppt/pptshapecontext.hxx"
 #include "oox/ppt/pptshapepropertiescontext.hxx"
@@ -104,9 +105,13 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
         //  case NMSP_PPT|XML_drElemPr:
         //      break;
         case NMSP_PPT|XML_cNvPr:
+        {
+            AttributeList aAttribs( xAttribs );
+            mpShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) );
             mpShapePtr->setId( xAttribs->getOptionalValue( XML_id ) );
             mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
             break;
+        }
         case NMSP_PPT|XML_ph:
         {
             sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
@@ -140,7 +145,7 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
                                   nSecondPlaceholder = XML_body;
                               break;
 
-                              case XML_dt :         // slide/layout/master/notes/notesmaster/handoutmaster
+                            case XML_dt :           // slide/layout/master/notes/notesmaster/handoutmaster
                               case XML_sldNum :     // slide/layout/master/notes/notesmaster/handoutmaster
                               case XML_ftr :            // slide/layout/master/notes/notesmaster/handoutmaster
                               case XML_hdr :            // notes/notesmaster/handoutmaster
@@ -179,6 +184,7 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In
                           }
                     }
                   }
+
               }
               break;
         }
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index ef8dbeedcd6c..074393874264 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
+#include "oox/helper/attributelist.hxx"
 #include "oox/ppt/pptshape.hxx"
 #include "oox/ppt/pptshapecontext.hxx"
 #include "oox/ppt/pptshapegroupcontext.hxx"
@@ -71,9 +72,13 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s
     switch( aElementToken )
     {
     case NMSP_PPT|XML_cNvPr:
+    {
+        AttributeList aAttribs( xAttribs );
+        mpGroupShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) );
         mpGroupShapePtr->setId( xAttribs->getOptionalValue( XML_id ) );
         mpGroupShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
         break;
+    }
     case NMSP_PPT|XML_ph:
         mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) );
         mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() );
diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx
index b771998922cc..773730417a27 100644
--- a/oox/source/ppt/slidemastertextstylescontext.cxx
+++ b/oox/source/ppt/slidemastertextstylescontext.cxx
@@ -75,8 +75,12 @@ Reference< XFastContextHandler > SlideMasterTextStylesContext::createFastChildCo
             break;
         }
     }
-    if ( aTextListStylePtr )
+    if ( aTextListStylePtr )            // sj: the master list style is the last instance of from where properties
+    {                                   // are obtained. i got some documents without having the textsize set at
+        for ( int i = 0; i < 9; i++ )   // any point, the master reference application is using 18pt then
+            aTextListStylePtr->getListStyle()[ i ]->getTextCharacterProperties().moHeight = 1800;
         xRet.set( new oox::drawingml::TextListStyleContext( *this, *aTextListStylePtr ) );
+    }
     if( !xRet.is() )
         xRet.set( this );
 
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 39540335cf13..ce99ffc49f19 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -148,7 +148,6 @@ void SlidePersist::createXShapes( const XmlFilterBase& rFilterBase )
                 pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, 0, &getShapeMap() );
             else
                 (*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, 0, &getShapeMap() );
-
             aChildIter++;
         }
     }