diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-06-06 17:23:26 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-07 13:41:05 +0200 |
| commit | e9660591f8997c7696a55731a9ae81d26a9d452a (patch) | |
| tree | 16a529422b06e5345192c83933f14e56449e8291 /vcl/source/window | |
| parent | b1ffd72e32530951f56bc5a36932a32bd7b6cf18 (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>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/aboutdialog.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
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 |