diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-27 15:01:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-10-27 15:01:25 +0000 |
| commit | ef14b7f6ed149465c80884b73b53c729b0286081 (patch) | |
| tree | 6c012edaa61a9d1c14cafa03fb5c96e6702fa0a0 /sd/source/ui/toolpanel | |
| parent | c4b49b68e000cd0892af5d5c1335f4ff9365a6ad (diff) | |
CWS-TOOLING: integrate CWS impress178
2009-10-16 19:54:41 +0200 sj r276995 : removed warning
2009-10-16 17:46:12 +0200 sj r276993 : #i103757# applied patch (fixed crash if model changes)
2009-10-16 16:06:07 +0200 sj r276985 : CWS-TOOLING: rebase CWS impress178 to branches/OOO320@276942 (milestone: OOO320:m2)
2009-10-08 13:51:23 +0200 sj r276790 : #i105654# fixed closing of line geometry
2009-10-07 17:26:56 +0200 sj r276762 : #i105606# fixed object shadow
2009-10-07 17:25:39 +0200 sj r276761 : minor improvements
2009-10-07 11:48:26 +0200 af r276745 : #i103047# Prevent context menu of LayoutMenu from being shown when user clicks on background.
2009-10-07 11:33:59 +0200 af r276743 : #i99866# Set position of the design control manually.
2009-10-06 17:18:23 +0200 sj r276721 : minor improvements
2009-10-05 18:34:23 +0200 sj r276692 : #105606# fixed fontsize problem
2009-10-05 17:26:21 +0200 af r276691 : #i105354# Never process more than one request in a row.
2009-10-02 13:24:25 +0200 af r276639 : #i94242# Taking insertion position of slide sorter correctly into account.
2009-10-01 13:46:47 +0200 aw r276602 : #i102224# some Polygon/PolyPolygon usages in SVMConverter ignored the possible curve status of tools::Polygon; added at least an AdaptiveSubdivide
2009-10-01 12:33:56 +0200 aw r276588 : #i102224# ImplWritePolyPolygon killed the curve information at the PolyPolygon by NOT copying the flags
2009-09-30 17:48:56 +0200 aw r276567 : #i102224# removed GetSimple() from Polygon and PolyPolygon, replaced completely with AdaptiveSubdivide
2009-09-30 15:45:46 +0200 aw r276559 : #i102048# secured primitive creation for dimension lines with linestyle none
2009-09-30 14:56:41 +0200 af r276556 : #i105471# Reordered statements in ~SdModule.
2009-09-30 14:47:12 +0200 aw r276555 : #i105373# corrected curve ignoring places in MetaFile export
Diffstat (limited to 'sd/source/ui/toolpanel')
| -rw-r--r-- | sd/source/ui/toolpanel/LayoutMenu.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 7a39f1c42f15..e8ebc7fc605d 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -917,8 +917,13 @@ void LayoutMenu::Command (const CommandEvent& rEvent) if (GetShellManager() != NULL) GetShellManager()->MoveToTop(this); if (rEvent.IsMouseEvent()) - mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup( - SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)); + { + // Do not show the context menu when the mouse was not + // pressed over an item. + if (GetItemId(rEvent.GetMousePosPixel()) > 0) + mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup( + SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)); + } else { // When the command event was not caused by a mouse |