[Libreoffice-commits] .: 2 commits - sc/source sw/source

[Michael Stahl]

 sc/source/filter/oox/extlstcontext.cxx |    2 --
 sw/source/filter/ww8/ww8graf.cxx       |   10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit d0e4215b653b0fab6718b06a5dc0e566170f538d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 23:45:35 2012 +0200

    ExtGlobalContext::onCreateContext: warning C4702: unreachable code
    
    Change-Id: Iccbf66d8838fcfa2f2c620dd768aba75f9e071f4

diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 6435128..740a841 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -180,8 +180,6 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A
         else
             return this;
     }
-
-    return 0;
 }
 
 void ExtGlobalContext::onStartElement( const AttributeList& rAttribs )
commit 50ce1874041c8ccfb5c9fefa8a66abb48fa26dcc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 12 23:42:29 2012 +0200

    SwWW8ImplReader::Read_GrafLayer: appease MSVC:
    
    MSVC 2008 refuses to compile this unless it gets a const_iterator, and i
    have no idea why.
    
    Change-Id: I08a6916313ae256388309742604dfb5940b42b9f

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 60c3357..7a87b29 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2561,12 +2561,12 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
         Get the record for top level object, so we can get the word anchoring
         and wrapping information for it.
     */
-    for (MSDffImportRecords::iterator it = aData.begin();
-            it != aData.end(); ++it)
+    for (MSDffImportRecords::const_iterator it = aData.begin();
+            it != aData.end(); ++it) // MSVC2008 wants const_iterator here???
     {
         if (it->pObj == pObject)
         {
-            pRecord = &*it;
+            pRecord = &const_cast<SvxMSDffImportRec&>(*it);
             break;
         }
     }
@@ -2663,10 +2663,10 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
             */
             if (!aData.empty())
             {
-                for (MSDffImportRecords::iterator it = aData.begin();
+                for (MSDffImportRecords::const_iterator it = aData.begin();
                         it != aData.end(); ++it)
                 {
-                    pRecord = &*it;
+                    pRecord = &const_cast<SvxMSDffImportRec&>(*it);
                     if (pRecord->pObj && pRecord->aTextId.nTxBxS)
                     { // #i52825# pRetFrmFmt can be NULL
                         pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj,