summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2017-02-11 16:24:37 +0100
committerMichael Stahl <mstahl@redhat.com>2017-02-27 11:19:36 +0000
commited22f8b84ed0b5286af406c87c674f34fe8439c1 (patch)
tree9f1515f4f0acf23a2c172a6606cca96ff051bfcd
parentce9aecee57f8b852cbae8e4e24ee7fd2efabf44b (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 32f717196b83..fb98a6ec3fa7 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: */