[Libreoffice-commits] core.git: sd/source

Matúš Kukan matus.kukan at gmail.com
Sat Feb 25 13:54:56 UTC 2017


 sd/source/filter/eppt/pptx-epptooxml.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9cbe69f1950115e47af693bd78fc78f96f9b508e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Feb 11 16:24:37 2017 +0100

    tdf#104222: Put expensive debug code behind #if again
    
    dump_pset calls very expensive SdGenericDrawPage::getPropertyValue
    doing something with GDIMetaFiles.
    
    (regression from 5c7ce42dfc35d9cceef5f05a96e813b4e3913d38)
    
    Change-Id: If39e9a451c87754343d77c8a1f840153c6b9de80

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a20ead1..76e00b4 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -94,7 +94,9 @@ using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet);
+#endif
 
 namespace oox {
     using namespace drawingml;
@@ -1785,7 +1787,9 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste
 
     Reference< beans::XPropertySet > xPropSet( xSlide, uno::UNO_QUERY );
     xPropSet->setPropertyValue( "Layout", makeAny( short( aLayoutInfo[ nOffset ].nType ) ) );
+#if OSL_DEBUG_LEVEL > 1
     dump_pset(xPropSet);
+#endif
     mXPagePropSet.set( xSlide, UNO_QUERY );
     mXShapes.set( xSlide, UNO_QUERY );
 
@@ -2328,6 +2332,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdfilt_component_getFactory( const sal_Char*
 
 }
 
+#if OSL_DEBUG_LEVEL > 1
 void dump_pset(Reference< XPropertySet > const & rXPropSet)
 {
     Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
@@ -2355,5 +2360,6 @@ void dump_pset(Reference< XPropertySet > const & rXPropSet)
             SAL_INFO("sd.eppt", "???          <unhandled type>");
     }
 }
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list