[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win

[Noel Grandin]

 vcl/headless/svpprn.cxx             |    1 -
 vcl/inc/salprn.hxx                  |    2 +-
 vcl/osx/salinst.cxx                 |    1 -
 vcl/qt5/Qt5Instance_Print.cxx       |    1 -
 vcl/source/gdi/print.cxx            |    1 -
 vcl/unx/generic/print/genprnpsp.cxx |    1 -
 vcl/win/gdi/salprn.cxx              |   12 ++++--------
 7 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 7e45b80b7a0c83b7d6e8dab39dfbfe05012e145d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Jun 8 13:40:33 2018 +0200

    rename SalPrinterQueueInfo::mpSysData to mpPortName
    
    and simplify, most places can just leave it alone
    
    Change-Id: Id938ec12d21ef244a15b5e5a72626c5ad0d0e124
    Reviewed-on: https://gerrit.libreoffice.org/55499
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 7b661c1d58e0..fd325227e1f7 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -218,7 +218,6 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         pInfo->maDriver         = rInfo.m_aDriverName;
         pInfo->maLocation       = rInfo.m_aLocation;
         pInfo->maComment        = rInfo.m_aComment;
-        pInfo->mpSysData        = nullptr;
 
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 780217d33ae1..014f61179b47 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -41,7 +41,7 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
     OUString               maComment;
     PrintQueueFlags        mnStatus;
     sal_uLong              mnJobs;
-    OUString*              mpSysData;
+    std::unique_ptr<OUString> mpPortName; // only used by Windows backend
 
                             SalPrinterQueueInfo();
                             ~SalPrinterQueueInfo();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 08302f8150ed..03d3f7a2663f 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -819,7 +819,6 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
                 pInfo->maDriver     = GetOUString( pType );
             pInfo->mnStatus         = PrintQueueFlags::NONE;
             pInfo->mnJobs           = 0;
-            pInfo->mpSysData        = nullptr;
 
             pList->Add( pInfo );
         }
diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx
index e1b6bdc158c3..bc236fc746af 100644
--- a/vcl/qt5/Qt5Instance_Print.cxx
+++ b/vcl/qt5/Qt5Instance_Print.cxx
@@ -216,7 +216,6 @@ void Qt5Instance::GetPrinterQueueInfo(ImplPrnQueueList* pList)
         pInfo->maDriver = rInfo.m_aDriverName;
         pInfo->maLocation = rInfo.m_aLocation;
         pInfo->maComment = rInfo.m_aComment;
-        pInfo->mpSysData = nullptr;
 
         sal_Int32 nIndex = 0;
         while (nIndex != -1)
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index aeed0625d7fa..a98d26589c8b 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -344,7 +344,6 @@ SalPrinterQueueInfo::SalPrinterQueueInfo()
 {
     mnStatus    = PrintQueueFlags::NONE;
     mnJobs      = QUEUE_JOBS_DONTKNOW;
-    mpSysData   = nullptr;
 }
 
 SalPrinterQueueInfo::~SalPrinterQueueInfo()
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 7a36e3196b9a..d30a518457b5 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -424,7 +424,6 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
         pInfo->maDriver         = rInfo.m_aDriverName;
         pInfo->maLocation       = rInfo.m_aLocation;
         pInfo->maComment        = rInfo.m_aComment;
-        pInfo->mpSysData        = nullptr;
 
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0027263b5af9..0f16b32ab530 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -166,7 +166,6 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
                 pInfo->maPrinterName = o3tl::toU(pWinInfo4[i].pPrinterName);
                 pInfo->mnStatus      = PrintQueueFlags::NONE;
                 pInfo->mnJobs        = 0;
-                pInfo->mpSysData     = nullptr;
                 pList->Add( pInfo );
             }
         }
@@ -202,8 +201,8 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
                     pInfo->maComment = o3tl::toU(pWinInfo2->pComment);
                 pInfo->mnStatus      = ImplWinQueueStatusToSal( pWinInfo2->Status );
                 pInfo->mnJobs        = pWinInfo2->cJobs;
-                if( ! pInfo->mpSysData )
-                    pInfo->mpSysData = new OUString(aPortName);
+                if( ! pInfo->mpPortName )
+                    pInfo->mpPortName.reset(new OUString(aPortName));
             }
             rtl_freeMemory(pWinInfo2);
         }
@@ -213,7 +212,6 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
 
 void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 {
-    delete pInfo->mpSysData;
     delete pInfo;
 }
 
@@ -1060,13 +1058,11 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
                                                    ImplJobSetup* pSetupData )
 {
     WinSalInfoPrinter* pPrinter = new WinSalInfoPrinter;
-    if( ! pQueueInfo->mpSysData )
+    if( ! pQueueInfo->mpPortName )
         GetPrinterQueueState( pQueueInfo );
     pPrinter->maDriverName  = pQueueInfo->maDriver;
     pPrinter->maDeviceName  = pQueueInfo->maPrinterName;
-    pPrinter->maPortName    = pQueueInfo->mpSysData ?
-                                *pQueueInfo->mpSysData
-                              : OUString();
+    pPrinter->maPortName    = pQueueInfo->mpPortName ? *pQueueInfo->mpPortName : OUString();
 
     // check if the provided setup data match the actual printer
     ImplTestSalJobSetup( pPrinter, pSetupData, true );