mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uitest: annotate a few draw/impress windows

Browse Source 
Change-Id: I6352842535fddc99d30a4d0180ac01e7f8d5cd48
This commit is contained in:
Markus Mohrhard
2016-05-22 03:03:07 +02:00
parent a259b99359
commit a32eb53ca1
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sd/source/ui/framework/factories/BasicViewFactory.cxx
View File

@@ -36,6 +36,7 @@
#include "SlideSorterViewShell.hxx" #include "SlideSorterViewShell.hxx"
#include "FrameView.hxx" #include "FrameView.hxx"
#include "facreg.hxx" #include "facreg.hxx"
#include "Window.hxx"
#include <sfx2/viewfrm.hxx> #include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx> #include <vcl/wrkwin.hxx>
@@ -341,6 +342,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow, &rWindow,
PK_STANDARD, PK_STANDARD,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("impress_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msDrawViewURL)) else if (rsViewURL.equals(FrameworkHelper::msDrawViewURL))
{ {
@@ -350,6 +352,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase, *mpBase,
&rWindow, &rWindow,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("draw_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msOutlineViewURL)) else if (rsViewURL.equals(FrameworkHelper::msOutlineViewURL))
{ {
@@ -359,6 +362,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase, *mpBase,
&rWindow, &rWindow,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("outline_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msNotesViewURL)) else if (rsViewURL.equals(FrameworkHelper::msNotesViewURL))
{ {
@@ -369,6 +373,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow, &rWindow,
PK_NOTES, PK_NOTES,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("notes_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msHandoutViewURL)) else if (rsViewURL.equals(FrameworkHelper::msHandoutViewURL))
{ {
@@ -379,6 +384,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
&rWindow, &rWindow,
PK_HANDOUT, PK_HANDOUT,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("handout_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msPresentationViewURL)) else if (rsViewURL.equals(FrameworkHelper::msPresentationViewURL))
{ {
@@ -388,6 +394,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
*mpBase, *mpBase,
&rWindow, &rWindow,
pFrameView)); pFrameView));
pViewShell->GetContentWindow()->set_id("presentation_win");
} }
else if (rsViewURL.equals(FrameworkHelper::msSlideSorterURL)) else if (rsViewURL.equals(FrameworkHelper::msSlideSorterURL))
{ {

2
sd/source/ui/inc/ViewShell.hxx
View File

@@ -142,6 +142,8 @@ public:
*/ */
inline vcl::Window* GetParentWindow() const { return mpParentWindow; } inline vcl::Window* GetParentWindow() const { return mpParentWindow; }
sd::Window* GetContentWindow() const;
inline ::sd::View* GetView() const { return mpView; } inline ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const; inline SdrView* GetDrawView() const;
SD_DLLPUBLIC DrawDocShell* GetDocSh() const; SD_DLLPUBLIC DrawDocShell* GetDocSh() const;

1
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
View File

@@ -123,6 +123,7 @@ SlideSorterViewShell::SlideSorterViewShell (
mpSlideSorter(), mpSlideSorter(),
mbIsArrangeGUIElementsPending(true) mbIsArrangeGUIElementsPending(true)
{ {
GetContentWindow()->set_id("slidesorter");
meShellType = ST_SLIDE_SORTER; meShellType = ST_SLIDE_SORTER;
if (pFrameViewArgument != nullptr) if (pFrameViewArgument != nullptr)

5
sd/source/ui/view/viewshel.cxx
View File

@@ -1604,6 +1604,11 @@ void ViewShell::NotifyAccUpdate( )
GetViewShellBase().GetDrawController().NotifyAccUpdate(); GetViewShellBase().GetDrawController().NotifyAccUpdate();
} }
sd::Window* ViewShell::GetContentWindow() const
{
return mpContentWindow.get();
}
} // end of namespace sd } // end of namespace sd
//===== ViewShellObjectBarFactory ============================================= //===== ViewShellObjectBarFactory =============================================