include/vcl/weld.hxx | 11 -----------
vcl/source/app/salvtables.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 2 +-
3 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 81f860143e8539e2ebedc486f3c50ff80dc5b39d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Mar 11 16:43:53 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Mar 11 18:20:04 2020 +0100
m_sHelpRoot in weld::Builder is unused
since
commit 082e69fefb7439fd4f3d543f0c402039e94c1e9c
convert various MessBox to weld::MessageDialog -
Change-Id: I08370632803c26ac9c47267e57c51eb56ad713f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90335
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 838fb2729f04..151333203895 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2088,18 +2088,7 @@ public:
class VCL_DLLPUBLIC Builder
{
-private:
- OString m_sHelpRoot;
-
public:
- Builder(const OUString& rUIFile)
- : m_sHelpRoot(OUStringToOString(rUIFile, RTL_TEXTENCODING_UTF8))
- {
- sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
- if (nIdx != -1)
- m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
- m_sHelpRoot += OString('/');
- }
virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OString&
id,
bool
bTakeOwnership = true)
= 0;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0a53f050f1aa..9af055b9535c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6120,7 +6120,7 @@ IMPL_LINK(SalInstanceEntryTreeView, AutocompleteHdl,
Edit&, rEdit, void)
SalInstanceBuilder::SalInstanceBuilder(vcl::Window* pParent, const OUString&
rUIRoot,
const OUString& rUIFile)
- : weld::Builder(rUIFile)
+ : weld::Builder()
, m_xBuilder(new VclBuilder(pParent, rUIRoot, rUIFile, OString(),
css::uno::Reference<css::frame::XFrame>(),
false))
{
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index a044fd906289..c9867a731903 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13608,7 +13608,7 @@ private:
}
public:
GtkInstanceBuilder(GtkWidget* pParent, const OUString& rUIRoot, const
OUString& rUIFile, SystemChildWindow* pInterimGlue)
- : weld::Builder(rUIFile)
+ : weld::Builder()
, m_pStringReplace(Translate::GetReadStringHook())
, m_pParentWidget(pParent)
, m_nNotifySignalId(0)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
