xmloff/source/draw/sdxmlexp.cxx | 7 ++----- xmloff/source/style/impastpl.hxx | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 575f789f93fd0ef00987afa51a8e4ce2d8089287 Author: David Tardon <[email protected]> Date: Tue Jul 9 13:13:47 2013 +0200 drop useless condition Change-Id: I31368921a7a398f55731081848f4df58663e3136 diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 328c7fd..e2b9c29 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -459,11 +459,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent xMapper = new XMLPropertySetMapper((XMLPropertyMapEntry*)aXMLSDPresPageProps, aFactoryRef); mpPresPagePropsMapper = new XMLPageExportPropertyMapper( xMapper, *this ); - if(mpPresPagePropsMapper) - { - // set lock to avoid deletion - mpPresPagePropsMapper->acquire(); - } + // set lock to avoid deletion + mpPresPagePropsMapper->acquire(); } // add family name commit 2285177c03381079db93aa03195a9b828081e535 Author: David Tardon <[email protected]> Date: Tue Jul 9 12:53:53 2013 +0200 initialize member variable Change-Id: I213f6534d88240be51d33a62995bf99292b32263 diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 0b8daed..c81f6d1 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -71,7 +71,8 @@ public: XMLFamilyData_Impl( sal_Int32 nFamily ) : pCache( 0 ), mnFamily( nFamily ), mpParentList( NULL ), - mpNameList( NULL ), mnCount( 0 ), mnName( 0 ) + mpNameList( NULL ), mnCount( 0 ), mnName( 0 ), + bAsFamily( false ) {} ~XMLFamilyData_Impl(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
