summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-03-09 21:49:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-03-09 22:45:29 +0100
commit573caba6f3056797ed3a1235efecdbaffa7eeb44 (patch)
tree6f2d0f9a95bcd2b5e295b3207959d2910958493b /include
parentde801168f2b542cdd499cf731d5ed87bdea4e6e4 (diff)
Make VCL_DLLPUBLIC virtual functions non-inline
at least Linux-rpm_deb-x86@71-TDF tinderbox was having a hiccup: > /tinderbox/buildslave/build/workdir/CxxObject/sd/source/ui/func/fuinsert.o: In function `weld::DialogController::run()': > /tinderbox/buildslave/source/libo-master/include/vcl/weld.hxx:551: undefined reference to `weld::MessageDialogController::getDialog()' Change-Id: Ib05808a7a283b5aad7329a82c0de3125db4f8506 Reviewed-on: https://gerrit.libreoffice.org/51018 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/weld.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 30cbaef2f607..7a82cfb2c6df 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -551,13 +551,13 @@ public:
short run() { return getDialog()->run(); }
static bool runAsync(const std::shared_ptr<DialogController>& rController,
const std::function<void(sal_Int32)>&);
- virtual ~DialogController() {}
+ virtual ~DialogController();
};
class VCL_DLLPUBLIC GenericDialogController : public DialogController
{
private:
- virtual Dialog* getDialog() override { return m_xDialog.get(); }
+ virtual Dialog* getDialog() override;
protected:
std::unique_ptr<weld::Builder> m_xBuilder;
@@ -566,6 +566,7 @@ protected:
public:
GenericDialogController(weld::Widget* pParent, const OUString& rUIFile,
const OString& rDialogId);
+ ~GenericDialogController() override;
void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
void set_help_id(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
};
@@ -573,7 +574,7 @@ public:
class VCL_DLLPUBLIC MessageDialogController : public DialogController
{
private:
- virtual Dialog* getDialog() override { return m_xDialog.get(); }
+ virtual Dialog* getDialog() override;
protected:
std::unique_ptr<weld::Builder> m_xBuilder;
@@ -582,6 +583,7 @@ protected:
public:
MessageDialogController(weld::Widget* pParent, const OUString& rUIFile,
const OString& rDialogId);
+ ~MessageDialogController() override;
void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
void set_help_id(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
};