include/vcl/aboutdialog.hxx | 3 +++
vcl/source/app/salvtables.cxx | 6 +++---
vcl/source/window/aboutdialog.cxx | 1 +
vcl/source/window/builder.cxx | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit e9660591f8997c7696a55731a9ae81d26a9d452a
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Jun 6 17:23:26 2019 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Fri Jun 7 13:41:05 2019 +0200
android: Fix build after welding AboutDialog.
Without this, the vcl's AboutDialog conflicts with the AboutDialog from
cui during linking of liblo-native-code.so.
Change-Id: Ie6e5ddd52bb7bdee1c7d53c37ea566d7ce6c9385
Reviewed-on: https://gerrit.libreoffice.org/73613
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/include/vcl/aboutdialog.hxx b/include/vcl/aboutdialog.hxx
index 4126f9519a1b..8a620a004c5a 100644
--- a/include/vcl/aboutdialog.hxx
+++ b/include/vcl/aboutdialog.hxx
@@ -17,6 +17,8 @@
#include <vcl/layout.hxx>
#include <vcl/vclmedit.hxx>
+namespace vcl
+{
class AboutDialog : public Dialog
{
private:
@@ -54,6 +56,7 @@ public:
OUString GetWebsiteLabel() const { return m_xBuildIdLink->GetText(); }
};
+}
#endif
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 166a5133feb0..b6c5dfde1b68 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1384,9 +1384,9 @@ public:
class SalInstanceAboutDialog : public SalInstanceDialog, public virtual
weld::AboutDialog
{
private:
- VclPtr<::AboutDialog> m_xAboutDialog;
+ VclPtr<vcl::AboutDialog> m_xAboutDialog;
public:
- SalInstanceAboutDialog(::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
+ SalInstanceAboutDialog(vcl::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
: SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
, m_xAboutDialog(pDialog)
{
@@ -5082,7 +5082,7 @@ public:
virtual std::unique_ptr<weld::AboutDialog> weld_about_dialog(const OString
&id, bool bTakeOwnership) override
{
- AboutDialog* pAboutDialog = m_xBuilder->get<AboutDialog>(id);
+ vcl::AboutDialog* pAboutDialog = m_xBuilder->get<vcl::AboutDialog>(id);
std::unique_ptr<weld::AboutDialog> pRet(pAboutDialog ? new
SalInstanceAboutDialog(pAboutDialog, this, false) : nullptr);
if (bTakeOwnership && pAboutDialog)
{
diff --git a/vcl/source/window/aboutdialog.cxx
b/vcl/source/window/aboutdialog.cxx
index 1a563dfd367d..b8a8aa595982 100644
--- a/vcl/source/window/aboutdialog.cxx
+++ b/vcl/source/window/aboutdialog.cxx
@@ -43,6 +43,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
+using namespace vcl;
AboutDialog::AboutDialog(vcl::Window* pParent, WinBits nStyle,
Dialog::InitFlag eFlag)
: Dialog(pParent, nStyle, eFlag)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 61df46ffe9b7..72d7ec18a1c0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1654,7 +1654,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window
*pParent, const OString &
if (extractResizable(rMap))
nBits |= WB_SIZEABLE;
if (name == "GtkAboutDialog")
- xWindow = VclPtr<AboutDialog>::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
+ xWindow = VclPtr<vcl::AboutDialog>::Create(pParent, nBits,
!pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
else
xWindow = VclPtr<Dialog>::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
#if HAVE_FEATURE_DESKTOP
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
