[Libreoffice-commits] core.git: vcl/inc vcl/win

[Noel Grandin (via logerrit)]

 vcl/inc/salprn.hxx     |    2 +-
 vcl/win/gdi/salprn.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8774f286e8613717c620b635c93cfd7e7dffd76f
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 2 11:22:34 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 2 10:41:31 2023 +0000

    no need to allocate mpPortName separately
    
    it is only one pointer big
    
    Change-Id: I7c8c99c4dad4289e2f073d73e8b3703ee5c8e64e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148090
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index d72853b597bf..c6c7657310ca 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -42,7 +42,7 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
     OUString               maComment;
     PrintQueueFlags        mnStatus;
     sal_uInt32             mnJobs;
-    std::unique_ptr<OUString> mpPortName; // only used by Windows backend
+    std::optional<OUString> moPortName; // only used by Windows backend
 
                             SalPrinterQueueInfo();
                             ~SalPrinterQueueInfo();
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 98d39dc02455..71e4753995ae 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -207,8 +207,8 @@ void WinSalInstance::GetPrinterQueueState( 
SalPrinterQueueInfo* pInfo )
                     pInfo->maComment = o3tl::toU(pWinInfo2->pComment);
                 pInfo->mnStatus      = ImplWinQueueStatusToSal( 
pWinInfo2->Status );
                 pInfo->mnJobs        = pWinInfo2->cJobs;
-                if( ! pInfo->mpPortName )
-                    pInfo->mpPortName.reset(new OUString(aPortName));
+                if( ! pInfo->moPortName )
+                    pInfo->moPortName = aPortName;
             }
             std::free(pWinInfo2);
         }
@@ -1029,11 +1029,11 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( 
SalPrinterQueueInfo* pQueueIn
                                                    ImplJobSetup* pSetupData )
 {
     WinSalInfoPrinter* pPrinter = new WinSalInfoPrinter;
-    if( ! pQueueInfo->mpPortName )
+    if( ! pQueueInfo->moPortName )
         GetPrinterQueueState( pQueueInfo );
     pPrinter->maDriverName  = pQueueInfo->maDriver;
     pPrinter->maDeviceName  = pQueueInfo->maPrinterName;
-    pPrinter->maPortName    = pQueueInfo->mpPortName ? *pQueueInfo->mpPortName 
: OUString();
+    pPrinter->maPortName    = pQueueInfo->moPortName ? *pQueueInfo->moPortName 
: OUString();
 
     // check if the provided setup data match the actual printer
     ImplTestSalJobSetup( pPrinter, pSetupData, true );