summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2010-07-13 14:50:40 +0200
committerKurt Zenker <kz@openoffice.org>2010-07-13 14:50:40 +0200
commit9720a92e9c862560bdeced5931550e6d0f60059c (patch)
tree2a9d0c532ffc7e9c2a39019d66a178d7a13ae933
parent686b7955271806e65222a3a4bfe97365cab33a06 (diff)
parent61b7416babb4c7e0b1b3744146e10a3f8535861e (diff)
CWS-TOOLING: integrate CWS ooo33gsl02_OOO330
Notes
split repo tag: calc_ooo/DEV300_m85 split repo tag: calc_ooo/OOO330_m1
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 52aae575b7d7..6e7cfed9d95c 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();