diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-10-31 21:04:59 -0400 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-07 21:22:01 +0000 |
| commit | 04783fd91832fa01a5b096f395edd7ad4f9c0f6b (patch) | |
| tree | fd677ba54851b1742ad163e3a27bc6cea314052c /sw/source/uibase/shells | |
| parent | 12d973aa9b6b3d962702f27fc46ef05b0151cabc (diff) | |
Misc tweaks and cleanups.
Streamlined a couple of hotspots and some
minor cleanups.
Change-Id: I85a9423e03f7e20ce78736a44d668da859a443cd
Reviewed-on: https://gerrit.libreoffice.org/19720
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/tabsh.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 37084876810d..ce012a693a13 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -504,17 +504,17 @@ void SwTableShell::Execute(SfxRequest &rReq) // The attributes of all lines will be read and the strongest wins. const SvxBorderLine* pBorderLine; SvxBorderLine aBorderLine; - if ((pBorderLine = rCoreBox.GetTop()) != NULL) + if ((pBorderLine = rCoreBox.GetTop()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); - if ((pBorderLine = rCoreBox.GetBottom()) != NULL) + if ((pBorderLine = rCoreBox.GetBottom()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); - if ((pBorderLine = rCoreBox.GetLeft()) != NULL) + if ((pBorderLine = rCoreBox.GetLeft()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); - if ((pBorderLine = rCoreBox.GetRight()) != NULL) + if ((pBorderLine = rCoreBox.GetRight()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); - if ((pBorderLine = aCoreInfo.GetHori()) != NULL) + if ((pBorderLine = aCoreInfo.GetHori()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); - if ((pBorderLine = aCoreInfo.GetVert()) != NULL) + if ((pBorderLine = aCoreInfo.GetVert()) != nullptr) lcl_TabGetMaxLineWidth(pBorderLine, aBorderLine); if(aBorderLine.GetOutWidth() == 0) @@ -524,17 +524,17 @@ void SwTableShell::Execute(SfxRequest &rReq) } bool bLine = false; - if( aBox.GetTop() != NULL ) + if( aBox.GetTop() != nullptr ) aBox.SetLine(&aBorderLine, SvxBoxItemLine::TOP), bLine |= true; - if( aBox.GetBottom() != NULL ) + if( aBox.GetBottom() != nullptr ) aBox.SetLine(&aBorderLine, SvxBoxItemLine::BOTTOM), bLine |= true; - if( aBox.GetLeft() != NULL ) + if( aBox.GetLeft() != nullptr ) aBox.SetLine(&aBorderLine, SvxBoxItemLine::LEFT), bLine |= true; - if( aBox.GetRight() != NULL ) + if( aBox.GetRight() != nullptr ) aBox.SetLine(&aBorderLine, SvxBoxItemLine::RIGHT), bLine |= true; - if( aInfo.GetHori() != NULL ) + if( aInfo.GetHori() != nullptr ) aInfo.SetLine(&aBorderLine, SvxBoxInfoItemLine::HORI), bLine |= true; - if( aInfo.GetVert() != NULL ) + if( aInfo.GetVert() != nullptr ) aInfo.SetLine(&aBorderLine, SvxBoxInfoItemLine::VERT), bLine |= true; aCoreSet.Put( aBox ); |