[Libreoffice-commits] .: 2 commits - sfx2/source solenv/gbuild svtools/source svx/source

[Thorsten Behrens]

 sfx2/source/doc/objcont.cxx               |    6 +++++-
 solenv/gbuild/gbuild.help.txt             |    4 ++++
 solenv/gbuild/gbuild.mk                   |   11 +++++++++++
 svtools/source/filter/filter.cxx          |    3 +++
 svx/source/unodraw/UnoGraphicExporter.cxx |    5 +++++
 5 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit bf286107121648bb90c582ac2d56001161915ce4
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Mon Apr 23 23:03:29 2012 +0200

    Add some more timelogging, for graphic export here.

diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 1034738..398cf85 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -51,6 +51,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/datetime.hxx>
+#include <rtl/logfile.hxx>
 #include <math.h>
 
 #include <unotools/saveopt.hxx>
@@ -170,7 +171,10 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
 
     aDevice.SetDigitLanguage( eLang );
 
-    ((SfxObjectShell*)this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect );
+    {
+        RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::CreatePreviewMetaFile_Impl" );
+        ((SfxObjectShell*)this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect );
+    }
     pFile->Stop();
 
     return pFile;
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index fb86d9b..634802f 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -68,6 +68,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
+#include <rtl/logfile.hxx>
 #include <vector>
 
 #include "SvFilterOptionsDialog.hxx"
@@ -1714,6 +1715,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath,
 sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
     sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData )
 {
+    RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
     sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" );
     sal_Bool        bAlreadyExists = ImplDirEntryHelper::Exists( rPath );
@@ -1736,6 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
 sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPath,
     SvStream& rOStm, sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData )
 {
+    RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
     sal_uInt16 nFormatCount = GetExportFormatCount();
 
     ResetLastError();
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 6ee3ed0..46220ea 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 
+#include <rtl/logfile.hxx>
 #include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
@@ -594,6 +595,8 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
 
 bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, sal_Bool bVectorType )
 {
+    RTL_LOGFILE_CONTEXT( aLog, "UnoGraphicExporter::GetGraphic (thb)" );
+
     if( !mpDoc || !mpUnoPage )
         return false;
 
@@ -976,6 +979,8 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
 sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor )
     throw(RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT( aLog, "UnoGraphicExporter::export (thb)" );
+
     ::SolarMutexGuard aGuard;
 
     if( NULL == mpUnoPage )
commit 0c00198b97e9dd7ee4aab0cb2f0e0fed681c852c
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Mon Apr 23 23:02:06 2012 +0200

    Resurrect TIMELOG absolute time logging facility
    
    This somehow fell through the cracks of gbuildification -
    make timelog=t now again enables those RTL_LOGFILE_ macros.

diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 3e17075..6506022 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -62,6 +62,10 @@ INTERACTIVE VARIABLES:
                        3... = symbols + no optimizations + extra debug output (usually
                               extremely verbose). Levels > 2 are not used very much.
 
+       TIMELOG / timelog
+                       If not empty enable the RTL_LOGFILE_* time logging facility.
+                       export RTL_LOGFILE=rtl_logfile.nopid when running office, to
+                       get timestamps written out.
        YACCFLAGS       Add as flags for YACC parser generator invocation.
        CPPFLAGS        Add as preprocessor flags for C/C++/ObjC/ObjC++ compilation.
        CFLAGS          Add as compiler flags for plain C compilation.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a37cb8b..578393e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -91,6 +91,11 @@ else
 gb_STRIP := $(false)
 endif
 
+gb_TIMELOG := 0
+ifneq ($(strip $(TIMELOG)$(timelog)),)
+gb_TIMELOG := 1
+endif
+
 gb_DEBUGLEVEL := 0
 ifneq ($(strip $(DEBUG)$(debug)),)
 gb_DEBUGLEVEL := 1
@@ -201,6 +206,12 @@ ifneq ($(strip $(SOLAR_JAVA)),)
 gb_GLOBALDEFS += -DSOLAR_JAVA
 endif
 
+ifeq ($(gb_TIMELOG),1)
+gb_GLOBALDEFS += \
+	-DTIMELOG \
+
+endif
+
 ifeq ($(gb_DEBUGLEVEL),0)
 gb_GLOBALDEFS += \
 	-DOPTIMIZE \