diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-09-25 11:20:31 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-09-25 21:09:53 +0200 |
| commit | 92820328943623ef29a76cf7721a52bc7d051c90 (patch) | |
| tree | 72c57c6424ab8d5f981fa99015894779661a91a0 /vcl/source | |
| parent | fa3e77680b4f953a069ec62f75a5370db6d5d751 (diff) | |
tdf#130857 Use std::u16string_view for VclBuilder::get param
This prepares for reusing the method elsewhere in
`VclBuilder`.
Only the `SAL_WARN_IF` (a no-op in release builds without
`--enable-sal-log`) previously needed a `OUString`.
Call `OUStringToOString` for that one explicitly, which
is what previously happened implicitly by
template< typename charT, typename traits >
inline std::basic_ostream<charT, traits> & operator <<(
std::basic_ostream<charT, traits> & stream, OUString const & rString)
defined in include/rtl/ustring.hxx.
Change-Id: I57ebac8c2189afeca33bfa483b8d5d5c7866d904
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173928
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/NotebookbarPopup.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c875b3847ea1..4dc96a6a1d46 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -7428,7 +7428,7 @@ std::unique_ptr<weld::SizeGroup> SalInstanceBuilder::create_size_group() OUString SalInstanceBuilder::get_current_page_help_id() const { - vcl::Window* pCtrl = m_xBuilder->get(u"tabcontrol"_ustr); + vcl::Window* pCtrl = m_xBuilder->get(u"tabcontrol"); if (!pCtrl) return {}; VclPtr<vcl::Window> xTabPage; diff --git a/vcl/source/control/NotebookbarPopup.cxx b/vcl/source/control/NotebookbarPopup.cxx index 17d1d1703e16..d81689ae3071 100644 --- a/vcl/source/control/NotebookbarPopup.cxx +++ b/vcl/source/control/NotebookbarPopup.cxx @@ -17,7 +17,7 @@ NotebookbarPopup::NotebookbarPopup(const VclPtr<VclHBox>& pParent) : FloatingWindow(pParent, u"Popup"_ustr, u"sfx/ui/notebookbarpopup.ui"_ustr) , m_pParent(pParent) { - m_pBox = m_pUIBuilder->get<VclHBox>(u"box"_ustr); + m_pBox = m_pUIBuilder->get<VclHBox>(u"box"); m_pBox->SetSizePixel(Size(100, 75)); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const BitmapEx& aPersona = rStyleSettings.GetPersonaHeader(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 54a1fed494d9..4b7d3148be9a 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -818,7 +818,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, std::u16string_view sUIDir, const O officecfg::Office::Common::Help::HelpRootURL::get().isEmpty(); if (bHideHelp) { - if (vcl::Window *pHelpButton = get(u"help"_ustr)) + if (vcl::Window *pHelpButton = get(u"help")) pHelpButton->Hide(); } } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c379a37788d1..fd4f07794de4 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -1090,7 +1090,7 @@ DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::un !bTearable ? u"vcl/ui/interimdockparent.ui"_ustr : u"vcl/ui/interimtearableparent.ui"_ustr, "vcl::DropdownDockingWindow maLayoutIdle", rFrame) - , m_xBox(m_pUIBuilder->get(u"box"_ustr)) + , m_xBox(m_pUIBuilder->get(u"box")) { } @@ -1107,7 +1107,7 @@ void DropdownDockingWindow::dispose() ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) : DockingWindow(pParent, u"DockingWindow"_ustr, u"vcl/ui/dockingwindow.ui"_ustr, "vcl::ResizableDockingWindow maLayoutIdle", rFrame) - , m_xBox(m_pUIBuilder->get(u"box"_ustr)) + , m_xBox(m_pUIBuilder->get(u"box")) { } |