diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 14:12:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-11 10:20:58 +0200 |
| commit | bf6449230ad2b4dfb427a062663e5ff2b9ddf3b6 (patch) | |
| tree | 75c9947c10b4685cb9caaaaf1b59ca3f679bcd4e /sw/source/uibase/uno/unotxdoc.cxx | |
| parent | 9fa75f677a7b48a2177fe11cca0d00f5a2deb7da (diff) | |
loplugin:mergeclasses merge SwAnnotationWin and SwSidebarWin
Change-Id: Idaf7d7e8e4da37e0ba423dca3e22dc6711ba806a
Reviewed-on: https://gerrit.libreoffice.org/36380
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/uno/unotxdoc.cxx')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 07530d82e1bc..33eef3dc62bb 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -148,7 +148,6 @@ #include <srcview.hxx> #include <edtwin.hxx> #include <swdtflvr.hxx> -#include <SidebarWin.hxx> #include <PostItMgr.hxx> #include <svtools/langtab.hxx> @@ -3238,7 +3237,7 @@ OUString SwXTextDocument::getPostIts() for (std::list<SwSidebarItem*>::const_iterator i = pDocShell->GetView()->GetPostItMgr()->begin(); i != pDocShell->GetView()->GetPostItMgr()->end(); ++i ) { - sw::annotation::SwAnnotationWin* pWin = static_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt.get()); + sw::annotation::SwAnnotationWin* pWin = (*i)->pPostIt.get(); const SwPostItField* pField = pWin->GetPostItField(); const SwRect& aRect = pWin->GetAnchorRect(); @@ -3457,7 +3456,7 @@ OString SwXTextDocument::getTextSelection(const char* pMimeType, OString& rUsedM if (SwPostItMgr* pPostItMgr = pDocShell->GetView()->GetPostItMgr()) { - if (sw::sidebarwindows::SwSidebarWin* pWin = pPostItMgr->GetActiveSidebarWin()) + if (sw::annotation::SwAnnotationWin* pWin = pPostItMgr->GetActiveSidebarWin()) { // Editing postit text. EditView& rEditView = pWin->GetOutlinerView()->GetEditView(); |