summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2014-03-26 13:52:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-28 13:18:33 +0000
commit1ffa910582f6470af2e5ee337270dc9269436235 (patch)
tree31697f167e8b6242151559244dd3a720c717146a /sw
parentc260edff34555c1f0209430d8e34c22fc9a98d3b (diff)
Resolves: #i124514# show/hide Overlay object to highlight...
annotated text range according the according view option which show/hides the annotations/comments (cherry picked from commit b8c793949e416432619d3c7d7611fc44694c3b77) Conflicts: sw/source/core/uibase/docvw/SidebarWin.cxx Change-Id: I0701ee137317349c5d917841448c183015d5513a
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/uibase/docvw/SidebarWin.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx
index 4a37bf25bd07..fb78b3b3342c 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -573,7 +573,8 @@ void SwSidebarWin::SetPosAndSize()
}
// text range overlay
- if ( mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
+ if ( mrMgr.ShowNotes()
+ && mrSidebarItem.maLayoutInfo.mnStartNodeIdx != 0
&& mrSidebarItem.maLayoutInfo.mnStartContent != -1 )
{
std::vector< basegfx::B2DRange > aAnnotationTextRanges;