diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-01 23:31:22 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-09-06 12:12:30 +0200 |
| commit | 6f9f11d4a3d5eb489b4c112f2c41af91136adc89 (patch) | |
| tree | c32488fa3ea401ab822e1ac485e5564605bd8cda /sw | |
| parent | 4f31a00fd0bec1e083d630e3a642e451f8f1f714 (diff) | |
sal_uInt16 to more proper types, group a test into a bool
Change-Id: I4763e1dfd3d674d36063bada83373a6e45c97303
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/itratr.cxx | 11 | ||||
| -rw-r--r-- | sw/source/core/text/itratr.hxx | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index d7f648f3713e..378004d4766a 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -143,7 +143,8 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFo nStartIndex = 0; nEndIndex = 0; - nPos = nChgCnt = 0; + nPos = 0; + nChgCnt = 0; if( nPropFont ) pFnt->SetProportion( nPropFont ); if( pRedln ) @@ -439,8 +440,8 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn ) { long nMin, nMax; SwHTMLTableLayout *pLayout = 0; - sal_uInt16 nWhich = pNd->Which(); - if( RES_DRAWFRMFMT != nWhich ) + const bool bIsDrawFrmFmt = pNd->Which()==RES_DRAWFRMFMT; + if( !bIsDrawFrmFmt ) { // Does the frame contain a table at the start or the end? const SwNodes& rNodes = pNd->GetDoc()->GetNodes(); @@ -471,7 +472,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn ) } else { - if( RES_DRAWFRMFMT == nWhich ) + if( bIsDrawFrmFmt ) { const SdrObject* pSObj = pNd->FindSdrObject(); if( pSObj ) @@ -608,7 +609,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa aIter.SeekAndChgAttrIter( nIdx, pOut ); sal_Int32 nLen = m_Text.getLength(); long nAktWidth = 0; - sal_uInt16 nAdd = 0; + long nAdd = 0; SwMinMaxArgs aArg( pOut, pSh, rMin, rMax, rAbsMin ); while( nIdx < nLen ) { diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index edd51dcd9ecd..81aa9fd489ba 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -48,7 +48,7 @@ protected: private: OutputDevice *pLastOut; - sal_uInt16 nChgCnt; + short nChgCnt; SwRedlineItr *pRedln; size_t nStartIndex; size_t nEndIndex; |