diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-19 15:24:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-19 15:42:51 +0100 |
| commit | 4ec44fc1a8cf7cdfb6ddceacdaf7354551064971 (patch) | |
| tree | 6d2442695353e8317f508a4f379db8ad8701f0d4 /sd/source/ui/annotations | |
| parent | cfcf0254afe0ce9f4fd80606527bd1f14777f7e1 (diff) | |
afl-eventtesting: view is null
but docshell isn't and we're using the view apparently
to get the shell we already have
Change-Id: Ibc2021245191a75f65ec655a2d1929601a2611b5
Diffstat (limited to 'sd/source/ui/annotations')
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.hxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 693f84e5aee5..e8ea2e9c8da9 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -204,7 +204,6 @@ void AnnotationTextWindow::MouseButtonDown( const MouseEvent& rMEvt ) GrabFocus(); if ( mpOutlinerView ) mpOutlinerView->MouseButtonDown( rMEvt ); - // todo mpOutlinerView->DocView()->GetViewFrame()->GetBindings().InvalidateAll(sal_False); } void AnnotationTextWindow::MouseButtonUp( const MouseEvent& rMEvt ) @@ -276,7 +275,6 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel : FloatingWindow(pParent, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS) , mrManager( rManager ) , mpDocShell( pDocShell ) -, mpView( pDocShell->GetViewShell()->GetView() ) , mpDoc( pDocShell->GetDoc() ) , mpOutlinerView(0) , mpOutliner(0) @@ -638,7 +636,7 @@ void AnnotationWindow::Deactivate() if( mpDoc->IsUndoEnabled() ) mpDoc->EndUndo(); - DocView()->GetDocSh()->SetModified(); + mpDocShell->SetModified(); } } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 0dc405c348c7..9e25f440573b 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -79,7 +79,6 @@ class AnnotationWindow : public FloatingWindow private: AnnotationManagerImpl& mrManager; DrawDocShell* mpDocShell; - View* mpView; SdDrawDocument* mpDoc; OutlinerView* mpOutlinerView; @@ -114,7 +113,6 @@ class AnnotationWindow : public FloatingWindow DrawDocShell* DocShell() { return mpDocShell; } OutlinerView* getView() { return mpOutlinerView; } - sd::View* DocView() { return mpView; } Outliner* Engine() { return mpOutliner; } SdDrawDocument* Doc() { return mpDoc; } |