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

Julien Nabet serval2412 at yahoo.fr
Sun Oct 22 11:12:57 UTC 2017


 vcl/unx/generic/fontmanager/fontmanager.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 93947341acb91c7ad508d1de72f5705f730d8e93
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Oct 22 12:38:51 2017 +0200

    Fix 3bf3cae9b7b4d38e0427d71a2b34629fd5988af7
    
    wrong use of emplace_back, it should be push_back here
    
    Change-Id: I729820336f4aedbebb94ce8311c8fb62aba74e92
    Reviewed-on: https://gerrit.libreoffice.org/43688
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 2c298340e3c9..dd0cfb7dc42a 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -556,10 +556,10 @@ void PrintFontManager::analyzeSfntFamilyName( void* pTTFont, ::std::vector< OUSt
     DisposeNameRecords( pNameRecords, nNameRecords );
     if( !aFamily.isEmpty() )
     {
-        rNames.emplace_back( aFamily );
+        rNames.push_back( aFamily );
         for (auto const& elem : aSet)
             if( elem != aFamily )
-                rNames.emplace_back(elem);
+                rNames.push_back(elem);
     }
 }
 
@@ -783,7 +783,7 @@ void PrintFontManager::getFontList( ::std::vector< fontID >& rFontIDs )
     std::unordered_map< fontID, PrintFont* >::const_iterator it;
 
     for (auto const& font : m_aFonts)
-        rFontIDs.emplace_back(font.first);
+        rFontIDs.push_back(font.first);
 }
 
 void PrintFontManager::fillPrintFontInfo(PrintFont* pFont, FastPrintFontInfo& rInfo)


More information about the Libreoffice-commits mailing list