vcl/headless/svpprn.cxx | 3 +-- vcl/inc/printerinfomanager.hxx | 2 +- vcl/null/printerinfomanager.cxx | 6 ++---- vcl/qt5/QtInstance_Print.cxx | 3 +-- vcl/unx/generic/print/genprnpsp.cxx | 3 +-- vcl/unx/generic/printer/printerinfomanager.cxx | 7 ++++--- 6 files changed, 10 insertions(+), 14 deletions(-)
New commits: commit adf07500250fe30757fd468a721a8c9a8ee8f722 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 2 04:30:52 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Mar 2 17:17:11 2026 +0100 vcl: Return instead of using out param for PrinterInfoManager::listPrinters Change-Id: I6835f24d2fef8bd4be74b2c1b0d0e8bd2eaf21cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200756 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index 997148a76d2c..e0d8bae40fbb 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -168,9 +168,8 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) // #i62663# synchronize possible asynchronouse printer detection now rManager.checkPrintersChanged( true ); } - ::std::vector< OUString > aPrinters; - rManager.listPrinters( aPrinters ); + std::vector<OUString> aPrinters = rManager.listPrinters(); for (auto const& printer : aPrinters) { const PrinterInfo& rInfo( rManager.getPrinterInfo(printer) ); diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx index 1a2bf828eec8..e966f454fa6f 100644 --- a/vcl/inc/printerinfomanager.hxx +++ b/vcl/inc/printerinfomanager.hxx @@ -129,7 +129,7 @@ public: Type getType() const { return m_eType; } // lists the names of all known printers - void listPrinters( std::vector< OUString >& rVector ) const; + std::vector<OUString> listPrinters() const; // gets info about a named printer const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const; diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 171ccaa73da3..1e935a61def4 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -62,11 +62,9 @@ void PrinterInfoManager::initialize() // ??? } -void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) const +std::vector<OUString> PrinterInfoManager::listPrinters() const { - (void) this; - - rVector.clear(); + return {}; } const PrinterInfo& PrinterInfoManager::getPrinterInfo( diff --git a/vcl/qt5/QtInstance_Print.cxx b/vcl/qt5/QtInstance_Print.cxx index 397ec06c6119..195a7827b763 100644 --- a/vcl/qt5/QtInstance_Print.cxx +++ b/vcl/qt5/QtInstance_Print.cxx @@ -59,9 +59,8 @@ void QtInstance::GetPrinterQueueInfo(ImplPrnQueueList* pList) // #i62663# synchronize possible asynchronouse printer detection now rManager.checkPrintersChanged(true); } - ::std::vector<OUString> aPrinters; - rManager.listPrinters(aPrinters); + std::vector<OUString> aPrinters = rManager.listPrinters(); for (const auto& rPrinter : aPrinters) { const PrinterInfo& rInfo(rManager.getPrinterInfo(rPrinter)); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 11f4c3684c69..45dac7a898d1 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -311,9 +311,8 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) // #i62663# synchronize possible asynchronouse printer detection now rManager.checkPrintersChanged( true ); } - ::std::vector< OUString > aPrinters; - rManager.listPrinters( aPrinters ); + std::vector<OUString> aPrinters = rManager.listPrinters(); for (auto const& printer : aPrinters) { const PrinterInfo& rInfo( rManager.getPrinterInfo(printer) ); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index d2f015b205f5..5dea01c01795 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -522,11 +522,12 @@ void PrinterInfoManager::initialize() } } -void PrinterInfoManager::listPrinters( ::std::vector< OUString >& rVector ) const +std::vector<OUString> PrinterInfoManager::listPrinters() const { - rVector.clear(); + std::vector<OUString> aPrinters; for (auto const& printer : m_aPrinters) - rVector.push_back(printer.first); + aPrinters.push_back(printer.first); + return aPrinters; } const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
