diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:05:04 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:05:04 +0000 |
commit | 66383b9796cdaf1e553eb3420ecfcf7f479f05c1 (patch) | |
tree | 6e082146b6a89bc83754ff31ff1a46a93c129075 /vcl/source/control/button.cxx | |
parent | b055c50db3ec5193836766ea7ceb2d20166e2f1c (diff) |
INTEGRATION: CWS vcl30stop2 (1.62.70); FILE MERGED
2008/07/25 07:59:42 pl 1.62.70.1: #i92101# fix a typo (thanks dr)
Diffstat (limited to 'vcl/source/control/button.cxx')
-rw-r--r-- | vcl/source/control/button.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 9e4bdc2763ba..3a0c2af0e852 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: button.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.63 $ * * This file is part of OpenOffice.org. * @@ -2445,7 +2445,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, // if the text rect height is smaller than the height of the image // then for single lines the default should be centered text - if( (nWinStyle & (WB_TOP|WB_CENTER|WB_BOTTOM)) == 0 && + if( (nWinStyle & (WB_TOP|WB_VCENTER|WB_BOTTOM)) == 0 && (rImageSize.Height() > rSize.Height() || ! (nWinStyle & WB_WORDBREAK) ) ) { nTextStyle &= ~(TEXT_DRAW_TOP|TEXT_DRAW_BOTTOM); @@ -3541,7 +3541,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, // if the text rect height is smaller than the height of the image // then for single lines the default should be centered text - if( (nWinStyle & (WB_TOP|WB_CENTER|WB_BOTTOM)) == 0 && + if( (nWinStyle & (WB_TOP|WB_VCENTER|WB_BOTTOM)) == 0 && (rImageSize.Height() > rSize.Height() || ! (nWinStyle & WB_WORDBREAK) ) ) { nTextStyle &= ~(TEXT_DRAW_TOP|TEXT_DRAW_BOTTOM); |