diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-09 12:07:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-12 17:22:14 +0100 |
| commit | a39a3f1ad1e5e39b09ce474c0f4c0f9f4e174bbe (patch) | |
| tree | 35c36f536d5eea1f6296c37f5f161e9b96f64794 /sw/source | |
| parent | 1e3198931e6e230791e863272082c1d437975008 (diff) | |
weld impress annotation window
Change-Id: Idc89f4e382392103d373b6a84edaae10abd56056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 084aa066bf03..19565529d607 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -81,6 +81,7 @@ void collectUIInformation( const OUString& aevent , const OUString& aID ) namespace sw::annotation { +// see AnnotationContents in sd for something similar SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, SwPostItMgr& aMgr, SwSidebarItem& rSidebarItem, diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 8e43d4d62f84..e65ef1254933 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -702,11 +702,13 @@ void SwAnnotationWin::DoResize() mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; + + tools::Rectangle aOutputArea = PixelToLogic(tools::Rectangle(0, 0, aWidth, aHeight)); if (mxVScrollbar->get_vpolicy() == VclPolicyType::NEVER) - { // if we do not have a scrollbar anymore, we want to see the complete text - mpOutlinerView->SetVisArea( PixelToLogic( tools::Rectangle(0,0,aWidth,aHeight) ) ); + { + // if we do not have a scrollbar anymore, we want to see the complete text + mpOutlinerView->SetVisArea(aOutputArea); } - tools::Rectangle aOutputArea = PixelToLogic(tools::Rectangle(0, 0, aWidth, aHeight)); mpOutlinerView->SetOutputArea(aOutputArea); mpOutlinerView->ShowCursor(true, true); |