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

Caolán McNamara caolanm at redhat.com
Fri Jan 2 10:49:43 PST 2015


 unotools/source/misc/fontdefs.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 875d45d8bd372cc20397b799af5eeec389f725bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 2 18:48:39 2015 +0000

    can't have an unordered_map of const OUStrings with gcc 4.8.2
    
    Change-Id: I2527088fec51e597c406077e459969359a0ab28e

diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index 37915aa..f368cc6 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -421,7 +421,7 @@ OUString GetEnglishSearchFontName(const OUString& rInName)
     // translate normalized localized name to its normalized English ASCII name
     if( bNeedTranslation )
     {
-        typedef std::unordered_map<const OUString, const char*, OUStringHash> FontNameDictionary;
+        typedef std::unordered_map<OUString, const char*, OUStringHash> FontNameDictionary;
         static FontNameDictionary aDictionary( SAL_N_ELEMENTS(aImplLocalizedNamesList) );
         // the font name dictionary needs to be intialized once
         if( aDictionary.empty() )


More information about the Libreoffice-commits mailing list