diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
| commit | 47c3cfdedc57c1c01bbaa2d2f17849afcb8085f8 (patch) | |
| tree | 25d5014c32ff3d2930d7c77f2f00293047f700b5 /sw/source/core/text/atrstck.cxx | |
| parent | 9cee1c436c62f1e3a022ef2e7b4bfe1e3f46de66 (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 'sw/source/core/text/atrstck.cxx')
| -rw-r--r-- | sw/source/core/text/atrstck.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 383791c8a671..eb4148264931 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -270,8 +270,11 @@ bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, // attribute, instead we take the colors from the view options: // if ( pShell->GetWin() && - ( ((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks() || - !((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks() ) ) + ( + (((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks()) || + (!((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks()) + ) + ) { if ( pColor ) { @@ -749,7 +752,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu pDefaultArray[ nStackPos ]; if( (mpShell && !mpShell->GetWin()) || - pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue() ) + (pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue()) ) { rFnt.SetUnderline( ((SvxUnderlineItem&)rItem).GetLineStyle() ); rFnt.SetUnderColor( ((SvxUnderlineItem&)rItem).GetColor() ); |