Kaydet (Commit) 61bddaff authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Noel Grandin
üst 5807952e
...@@ -576,8 +576,8 @@ PrinterJob::StartPage (const JobData& rJobSetup) ...@@ -576,8 +576,8 @@ PrinterJob::StartPage (const JobData& rJobSetup)
osl::File* pPageHeader = CreateSpoolFile ( "psp_pghead", aExt); osl::File* pPageHeader = CreateSpoolFile ( "psp_pghead", aExt);
osl::File* pPageBody = CreateSpoolFile ( "psp_pgbody", aExt); osl::File* pPageBody = CreateSpoolFile ( "psp_pgbody", aExt);
maHeaderVector.emplace_back (pPageHeader); maHeaderVector.push_back (pPageHeader);
maPageVector.emplace_back (pPageBody); maPageVector.push_back (pPageBody);
if( ! (pPageHeader && pPageBody) ) if( ! (pPageHeader && pPageBody) )
return; return;
......
...@@ -584,7 +584,7 @@ const PPDParser* PPDParser::getParser( const OUString& rFile ) ...@@ -584,7 +584,7 @@ const PPDParser* PPDParser::getParser( const OUString& rFile )
[pNewParser] (std::unique_ptr<PPDParser> const & x) { return x.get() == pNewParser; } ), [pNewParser] (std::unique_ptr<PPDParser> const & x) { return x.get() == pNewParser; } ),
rPPDCache.aAllParsers.end()); rPPDCache.aAllParsers.end());
// insert new parser to vector // insert new parser to vector
rPPDCache.aAllParsers.emplace_back( std::unique_ptr<PPDParser>(pNewParser) ); rPPDCache.aAllParsers.emplace_back(pNewParser);
} }
return pNewParser; return pNewParser;
} }
......
...@@ -463,7 +463,7 @@ void PrinterInfoManager::initialize() ...@@ -463,7 +463,7 @@ void PrinterInfoManager::initialize()
if( find_it != m_aPrinters.end() ) if( find_it != m_aPrinters.end() )
{ {
aPrinter.m_aAlternateFiles = find_it->second.m_aAlternateFiles; 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; m_aPrinters[ aPrinterName ] = aPrinter;
} }
...@@ -629,7 +629,7 @@ bool PrinterInfoManager::writePrinterConfig() ...@@ -629,7 +629,7 @@ bool PrinterInfoManager::writePrinterConfig()
// update alternate file list // update alternate file list
// be sure m_aAlternateFiles doesn't contain the m_aFile value // be sure m_aAlternateFiles doesn't contain the m_aFile value
it->second.m_aAlternateFiles.erase( files.begin()->first ); 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 // update file
it->second.m_aFile = files.begin()->first; it->second.m_aFile = files.begin()->first;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment