summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
commit32a8a33dc1f7ef35623684246cb76e5c920193fc (patch)
tree8a21346d0c71b08495c5428c229bf0a46a6054bf /formula
parent84daf70e3219642a13abdfbf2c030d414ebaac43 (diff)
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match 2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ; 2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again 2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method 2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings 2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working 2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings 2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux 2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'formula')
-rw-r--r--formula/source/ui/dlg/funcutl.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 23f0f2dc66ae..afc7ce05918f 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -724,8 +724,8 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
EditBox::EditBox( Window* pParent,WinBits nWinStyle)
:Control(pParent,nWinStyle|WB_DIALOGCONTROL)
{
- pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | nWinStyle & WB_TABSTOP|
- WB_NOBORDER | WB_NOHIDESELECTION |WB_IGNORETAB);
+ pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nWinStyle & WB_TABSTOP) |
+ WB_NOBORDER | WB_NOHIDESELECTION | WB_IGNORETAB);
pMEdit->Show();
aOldSel=pMEdit->GetSelection();
@@ -751,7 +751,7 @@ EditBox::EditBox( Window* pParent, const ResId& rResId )
WinBits nStyle=GetStyle();
SetStyle( nStyle| WB_DIALOGCONTROL);
- pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | nStyle & WB_TABSTOP|
+ pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nStyle & WB_TABSTOP) |
WB_NOBORDER | WB_NOHIDESELECTION | WB_IGNORETAB);
pMEdit->Show();
aOldSel=pMEdit->GetSelection();
@@ -861,7 +861,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
{
const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
USHORT nKey=aKeyCode.GetCode();
- if(nKey==KEY_RETURN && !aKeyCode.IsShift() || nKey==KEY_TAB)
+ if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
{
nResult=GetParent()->Notify(rNEvt);
}