From 7244b6bb5d8b6d109061ac693bb979821ce49b00 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 8 Jan 2010 18:32:51 +0100
Subject: #i107450#: build all other modules with new editeng lib

---
 sd/source/ui/annotations/annotationwindow.cxx | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'sd/source/ui/annotations/annotationwindow.cxx')

diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 2a7ca2df9b0d..737a51bbed9f 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -30,32 +30,32 @@
 
 #include "precompiled_sd.hxx"
 
-#include <svx/fontitem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/bulitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/frmdir.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/editview.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/frmdir.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/editview.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/editstat.hxx> //EditEngine flags
-#include <svx/outliner.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/unolingu.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-
+#include <editeng/editstat.hxx> //EditEngine flags
+#include <editeng/outliner.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <svx/svxids.hrc>
 #include <svtools/langtab.hxx>
 #include <svl/slstitm.hxx>
 #include <unotools/securityoptions.hxx>
-- 
cgit 


From 9e19ff00c708a9dbcc49f924e795d8a7b418a95d Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 12 Feb 2010 15:01:35 +0100
Subject: changefileheader2: #i109125#: change source file copyright notice
 from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile,
 Revision)

---
 sd/source/ui/annotations/annotationwindow.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sd/source/ui/annotations/annotationwindow.cxx')

diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 2a7ca2df9b0d..87989506527c 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postit.cxx,v $
- * $Revision: 1.8.42.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
-- 
cgit 


From 5c37cad1cdd52dd0dbf0c3ba6b04a6b0378e836a Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 24 Mar 2010 15:36:04 +0100
Subject: #i108917# fixed confusing behaviour of context menu and meta drop
 down menu in impress comments window - transplanted from
 263351@impresscomments1

---
 sd/source/ui/annotations/annotationwindow.cxx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sd/source/ui/annotations/annotationwindow.cxx')

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
-- 
cgit