cui/source/dialogs/about.cxx | 6 +++--- cui/source/dialogs/whatsnewtabpage.cxx | 2 +- include/sfx2/app.hxx | 2 +- include/vcl/introwin.hxx | 3 --- sfx2/source/appl/appmisc.cxx | 6 +++--- sfx2/source/dialog/backingwindow.cxx | 2 +- vcl/source/window/introwin.cxx | 9 ++------- 7 files changed, 11 insertions(+), 19 deletions(-)
New commits: commit cc52c23b5351b7df418c8a6a503ce37cb21dcf61 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Nov 21 10:12:44 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 21 15:53:39 2025 +0100 vcl: Merge IntroWindow::ImplInitIntroWindowData into ctor Change-Id: I27fd2b7ae3d9f2dacf55119876b28f7878909cd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194311 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index d53d4e019093..22a21e0a237a 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -25,9 +25,6 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) IntroWindow : public WorkWindow { -private: - SAL_DLLPRIVATE void ImplInitIntroWindowData(); - public: IntroWindow(); virtual ~IntroWindow() override; diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 3ac75eab0d7e..386fb7db84dc 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -22,16 +22,11 @@ #include <svdata.hxx> -void IntroWindow::ImplInitIntroWindowData() -{ - ImplSVData* pSVData = ImplGetSVData(); - pSVData->mpIntroWindow = this; -} - IntroWindow::IntroWindow() : WorkWindow(WindowType::INTROWINDOW) { - ImplInitIntroWindowData(); + ImplSVData* pSVData = ImplGetSVData(); + pSVData->mpIntroWindow = this; WorkWindow::ImplInit(nullptr, WB_INTROWIN); } commit d9719000003f7c0a443622d12791c99c399f62f7 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Nov 21 10:03:17 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 21 15:53:32 2025 +0100 Switch SfxApplication::loadBrandSvg param to u16string_view Change-Id: If1db2ac54d36b32c55fe4af37b9aadc2e8caf25e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194310 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index de52af0f8ce0..f760d37d8468 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -101,8 +101,8 @@ AboutDialog::AboutDialog(weld::Window *pParent) .GetStyleSettings() .GetDialogColor() .IsDark() - ? "shell/logo_inverted" - : "shell/logo", + ? u"shell/logo_inverted" + : u"shell/logo", aBackgroundBitmap, nWidth * 0.8)) { // Eliminate white background when Skia is disabled by not drawing the // background bitmap to a VirtualDevice. On most platforms, non-Skia @@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) Graphic aGraphic(aBackgroundBitmap); m_pBrandImage->set_image(aGraphic.GetXGraphic()); } - if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { + if (SfxApplication::loadBrandSvg(u"shell/about", aBackgroundBitmap, nWidth * 0.9)) { // Eliminate white background when Skia is disabled by not drawing the // background bitmap to a VirtualDevice. On most platforms, non-Skia // VirtualDevices will be filled with a solid color when drawing diff --git a/cui/source/dialogs/whatsnewtabpage.cxx b/cui/source/dialogs/whatsnewtabpage.cxx index 156b295b821e..fe7ee3ee622c 100644 --- a/cui/source/dialogs/whatsnewtabpage.cxx +++ b/cui/source/dialogs/whatsnewtabpage.cxx @@ -45,7 +45,7 @@ BrandGraphic::BrandGraphic() : m_bIsFirstStart(false) { Bitmap aBackgroundBitmap; - SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, 250); + SfxApplication::loadBrandSvg(u"shell/about", aBackgroundBitmap, 250); m_aGraphic = aBackgroundBitmap; m_aGraphicSize = m_aGraphic.GetSizePixel(); } diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 897bbfcf5d96..2a1d17e48347 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -218,7 +218,7 @@ public: static void SetModule(SfxToolsModule nSharedLib, std::unique_ptr<SfxModule> pModule); static SfxModule* GetModule(SfxToolsModule nSharedLib); - static bool loadBrandSvg(const char *pName, Bitmap& rBitmap, int nWidth); + static bool loadBrandSvg(std::u16string_view sName, Bitmap& rBitmap, int nWidth); /** loads the application logo as used in the impress slideshow pause screen */ static Bitmap GetApplicationLogo(tools::Long nWidth); diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 0b13cc65705e..0fb78e924355 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -125,11 +125,11 @@ static bool FileExists( const INetURLObject& rURL ) return bRet; } -bool SfxApplication::loadBrandSvg(const char *pName, Bitmap &rBitmap, int nWidth) +bool SfxApplication::loadBrandSvg(std::u16string_view sName, Bitmap &rBitmap, int nWidth) { // Load from disk - OUString aBaseName = "/" + OUString::createFromAscii( pName ); + OUString aBaseName = u"/"_ustr + sName; OUString uri = "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + aBaseName + ".svg"; rtl::Bootstrap::expandMacros( uri ); @@ -212,7 +212,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, Bitmap &rBitmap, int nWidth Bitmap SfxApplication::GetApplicationLogo(tools::Long nWidth) { Bitmap aBitmap; - SfxApplication::loadBrandSvg("shell/about", aBitmap, nWidth); + SfxApplication::loadBrandSvg(u"shell/about", aBitmap, nWidth); return aBitmap; } diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index d4ce7f5de4fe..23d75694bbb0 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -98,7 +98,7 @@ public: void LoadImageForWidth(int nWidth) { mbIsDark = Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark(); - SfxApplication::loadBrandSvg(mbIsDark ? "shell/logo-sc_inverted" : "shell/logo-sc", + SfxApplication::loadBrandSvg(mbIsDark ? u"shell/logo-sc_inverted" : u"shell/logo-sc", maBrandImage, nWidth); }
