summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-30 05:27:54 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-18 17:01:51 +0200
commit073c47e3719acdc5094144a1cba813317aec88a5 (patch)
tree55bf94993175a085e87402f6496e1e27963c9227 /sfx2
parent77dd7f82911b2e8cd076dd71f3b3901b84fb98d6 (diff)
uitest: move declaration for the uitesting wrapper objects to include/ dir
This allows non-vcl wrapper objects to inherit from the vcl base classes. This is especially important for the WindowUIObject base class object. Change-Id: I91ef69839ff4c031d3bcd21d70b4b9e7d62ad572
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/uitest/sfx_uiobject.hxx2
-rw-r--r--sfx2/source/uitest/sfx_uiobject.cxx8
2 files changed, 8 insertions, 2 deletions
diff --git a/sfx2/inc/uitest/sfx_uiobject.hxx b/sfx2/inc/uitest/sfx_uiobject.hxx
index 6d77a5dcc3dd..bee5a20b4e35 100644
--- a/sfx2/inc/uitest/sfx_uiobject.hxx
+++ b/sfx2/inc/uitest/sfx_uiobject.hxx
@@ -12,7 +12,7 @@
class SfxTabDialog;
-class SfxTabDialogUIObject : public UIObject
+class SfxTabDialogUIObject : public WindowUIObject
{
private:
diff --git a/sfx2/source/uitest/sfx_uiobject.cxx b/sfx2/source/uitest/sfx_uiobject.cxx
index d42798781e1a..6cb6a2348a8e 100644
--- a/sfx2/source/uitest/sfx_uiobject.cxx
+++ b/sfx2/source/uitest/sfx_uiobject.cxx
@@ -12,6 +12,7 @@
#include <sfx2/tabdlg.hxx>
SfxTabDialogUIObject::SfxTabDialogUIObject(VclPtr<SfxTabDialog> xTabDialog):
+ WindowUIObject(xTabDialog),
mxTabDialog(xTabDialog)
{
}
@@ -22,16 +23,21 @@ SfxTabDialogUIObject::~SfxTabDialogUIObject()
StringMap SfxTabDialogUIObject::get_state()
{
+ return WindowUIObject::get_state();
}
-void SfxTabDialogUIObject::execute(const OUString& /*rAction*/,
+void SfxTabDialogUIObject::execute(const OUString& rAction,
const StringMap& /*rParameters*/)
{
+ if (rAction == "SELECT")
+ {
+ }
}
UIObjectType SfxTabDialogUIObject::get_type() const
{
+ return UIObjectType::DIALOG;
}
std::unique_ptr<UIObject> SfxTabDialogUIObject::create(vcl::Window* pWindow)