From b03fbe13f31bde4a9844985afa7abecbf1834848 Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Date: Tue, 22 Nov 2011 15:09:27 +0100
Subject: writerfilter: Fixed crasher when importing docx files with dbglevel>1

---
 writerfilter/source/resourcemodel/TagLogger.cxx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 9cfaba1eda38..7b63ce045d4d 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -235,10 +235,10 @@ namespace writerfilter
     class PropertySetDumpHandler : public Properties
     {
         IdToString::Pointer_t mpIdToString;
-        TagLogger::Pointer_t m_pLogger;
+        TagLogger* m_pLogger;
 
     public:
-        PropertySetDumpHandler(TagLogger::Pointer_t pLogger,
+        PropertySetDumpHandler(TagLogger* pLogger,
                 IdToString::Pointer_t pIdToString);
         virtual ~PropertySetDumpHandler();
 
@@ -248,11 +248,11 @@ namespace writerfilter
         virtual void sprm(Sprm & sprm);
     };
 
-    PropertySetDumpHandler::PropertySetDumpHandler(TagLogger::Pointer_t pLogger,
+    PropertySetDumpHandler::PropertySetDumpHandler(TagLogger* pLogger,
             IdToString::Pointer_t pIdToString) :
-        mpIdToString(pIdToString)
+        mpIdToString(pIdToString),
+        m_pLogger(pLogger)
     {
-        m_pLogger = pLogger;
     }
 
     PropertySetDumpHandler::~PropertySetDumpHandler()
@@ -302,8 +302,7 @@ namespace writerfilter
     {
         startElement( "propertySet" );
 
-        TagLogger::Pointer_t pLogger( this );
-        PropertySetDumpHandler handler( pLogger, pIdToString );
+        PropertySetDumpHandler handler( this, pIdToString );
         handler.resolve( props );
 
         endElement( );
-- 
cgit