summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-06-06 17:23:26 +0200
committerCaolán McNamara <caolanm@redhat.com>2019-06-07 20:48:51 +0200
commit8bb5da0d676cfe041dcb2ffe41a1f9cd35697510 (patch)
tree2855d42bed3e2d1a927cfd25826cb363b6155842 /include
parent9d42c1c67d8b356626e57bedc63d5be59444d580 (diff)
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 <kendy@collabora.com> (cherry picked from commit e9660591f8997c7696a55731a9ae81d26a9d452a) Reviewed-on: https://gerrit.libreoffice.org/73656 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/aboutdialog.hxx3
1 files changed, 3 insertions, 0 deletions
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