diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-15 12:23:06 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-15 12:23:06 +0100 |
| commit | 6c2d2f54fd3ee6b8afce14dcb7b161c99b2b14a2 (patch) | |
| tree | 33bf8607a648ead4d51558b36f91370140b3fea4 /cui/source/tabpages | |
| parent | 57a7e3e73cda884c7db69f1a71d56288a4aa59fb (diff) | |
| parent | 4df3ab56014e82c9ad8c4528827370686d6604e9 (diff) | |
CWS-TOOLING: integrate CWS communitypatches320_DEV300
Diffstat (limited to 'cui/source/tabpages')
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 8 | ||||
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index c1a4d7690..cf53eaf44 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -305,7 +305,7 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, BOOL SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { - if(bPreset || bModified && pSaveNum) + if( (bPreset || bModified) && pSaveNum) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); @@ -507,7 +507,7 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, BOOL SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) { - if(bPreset || bModified && pActNum) + if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); @@ -744,7 +744,7 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, BOOL SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { - if(bPreset || bModified && pActNum) + if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); @@ -1104,7 +1104,7 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) // rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } - if(bPreset || bModified && pActNum) + if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 5cbc5709f..9a1e7587e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1288,7 +1288,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) aLastLineLB.Hide(); aLastLineFT.Hide(); aExpandCB.Hide(); - if(!(nHtmlMode & HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) ) + if(!(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE)) ) aJustify.Disable(); aSnapToGridCB.Show(FALSE); } |