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

Norbert Thiebaud nthiebaud at gmail.com
Sun May 10 12:43:26 PDT 2015


 vcl/source/gdi/impimagetree.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2523972f6a066488c649ab97dcba4f458126f18b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat May 9 19:39:55 2015 -0500

    remove a use of OUString::intern()
    
    maIconCache is defined as a std::unordered_map
    'interning' a OUString to give to it as a key seems completely
    superfluous since no-one will ever use it by address, even less
    compare the address.
    
    Change-Id: Iab5d106d7d51fcdfbd0a0dfd50ae28d686b9b2b7
    Reviewed-on: https://gerrit.libreoffice.org/15692
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 576bb8c..e1a36df 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -181,7 +181,7 @@ bool ImplImageTree::doLoadImage(OUString const & name, OUString const & style, B
     }
 
     if (found)
-        maIconSet[maCurrentStyle].maIconCache[name.intern()] = std::make_pair(localized, bitmap);
+        maIconSet[maCurrentStyle].maIconCache[name] = std::make_pair(localized, bitmap);
 
     return found;
 }


More information about the Libreoffice-commits mailing list