[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Matúš Kukan]

 sd/source/filter/eppt/pptx-epptooxml.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ed22f8b84ed0b5286af406c87c674f34fe8439c1
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)
    
    (cherry picked from commit 9cbe69f1950115e47af693bd78fc78f96f9b508e)
    
    Change-Id: If39e9a451c87754343d77c8a1f840153c6b9de80
    Reviewed-on: https://gerrit.libreoffice.org/34651
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 32f7171..fb98a6e 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -92,7 +92,10 @@ using ::com::sun::star::container::XIndexAccess;
 using ::sax_fastparser::FSHelperPtr;
 
 
-void dump_pset(Reference< XPropertySet > rXPropSet);
+#if OSL_DEBUG_LEVEL > 1
+void dump_pset(Reference< XPropertySet > const & rXPropSet);
+#endif
+
 #define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
 namespace oox {
@@ -1789,7 +1792,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 );
 
@@ -2334,7 +2339,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdfilt_component_getFactory( const sal_Char*
 }
 #endif
 
-void dump_pset(Reference< XPropertySet > rXPropSet)
+#if OSL_DEBUG_LEVEL > 1
+void dump_pset(Reference< XPropertySet > const & rXPropSet)
 {
     Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
     Sequence< beans::Property > props = info->getProperties ();
@@ -2361,5 +2367,6 @@ void dump_pset(Reference< XPropertySet > rXPropSet)
             SAL_WARN("sd.eppt", "???          <unhandled type>");
     }
 }
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */