summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-11-15 15:48:01 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-11-16 16:54:43 +0100
commite7061b8ecbfc54f3980504b01df7c502039652df (patch)
treee9e78df91abcc4d24e427db5e38081058915814a /sw
parentf65dea36d2778b7f626ac8b07cd057110a5c3a4b (diff)
sw: convert 'a ? sal_False : b' to '!a && b'
Change-Id: I999404544b1ed35a19096df58172e62bd1685e75
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmltab.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index bfe012fe9178..bd4153112771 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1056,7 +1056,7 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
nCellSpacing( pOptions->nCellSpacing ),
nBoxes( 1 ),
pCaptionStartNode( 0 ),
- bTableAdjustOfTag( pTopTab ? sal_False : pOptions->bTableAdjust ),
+ bTableAdjustOfTag( !pTopTab && pOptions->bTableAdjust ),
bIsParentHead( bParHead ),
bHasParentSection( bHasParentSec ),
bHasToFly( bHasToFlw ),
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 636bfc946dfb..9002984956a5 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1697,7 +1697,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
GRAPHIC_NONE == rSh.GetIMapGraphic().GetType();
}
}
- bSet = bDisable ? sal_False : rWrap.IsContour();
+ bSet = !bDisable && rWrap.IsContour();
break;
case FN_WRAP_ANCHOR_ONLY: