summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-05-30 09:17:25 +0000
committerOliver Bolte <obo@openoffice.org>2008-05-30 09:17:25 +0000
commite47944640041a9702848ad1c298804a0b23a3180 (patch)
tree14ed24d594ca283ee5c9cca03a7300d4197901fe
parent8e7f8f0326fe6fc4d0563fad051a1ddf079fd74b (diff)
INTEGRATION: CWS aquabmpfix01 (1.154.30); FILE MERGED
2008/05/13 14:03:25 hdu 1.154.30.1: #100000# remove compile warnings
-rw-r--r--vcl/win/source/window/salframe.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 689ade013880..f7bdd202c1f0 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: salframe.cxx,v $
- * $Revision: 1.155 $
+ * $Revision: 1.156 $
*
* This file is part of OpenOffice.org.
*
@@ -4895,7 +4895,7 @@ static int ImplMeasureItem( HWND hWnd, WPARAM wParam, LPARAM lParam )
Size checkSize( GetSystemMetrics( SM_CXMENUCHECK ), GetSystemMetrics( SM_CYMENUCHECK ) );
pMI->itemWidth = checkSize.Width() + 3 + bmpSize.Width() + 3 + strSize.cx;
- pMI->itemHeight = max( max( checkSize.Height(), bmpSize.Height() ), strSize.cy );
+ pMI->itemHeight = Max( Max( checkSize.Height(), bmpSize.Height() ), strSize.cy );
pMI->itemHeight += 4;
DeleteObject( SelectObject(hdc, hfntOld) );