[Libreoffice-commits] .: sw/source

[Noel Power]

 sw/source/filter/ww8/ww8par.cxx |   12 ++++++------
 sw/source/filter/ww8/ww8par.hxx |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit aa6c56a4e97f624d4a39650da0ddee8d839db930
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Tue May 24 09:22:21 2011 -0430

    Replace List for std::map<sal_uInt32,ByteString>.

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2d5eca7..be2c2b0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -340,7 +340,7 @@ SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
     : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
         rRdr.pDataStream, 0, 0, COL_WHITE, 12, rRdr.pStrm,
         rRdr.maTracer.GetTrace()),
-    rReader(rRdr), pFallbackStream(0), pOldEscherBlipCache(0)
+    rReader(rRdr), pFallbackStream(0)
 {
     SetSvxMSDffSettings( GetSvxMSDffSettings() );
     nSvxMSDffOLEConvFlags = SwMSDffManager::GetFilterFlags();
@@ -413,19 +413,19 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
 
 void SwMSDffManager::DisableFallbackStream()
 {
-    OSL_ENSURE(!pFallbackStream || !pOldEscherBlipCache,
+    OSL_ENSURE(!pFallbackStream,
         "if you're recursive, you're broken");
     pFallbackStream = pStData2;
-    pOldEscherBlipCache = pEscherBlipCache;
-    pEscherBlipCache = 0;
+    aOldEscherBlipCache = aEscherBlipCache;
+    aEscherBlipCache.clear();
     pStData2 = 0;
 }
 
 void SwMSDffManager::EnableFallbackStream()
 {
     pStData2 = pFallbackStream;
-    pEscherBlipCache = pOldEscherBlipCache;
-    pOldEscherBlipCache = 0;
+    aEscherBlipCache = aOldEscherBlipCache;
+    aOldEscherBlipCache.clear();
     pFallbackStream = 0;
 }
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 0ab33fc..96c8d37 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -559,7 +559,7 @@ class SwMSDffManager : public SvxMSDffManager
 private:
     SwWW8ImplReader& rReader;
     SvStream *pFallbackStream;
-    List *pOldEscherBlipCache;
+    std::map<sal_uInt32,ByteString> aOldEscherBlipCache;
 
     virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName,
         SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const;