include/vcl/customweld.hxx | 4 +--- vcl/source/app/settings.cxx | 7 +++++++ vcl/source/window/dialog.cxx | 7 ------- 3 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit baabca26375565a4452405227a3e77b33d9908b3 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 08:55:16 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:43:55 2025 +0100 weld: Use #pragma once Change-Id: Ia4fff00808e4e3a02481a9167163ddc527a9bbef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195826 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx index a67bb9252752..c37fe52a94af 100644 --- a/include/vcl/customweld.hxx +++ b/include/vcl/customweld.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_CUSTOMWELD_HXX -#define INCLUDED_VCL_CUSTOMWELD_HXX +#pragma once #include <comphelper/OAccessible.hxx> #include <vcl/weld/weld.hxx> @@ -189,6 +188,5 @@ public: void set_tooltip_text(const OUString& rTip) { m_xDrawingArea->set_tooltip_text(rTip); } }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit b2397675583e1fbe1a2000eef4f9d1435c54a4cb Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 08:48:47 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:43:48 2025 +0100 vcl: Move AllSettings::GetUIRootDir impl to settings.cxx This used to be a VclBuilderContainer method before commit 9d548868c62acd56fb1686281018a473028b5584 Date: Sat Jul 25 12:20:19 2020 +0100 move getUIRootDir to AllSettings Now that it no longer is, move the implementation to where the rest of the AllSettings code is, too. Change-Id: I603be9dc84d8943e7d6ad4bb9e93cba8a6abe94a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195825 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index bb3f25fa8851..8dc6b2c49b70 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2736,6 +2736,13 @@ const LanguageTag& AllSettings::GetUILanguageTag() const return mxData->maUILocale; } +OUString AllSettings::GetUIRootDir() +{ + OUString sShareLayer(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/"_ustr); + rtl::Bootstrap::expandMacros(sShareLayer); + return sShareLayer; +} + const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const { if ( !mxData->mpLocaleDataWrapper ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1c069b8b08e2..81ad62a01023 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -557,13 +557,6 @@ void VclBuilderContainer::disposeBuilder() m_pUIBuilder->disposeBuilder(); } -OUString AllSettings::GetUIRootDir() -{ - OUString sShareLayer(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/"_ustr); - rtl::Bootstrap::expandMacros(sShareLayer); - return sShareLayer; -} - //we can't change sizeable after the fact, so need to defer until we know and then do the init. void Dialog::ImplDeferredInit(vcl::Window* pParent, WinBits nBits) {
