vcl/source/app/dbggui.cxx | 4 ++-- vcl/source/app/session.cxx | 2 +- vcl/source/app/svapp.cxx | 25 +++++++++---------------- vcl/source/bitmap/BitmapInfoAccess.cxx | 2 +- vcl/source/bitmap/alpha.cxx | 2 +- vcl/source/bitmap/bitmap.cxx | 18 +++++++++--------- vcl/source/bitmap/bitmappaint.cxx | 2 +- vcl/source/components/dtranscomp.cxx | 2 +- vcl/source/gdi/print.cxx | 11 ++++------- vcl/source/gdi/print3.cxx | 6 +++--- vcl/source/gdi/virdev.cxx | 4 +--- vcl/source/opengl/OpenGLContext.cxx | 2 +- vcl/source/opengl/OpenGLHelper.cxx | 2 +- vcl/source/window/builder.cxx | 20 ++++++++++---------- vcl/source/window/menu.cxx | 8 ++++---- vcl/source/window/menuitemlist.cxx | 4 ++-- vcl/source/window/mouse.cxx | 2 +- vcl/source/window/syschild.cxx | 6 +++--- 18 files changed, 55 insertions(+), 67 deletions(-)
New commits: commit f60f26f16dfc3eb6c69f4f5a452f56809036c55a Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 27 10:35:11 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 09:09:53 2026 +0100 vcl: Reuse existing GetSalInstance Replace various `ImplGetSVData()->mpDefInst` by using the existing GetSalInstance function that returns exactly that. Change-Id: Idef8bbdf67888dbfae1f3796428a41ccc8606d27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200574 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index ee1a0b72dbd9..3ac2168703f7 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -33,9 +33,9 @@ using namespace ::com::sun::star; static void ImplDbgTestSolarMutex(bool owned) { if (owned) { - assert(ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && "SolarMutex not owned!"); + assert(GetSalInstance()->GetYieldMutex()->IsCurrentThread() && "SolarMutex not owned!"); } else { - assert(!ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && "SolarMutex owned!"); + assert(!GetSalInstance()->GetYieldMutex()->IsCurrentThread() && "SolarMutex owned!"); } } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 1642e3912aaa..c8d4de0c333b 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -111,7 +111,7 @@ public: } VCLSession::VCLSession() - : m_xSession( ImplGetSVData()->mpDefInst->CreateSalSession() ), + : m_xSession(GetSalInstance()->CreateSalSession()), m_bInteractionRequested( false ), m_bInteractionGranted( false ), m_bInteractionDone( false ), diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 09e911db9d6d..e02926688116 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -507,7 +507,7 @@ void Application::Yield() IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*, void ) { assert(ImplGetSVData()->maAppData.mbAppQuit); - ImplGetSVData()->mpDefInst->DoQuit(); + GetSalInstance()->DoQuit(); } void Application::Quit() @@ -518,8 +518,7 @@ void Application::Quit() comphelper::SolarMutex& Application::GetSolarMutex() { - ImplSVData* pSVData = ImplGetSVData(); - return *(pSVData->mpDefInst->GetYieldMutex()); + return *(GetSalInstance()->GetYieldMutex()); } bool Application::IsMainThread() @@ -529,14 +528,12 @@ bool Application::IsMainThread() sal_uInt32 Application::ReleaseSolarMutex() { - ImplSVData* pSVData = ImplGetSVData(); - return pSVData->mpDefInst->ReleaseYieldMutex(true); + return GetSalInstance()->ReleaseYieldMutex(true); } void Application::AcquireSolarMutex( sal_uInt32 nCount ) { - ImplSVData* pSVData = ImplGetSVData(); - pSVData->mpDefInst->AcquireYieldMutex( nCount ); + GetSalInstance()->AcquireYieldMutex( nCount ); } bool Application::IsInMain() @@ -567,7 +564,7 @@ sal_uInt16 Application::GetDispatchLevel() bool Application::AnyInput( VclInputFlags nType ) { - return ImplGetSVData()->mpDefInst->AnyInput( nType ); + return GetSalInstance()->AnyInput( nType ); } sal_uInt64 Application::GetLastInputInterval() @@ -1663,8 +1660,7 @@ const OUString& Application::GetDesktopEnvironment() void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) { - ImplSVData* pSVData = ImplGetSVData(); - pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService); + GetSalInstance()->AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService); } // MT: AppEvent was in oldsv.cxx, but is still needed... @@ -1674,22 +1670,19 @@ void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ ) bool Application::hasNativeFileSelection() { - ImplSVData* pSVData = ImplGetSVData(); - return pSVData->mpDefInst->hasNativeFileSelection(); + return GetSalInstance()->hasNativeFileSelection(); } Reference< ui::dialogs::XFilePicker2 > Application::createFilePicker( const Reference< uno::XComponentContext >& xSM ) { - ImplSVData* pSVData = ImplGetSVData(); - return pSVData->mpDefInst->createFilePicker( xSM ); + return GetSalInstance()->createFilePicker( xSM ); } Reference< ui::dialogs::XFolderPicker2 > Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM ) { - ImplSVData* pSVData = ImplGetSVData(); - return pSVData->mpDefInst->createFolderPicker( xSM ); + return GetSalInstance()->createFolderPicker(xSM); } void Application::setDeInitHook(Link<LinkParamNone*,void> const & hook) { diff --git a/vcl/source/bitmap/BitmapInfoAccess.cxx b/vcl/source/bitmap/BitmapInfoAccess.cxx index 7ffe58393286..00007d513402 100644 --- a/vcl/source/bitmap/BitmapInfoAccess.cxx +++ b/vcl/source/bitmap/BitmapInfoAccess.cxx @@ -54,7 +54,7 @@ BitmapInfoAccess::BitmapInfoAccess(const Bitmap& rBitmap, BitmapAccessMode nMode if (!mpBuffer) { - std::shared_ptr<SalBitmap> xNewImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xNewImpBmp(GetSalInstance()->CreateSalBitmap()); if (xNewImpBmp->Create(*xImpBmp)) { xImpBmp = std::move(xNewImpBmp); diff --git a/vcl/source/bitmap/alpha.cxx b/vcl/source/bitmap/alpha.cxx index 52372c5d9139..48370db6976b 100644 --- a/vcl/source/bitmap/alpha.cxx +++ b/vcl/source/bitmap/alpha.cxx @@ -92,7 +92,7 @@ void AlphaMask::Erase( sal_uInt8 cTransparency ) void AlphaMask::BlendWith(const AlphaMask& rOther) { - std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpBmp(GetSalInstance()->CreateSalBitmap()); if (xImpBmp->Create(*maBitmap.ImplGetSalBitmap()) && xImpBmp->AlphaBlendWith(*rOther.maBitmap.ImplGetSalBitmap())) { maBitmap.ImplSetSalBitmap(xImpBmp); diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 25a2e85404d0..fe3610b0f504 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -142,7 +142,7 @@ Bitmap::Bitmap( const Size& rSizePixel, vcl::PixelFormat ePixelFormat, const Bit } } - mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); + mxSalBmp = GetSalInstance()->CreateSalBitmap(); mxSalBmp->Create(rSizePixel, ePixelFormat, *pPal); } @@ -154,7 +154,7 @@ static Bitmap createBitmapFromColorAndAlpha(const Bitmap& rColorBitmap, const Bi { Size aSize = rColorBitmap.GetSizePixel(); static const BitmapPalette aPalEmpty; - std::shared_ptr<SalBitmap> xSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); + std::shared_ptr<SalBitmap> xSalBmp = GetSalInstance()->CreateSalBitmap(); const bool bSuccess = xSalBmp->Create(aSize, vcl::PixelFormat::N32_BPP, aPalEmpty); if (!bSuccess) { @@ -511,7 +511,7 @@ BitmapChecksum Bitmap::GetChecksum() const // the buffer in SalBitmap::updateChecksum; // so, we need to update the imp bitmap for this bitmap instance // as we do in BitmapInfoAccess::ImplCreate - std::shared_ptr<SalBitmap> xNewImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xNewImpBmp(GetSalInstance()->CreateSalBitmap()); if (xNewImpBmp->Create(*mxSalBmp)) { Bitmap* pThis = const_cast<Bitmap*>(this); @@ -528,7 +528,7 @@ void Bitmap::ImplMakeUnique() if (mxSalBmp && mxSalBmp.use_count() > 1) { std::shared_ptr<SalBitmap> xOldImpBmp = mxSalBmp; - mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); + mxSalBmp = GetSalInstance()->CreateSalBitmap(); (void)mxSalBmp->Create(*xOldImpBmp); } } @@ -874,7 +874,7 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay ) const if( mxSalBmp && pDispGraphics ) { - std::shared_ptr<SalBitmap> xImpDispBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpDispBmp(GetSalInstance()->CreateSalBitmap()); if (xImpDispBmp->Create(*mxSalBmp, *pDispGraphics)) aDispBmp.ImplSetSalBitmap(xImpDispBmp); } @@ -898,7 +898,7 @@ bool Bitmap::Convert( BmpConversion eConversion ) { if (mxSalBmp->GetBitCount() == 8 && HasGreyPalette8Bit()) return true; - std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpBmp(GetSalInstance()->CreateSalBitmap()); // frequently used conversion for creating alpha masks if (xImpBmp->Create(*mxSalBmp) && xImpBmp->InterpretAs8Bit()) { @@ -909,7 +909,7 @@ bool Bitmap::Convert( BmpConversion eConversion ) } if (eConversion == BmpConversion::N8BitGreys) { - std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpBmp(GetSalInstance()->CreateSalBitmap()); if (xImpBmp->Create(*mxSalBmp) && xImpBmp->ConvertToGreyscale()) { ImplSetSalBitmap(xImpBmp); @@ -1413,7 +1413,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n if (mxSalBmp && mxSalBmp->ScalingSupported()) { // implementation specific scaling - std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpBmp(GetSalInstance()->CreateSalBitmap()); if (xImpBmp->Create(*mxSalBmp) && xImpBmp->Scale(rScaleX, rScaleY, nScaleFlag)) { ImplSetSalBitmap(xImpBmp); @@ -2310,7 +2310,7 @@ bool Bitmap::Create( const css::uno::Reference< css::rendering::XBitmapCanvas > } } - std::shared_ptr<SalBitmap> pSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap(); + std::shared_ptr<SalBitmap> pSalBmp = GetSalInstance()->CreateSalBitmap(); Size aLocalSize(rSize); if( pSalBmp->Create( xBitmapCanvas, aLocalSize ) ) { diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index 4c0896e32fb4..fcab4d8531f8 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -44,7 +44,7 @@ bool Bitmap::Erase(const Color& rFillColor) return true; // implementation specific replace - std::shared_ptr<SalBitmap> xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap()); + std::shared_ptr<SalBitmap> xImpBmp(GetSalInstance()->CreateSalBitmap()); if (xImpBmp->Create(*mxSalBmp) && xImpBmp->Erase(rFillColor)) { ImplSetSalBitmap(xImpBmp); diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 569c6274d8d0..850d06a89533 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -191,7 +191,7 @@ vcl_SystemClipboard_get_implementation( css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const& args) { SolarMutexGuard aGuard; - auto xClipboard = ImplGetSVData()->mpDefInst->CreateClipboard( args ); + auto xClipboard = GetSalInstance()->CreateClipboard( args ); if (xClipboard.is()) xClipboard->acquire(); return xClipboard.get(); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 0cd6103e5360..b8c7ce531320 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -411,11 +411,8 @@ OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); if( !pEnv || !*pEnv ) - { - ImplSVData* pSVData = ImplGetSVData(); + return GetSalInstance()->GetDefaultPrinter(); - return pSVData->mpDefInst->GetDefaultPrinter(); - } return OUString(); } @@ -590,9 +587,9 @@ void Printer::ReleaseGraphics(bool bRelease) void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) { - ImplSVData* pSVData = ImplGetSVData(); + SalInstance* pSalInstance = GetSalInstance(); // #i74084# update info for this specific SalPrinterQueueInfo - pSVData->mpDefInst->GetPrinterQueueState( pInfo ); + pSalInstance->GetPrinterQueueState(pInfo); // Test whether the driver actually matches the JobSetup ImplJobSetup& rData = maJobSetup.ImplGetData(); @@ -613,7 +610,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) rData.SetPrinterName( maPrinterName ); rData.SetDriver( maDriver ); - mpInfoPrinter = pSVData->mpDefInst->CreateInfoPrinter( pInfo, &rData ); + mpInfoPrinter = pSalInstance->CreateInfoPrinter(pInfo, &rData); mpPrinter = nullptr; mpJobGraphics = nullptr; ImplUpdateJobSetupPaper( maJobSetup ); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index cfd4cf77d927..eb6043b3e46c 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -648,8 +648,8 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer else bCollateCopy = false; - ImplSVData* pSVData = ImplGetSVData(); - mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter ); + SalInstance* pSalInstance = GetSalInstance(); + mpPrinter = pSalInstance->CreatePrinter( mpInfoPrinter ); if (!mpPrinter) return false; @@ -782,7 +782,7 @@ bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::Printer if( nJobIteration < nJobs-1 ) { - mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter ); + mpPrinter = pSalInstance->CreatePrinter(mpInfoPrinter); if ( mpPrinter ) mbPrinting = true; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 31ce1680660c..0b68c5a56fad 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -301,15 +301,13 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra else { std::unique_ptr<SalVirtualDevice> pNewVirDev; - ImplSVData* pSVData = ImplGetSVData(); - // we need a graphics if ( !mpGraphics && !AcquireGraphics() ) return false; assert(mpGraphics); - pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormatAndAlpha, bAlphaMaskTransparent); + pNewVirDev = GetSalInstance()->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormatAndAlpha, bAlphaMaskTransparent); if ( pNewVirDev ) { SalGraphics* pGraphics = pNewVirDev->AcquireGraphics(); diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index e68e66564db2..a12e384da572 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -93,7 +93,7 @@ void OpenGLContext::dispose() rtl::Reference<OpenGLContext> OpenGLContext::Create() { - return rtl::Reference<OpenGLContext>(ImplGetSVData()->mpDefInst->CreateOpenGLContext()); + return rtl::Reference<OpenGLContext>(GetSalInstance()->CreateOpenGLContext()); } void OpenGLContext::requestLegacyContext() diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index efd85ce24f03..f4ede6f79e18 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -742,7 +742,7 @@ bool OpenGLHelper::supportsOpenGL() { if( getenv("SAL_DISABLEGL") != nullptr ) return false; - if (!ImplGetSVData()->mpDefInst->supportsOpenGL()) + if (!GetSalInstance()->supportsOpenGL()) return false; if( isDeviceDenylisted()) return false; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 997b0ce56c86..acc23034ef6f 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -191,7 +191,7 @@ void Application::EnableUICoverage(bool bEnable) { bEnableUICoverage = bEnable; if (!bEnableUICoverage) - ImplGetSVData()->mpDefInst->getUsedUIList().clear(); + GetSalInstance()->getUsedUIList().clear(); } void Application::UICoverageReport(tools::JsonWriter& rJson, @@ -200,7 +200,7 @@ void Application::UICoverageReport(tools::JsonWriter& rJson, { auto resultNode = rJson.startNode("result"); - const auto& entries = ImplGetSVData()->mpDefInst->getUsedUIList(); + const auto& entries = GetSalInstance()->getUsedUIList(); if (!entries.empty()) { auto childrenNode = rJson.startArray("used"); @@ -266,10 +266,10 @@ void Application::UICoverageReport(tools::JsonWriter& rJson, std::unique_ptr<weld::Builder> Application::CreateBuilder(weld::Widget* pParent, const OUString &rUIFile, bool bMobile, sal_uInt64 nLOKWindowId) { - ImplSVData* pSVData = ImplGetSVData(); + SalInstance* pSalInstance = GetSalInstance(); if (bEnableUICoverage) - pSVData->mpDefInst->getUsedUIList().insert(rUIFile); + pSalInstance->getUsedUIList().insert(rUIFile); if (comphelper::LibreOfficeKit::isActive() && !jsdialog::isIgnored(rUIFile)) { @@ -292,15 +292,15 @@ std::unique_ptr<weld::Builder> Application::CreateBuilder(weld::Widget* pParent, SAL_WARN("vcl", "UI file not enabled for JSDialogs: " << rUIFile); } - return pSVData->mpDefInst->CreateBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile); + return pSalInstance->CreateBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile); } std::unique_ptr<weld::Builder> Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile, bool bAllowCycleFocusOut, sal_uInt64 nLOKWindowId) { - ImplSVData* pSVData = ImplGetSVData(); + SalInstance* pSalInstance = GetSalInstance(); if (bEnableUICoverage) - pSVData->mpDefInst->getUsedUIList().insert(rUIFile); + pSalInstance->getUsedUIList().insert(rUIFile); if (comphelper::LibreOfficeKit::isActive() && !jsdialog::isIgnored(rUIFile)) { @@ -317,7 +317,7 @@ std::unique_ptr<weld::Builder> Application::CreateInterimBuilder(vcl::Window* pP SAL_WARN("vcl", "UI file not enabled for JSDialogs: " << rUIFile); } - return pSVData->mpDefInst->CreateInterimBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, bAllowCycleFocusOut, nLOKWindowId); + return pSalInstance->CreateInterimBuilder(pParent, AllSettings::GetUIRootDir(), rUIFile, bAllowCycleFocusOut, nLOKWindowId); } weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, @@ -327,12 +327,12 @@ weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, Vcl if (comphelper::LibreOfficeKit::isActive()) return JSInstanceBuilder::CreateMessageDialog(pParent, eMessageType, eButtonType, rPrimaryMessage, pNotifier); else - return ImplGetSVData()->mpDefInst->CreateMessageDialog(pParent, eMessageType, eButtonType, rPrimaryMessage); + return GetSalInstance()->CreateMessageDialog(pParent, eMessageType, eButtonType, rPrimaryMessage); } weld::Window* Application::GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow) { - return ImplGetSVData()->mpDefInst->GetFrameWeld(rWindow); + return GetSalInstance()->GetFrameWeld(rWindow); } // static diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 9302da36c5fc..786382093114 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2414,7 +2414,7 @@ MenuBar::MenuBar() mbHideBtnVisible(false), mbDisplayable(true) { - mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this); + mpSalMenu = GetSalInstance()->CreateMenu(true, this); } MenuBar::MenuBar( const MenuBar& rMenu ) @@ -2423,7 +2423,7 @@ MenuBar::MenuBar( const MenuBar& rMenu ) mbHideBtnVisible(false), mbDisplayable(true) { - mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this); + mpSalMenu = GetSalInstance()->CreateMenu(true, this); *this = rMenu; } @@ -2735,12 +2735,12 @@ MenuFloatingWindow * PopupMenu::ImplGetFloatingWindow() const { PopupMenu::PopupMenu() { - mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this); + mpSalMenu = GetSalInstance()->CreateMenu(false, this); } PopupMenu::PopupMenu( const PopupMenu& rMenu ) { - mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this); + mpSalMenu = GetSalInstance()->CreateMenu(false, this); *this = rMenu; } diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 9a196a6723bb..a1c26c3d3edc 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -94,7 +94,7 @@ MenuItemData* MenuItemList::Insert( aSalMIData.aText = rStr; // Native-support: returns NULL if not supported - pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( aSalMIData ); + pData->pSalMenuItem = GetSalInstance()->CreateMenuItem(aSalMIData); if( nPos < maItemList.size() ) { maItemList.insert( maItemList.begin() + nPos, std::unique_ptr<MenuItemData>(pData) ); @@ -127,7 +127,7 @@ void MenuItemList::InsertSeparator(const OUString &rIdent, size_t nPos) aSalMIData.aImage = Image(); // Native-support: returns NULL if not supported - pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( aSalMIData ); + pData->pSalMenuItem = GetSalInstance()->CreateMenuItem(aSalMIData); if( nPos < maItemList.size() ) { maItemList.insert( maItemList.begin() + nPos, std::unique_ptr<MenuItemData>(pData) ); diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index bed2e403bf09..5e52c3be7279 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -723,7 +723,7 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource() try { - SalInstance* pInst = ImplGetSVData()->mpDefInst; + SalInstance* pInst = GetSalInstance(); mpWindowImpl->mpFrameData->mxDragSource = pInst->CreateDragSource(*pEnvData); mpWindowImpl->mpFrameData->mxDropTarget = pInst->CreateDropTarget(*pEnvData); } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index c03df17ba1d5..46a4f3a4022a 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -86,7 +86,7 @@ static void ImplSysChildProc( SystemChildWindow* pInst, SalObjEvent nEvent ) void SystemChildWindow::ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { - mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow ); + mpWindowImpl->mpSysObj = GetSalInstance()->CreateObject(pParent->ImplGetFrame(), pData, bShow); Window::ImplInit( pParent, nStyle, nullptr ); @@ -121,7 +121,7 @@ void SystemChildWindow::dispose() Hide(); if ( mpWindowImpl && mpWindowImpl->mpSysObj ) { - ImplGetSVData()->mpDefInst->DestroyObject( mpWindowImpl->mpSysObj ); + GetSalInstance()->DestroyObject( mpWindowImpl->mpSysObj ); mpWindowImpl->mpSysObj = nullptr; } Window::dispose(); @@ -182,7 +182,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle() const void* SystemChildWindow::CreateGStreamerSink() { - return ImplGetSVData()->mpDefInst->CreateGStreamerSink(this); + return GetSalInstance()->CreateGStreamerSink(this); } #if defined( MACOSX )
