vcl/source/gdi/print.cxx | 8 +++----- vcl/win/dtrans/WinClipboard.cxx | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit d8bb03dc7cace8ad97daadb183184d0b713bc92e Author: Mike Kaganski <[email protected]> AuthorDate: Sat Feb 28 17:12:48 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Feb 28 19:03:15 2026 +0100 vcl: Reuse existing GetSalInstance Similar to commit f60f26f16dfc3eb6c69f4f5a452f56809036c55a (vcl: Reuse existing GetSalInstance, 2026-02-28). Change-Id: Iaa107635d7bf6658e84fefc13a70a19c59fdbb43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200680 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index b8c7ce531320..dca4aed24d80 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -879,7 +879,7 @@ void Printer::dispose() ImplReleaseGraphics(); if ( mpInfoPrinter ) - ImplGetSVData()->mpDefInst->DestroyInfoPrinter( mpInfoPrinter ); + GetSalInstance()->DestroyInfoPrinter(mpInfoPrinter); if ( mpDisplayDev ) mpDisplayDev.disposeAndClear(); else @@ -1016,8 +1016,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) if ( IsJobActive() || IsPrinting() ) return false; - ImplSVData* pSVData = ImplGetSVData(); - mbDefPrinter = pPrinter->mbDefPrinter; maPrintFile = pPrinter->maPrintFile; mbPrintFile = pPrinter->mbPrintFile; @@ -1032,7 +1030,7 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) if ( !IsDisplayPrinter() ) { ReleaseGraphics(); - pSVData->mpDefInst->DestroyInfoPrinter( mpInfoPrinter ); + GetSalInstance()->DestroyInfoPrinter(mpInfoPrinter); mpFontInstance.clear(); mpFontFaceCollection.reset(); // clean up font list @@ -1059,7 +1057,7 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) } else { - pSVData->mpDefInst->DestroyInfoPrinter( mpInfoPrinter ); + GetSalInstance()->DestroyInfoPrinter(mpInfoPrinter); mpFontInstance.clear(); mpFontFaceCollection.reset(); diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx index 59b13c16e0cb..0caa138918fb 100644 --- a/vcl/win/dtrans/WinClipboard.cxx +++ b/vcl/win/dtrans/WinClipboard.cxx @@ -366,8 +366,7 @@ dtrans_CWinClipboard_get_implementation(css::uno::XComponentContext* context, if (bRunningUnitTest) { SolarMutexGuard aGuard; - auto xClipboard - = ImplGetSVData()->mpDefInst->CreateClipboard(ClipboardSelectionType::Clipboard); + auto xClipboard = GetSalInstance()->CreateClipboard(ClipboardSelectionType::Clipboard); if (xClipboard.is()) xClipboard->acquire(); return xClipboard.get();
