[Libreoffice-commits] core.git: filter/source

[Stephan Bergmann]

 filter/source/msfilter/util.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 60db3dae6cdacff0519e3f37186592baafb9e6b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 22 15:18:57 2014 +0200

    Use already found result
    
    Change-Id: Ifafba6f4f93b357239ddadd5ca16ac62bd6e289b

diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 3eb2309..5aad6fe 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1329,10 +1329,8 @@ MSO_SPT GETVMLShapeType(const OString& aType)
             (*pDMLToVMLMap)[pDMLToVMLTable[i].sDML] = pDMLToVMLTable[i].nVML;
     }
 
-    if (pDMLToVMLMap->find(pDML) == pDMLToVMLMap->end())
-        return mso_sptNil;
-
-    return (*pDMLToVMLMap)[pDML];
+    DMLToVMLTranslationHashMap::iterator i(pDMLToVMLMap->find(pDML));
+    return i == pDMLToVMLMap->end() ? mso_sptNil : i->second;
 }
 
 }