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

[Julien Nabet]

 vcl/unx/generic/print/printerjob.cxx           |    4 ++--
 vcl/unx/generic/printer/ppdparser.cxx          |    2 +-
 vcl/unx/generic/printer/printerinfomanager.cxx |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 61bddaff3380f7700f58a41adedf8befd34d4d91
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Oct 22 10:59:45 2017 +0200

    Fix wrong use of emplace/emplace_back
    
    after these patches:
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=ea6858c1e388c2d17a0825f3d21353ded67083eb
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=118a0a3734a3f794c67a9d7d4376d8ed78a96fee
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=c16804de78b1cf1ad906eaacbcc7c51d35218d8a
    
    Change-Id: I287d64d3aef6cf18fbf20602680ae9ead0ab26e5
    Reviewed-on: https://gerrit.libreoffice.org/43687
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index c3005fca8de7..e4b3f8912253 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -576,8 +576,8 @@ PrinterJob::StartPage (const JobData& rJobSetup)
     osl::File* pPageHeader = CreateSpoolFile ( "psp_pghead", aExt);
     osl::File* pPageBody   = CreateSpoolFile ( "psp_pgbody", aExt);
 
-    maHeaderVector.emplace_back (pPageHeader);
-    maPageVector.emplace_back (pPageBody);
+    maHeaderVector.push_back (pPageHeader);
+    maPageVector.push_back (pPageBody);
 
     if( ! (pPageHeader && pPageBody) )
         return;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 6c9afb9d109e..292010dfec8c 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -584,7 +584,7 @@ const PPDParser* PPDParser::getParser( const OUString& rFile )
                     [pNewParser] (std::unique_ptr<PPDParser> const & x) { return x.get() == pNewParser; } ),
                 rPPDCache.aAllParsers.end());
         // insert new parser to vector
-        rPPDCache.aAllParsers.emplace_back( std::unique_ptr<PPDParser>(pNewParser) );
+        rPPDCache.aAllParsers.emplace_back(pNewParser);
     }
     return pNewParser;
 }
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index ac5779a6ae57..9b8274069fd3 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -463,7 +463,7 @@ void PrinterInfoManager::initialize()
                 if( find_it != m_aPrinters.end() )
                 {
                     aPrinter.m_aAlternateFiles = find_it->second.m_aAlternateFiles;
-                    aPrinter.m_aAlternateFiles.emplace( find_it->second.m_aFile );
+                    aPrinter.m_aAlternateFiles.insert( find_it->second.m_aFile );
                 }
                 m_aPrinters[ aPrinterName ] = aPrinter;
             }
@@ -629,7 +629,7 @@ bool PrinterInfoManager::writePrinterConfig()
                     // update alternate file list
                     // be sure m_aAlternateFiles doesn't contain the m_aFile value
                     it->second.m_aAlternateFiles.erase( files.begin()->first );
-                    it->second.m_aAlternateFiles.emplace( it->second.m_aFile );
+                    it->second.m_aAlternateFiles.insert( it->second.m_aFile );
                     // update file
                     it->second.m_aFile = files.begin()->first;
                 }