summaryrefslogtreecommitdiff
path: root/sd/source/ui/annotations/annotationwindow.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-04-09 09:31:27 +0100
committerCaolán McNamara <cmc@openoffice.org>2010-04-09 09:31:27 +0100
commite8c667fcf38286ca9944dfca3c07b63f3939679b (patch)
tree6f24d0de713104c869d95adf38aa9ef434d7f206 /sd/source/ui/annotations/annotationwindow.cxx
parent92005938ab0d211ac9d49afc48bf218078fb1b5e (diff)
parente725e315399f527e63f919a9a6861066b1f41512 (diff)
cmcfixes74: merge with DEV300 m76
Diffstat (limited to 'sd/source/ui/annotations/annotationwindow.cxx')
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index eaacc332725d..ad6709c776ce 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -780,6 +780,8 @@ void AnnotationWindow::Command( const CommandEvent& rCEvt )
{
if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
{
+ if( mpMeta->IsVisible() &&(mpMeta->GetPosPixel().Y() < rCEvt.GetMousePosPixel().Y()) )
+ return;
mrManager.ExecuteAnnotationContextMenu( mxAnnotation, this, Rectangle(rCEvt.GetMousePosPixel(),Size(1,1)) );
}
else