summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2024-05-03 09:01:42 -0400
committerMiklos Vajna <vmiklos@collabora.com>2024-05-08 09:38:54 +0200
commitddc4cd3d0cf9e8bde440df3e92e98a2a2017c797 (patch)
treefce73b5ce74b7fefb64efb95ce25e3e93e660926
parentaf3d52e444595a4a3b50528c0f02fa798e7a2b08 (diff)
NFC dispatchwatcher.hxx: rename aPrinterName to aParam
It is rather confusing to have a generic parameter variable named aPrinterName. I'm going to use that in my patch, so first clean it up separately. Change-Id: I3e73eeddbc506d369ba5d6e2b569d30eef78bfb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167059 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--desktop/source/app/dispatchwatcher.cxx6
-rw-r--r--desktop/source/app/dispatchwatcher.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 3b112cdc298b..7a5db6b9319b 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -565,7 +565,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
// FIXME: factor out into a method ...
Reference< XStorable > xStorable( xDoc, UNO_QUERY );
if ( xStorable.is() ) {
- OUString aParam = aDispatchRequest.aPrinterName;
+ const OUString& aParam = aDispatchRequest.aParam;
sal_Int32 nPathIndex = aParam.lastIndexOf( ';' );
sal_Int32 nFilterIndex = aParam.indexOf( ':' );
sal_Int32 nImgFilterIndex = aParam.lastIndexOf( '|' );
@@ -745,7 +745,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
}
else if ( aDispatchRequest.aRequestType == REQUEST_BATCHPRINT )
{
- batchPrint( aDispatchRequest.aPrinterName, xDoc, aObj, aName );
+ batchPrint(aDispatchRequest.aParam, xDoc, aObj, aName);
}
else
{
@@ -753,7 +753,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
{
// create the printer
Sequence < PropertyValue > aPrinterArgs{ comphelper::makePropertyValue(
- u"Name"_ustr, aDispatchRequest.aPrinterName) };
+ u"Name"_ustr, aDispatchRequest.aParam) };
xDoc->setPrinter( aPrinterArgs );
}
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 70a7fd42e679..9a970cf82dce 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -59,7 +59,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
RequestType aRequestType;
OUString aURL;
std::optional< OUString > aCwdUrl;
- OUString aPrinterName; // also conversion params
+ OUString aParam;
OUString aPreselectedFactory;
};