diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:50:40 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:50:40 +0200 |
commit | 28178fc81cca238a4527fe7572f03fddf14e9790 (patch) | |
tree | cde89b51be3389ca8c0019c22a6d2eab658e49e4 | |
parent | 245209045b5335a401553595ad9ac13ed864932e (diff) | |
parent | f5b61fbe07fc675b7ff9646c03ea1f359c76e903 (diff) |
CWS-TOOLING: integrate CWS ooo33gsl02_OOO330ooo/OOO330_m1ooo/DEV300_m85
-rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index c0765bf3f..bb10b3d13 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -392,7 +392,7 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/) { SetClipRegion(); bNativeDrawn = DrawNativeControl( - CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED, + CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, ImplControlValue(), OUString()); } else @@ -755,7 +755,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) Point aPos; Size aSize; getMenuItemPosSize(nPos, aPos, aSize); - Region aRegion(Rectangle(aPos,aSize)); + Rectangle aRegion(aPos,aSize); if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL)) { @@ -763,7 +763,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) IntersectClipRegion(Rectangle(aPos, aSize)); Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); DrawNativeControl( - CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, Region(aCtrlRect), CTRL_STATE_ENABLED, + CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, ImplControlValue(), OUString()); Pop(); |