summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-05-22 03:03:07 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-17 21:10:35 +0200
commit7a8a478d8b5f2168f370f0b4c2fcf54bc6151773 (patch)
treeee38ddca913f649fa293b4a502dd16a71ddf1007
parent1bd84cd2c2955568ded2e5f604b381aef9b0261b (diff)
uitest: annotate a few draw/impress windows
Change-Id: I6352842535fddc99d30a4d0180ac01e7f8d5cd48
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx7
-rw-r--r--sd/source/ui/inc/ViewShell.hxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx1
-rw-r--r--sd/source/ui/view/viewshel.cxx5
4 files changed, 15 insertions, 0 deletions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 3c8cc0291881..de3d4d5a593e 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -36,6 +36,7 @@
#include "SlideSorterViewShell.hxx"
#include "FrameView.hxx"
#include "facreg.hxx"
+#include "Window.hxx"
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
@@ -341,6 +342,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow,
PK_STANDARD,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("impress_win");
}
else if (rsViewURL.equals(FrameworkHelper::msDrawViewURL))
{
@@ -350,6 +352,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase,
&rWindow,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("draw_win");
}
else if (rsViewURL.equals(FrameworkHelper::msOutlineViewURL))
{
@@ -359,6 +362,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase,
&rWindow,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("outline_win");
}
else if (rsViewURL.equals(FrameworkHelper::msNotesViewURL))
{
@@ -369,6 +373,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow,
PK_NOTES,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("notes_win");
}
else if (rsViewURL.equals(FrameworkHelper::msHandoutViewURL))
{
@@ -379,6 +384,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow,
PK_HANDOUT,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("handout_win");
}
else if (rsViewURL.equals(FrameworkHelper::msPresentationViewURL))
{
@@ -388,6 +394,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase,
&rWindow,
pFrameView));
+ pViewShell->GetContentWindow()->set_id("presentation_win");
}
else if (rsViewURL.equals(FrameworkHelper::msSlideSorterURL))
{
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 462bfc56018d..4dd4fd992ccc 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -142,6 +142,8 @@ public:
*/
inline vcl::Window* GetParentWindow() const { return mpParentWindow; }
+ sd::Window* GetContentWindow() const;
+
inline ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const;
SD_DLLPUBLIC DrawDocShell* GetDocSh() const;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 0b7ce99a61c6..ac9a8fccb960 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -123,6 +123,7 @@ SlideSorterViewShell::SlideSorterViewShell (
mpSlideSorter(),
mbIsArrangeGUIElementsPending(true)
{
+ GetContentWindow()->set_id("slidesorter");
meShellType = ST_SLIDE_SORTER;
if (pFrameViewArgument != nullptr)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 942f9a5fdba8..84d5d19053e3 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1604,6 +1604,11 @@ void ViewShell::NotifyAccUpdate( )
GetViewShellBase().GetDrawController().NotifyAccUpdate();
}
+sd::Window* ViewShell::GetContentWindow() const
+{
+ return mpContentWindow.get();
+}
+
} // end of namespace sd
//===== ViewShellObjectBarFactory =============================================