From 2e8acde112e1c6754df26902e79a78346ba45a2d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 16 Aug 2017 16:27:55 +0200 Subject: remove UL/L suffixes from integer constants on the RHS of expressions Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5 Reviewed-on: https://gerrit.libreoffice.org/41237 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/qa/extras/ww8export/ww8export.cxx | 2 +- sw/source/core/access/accdoc.cxx | 4 +- sw/source/core/access/accframe.cxx | 2 +- sw/source/core/access/accpara.cxx | 2 +- sw/source/core/access/acctable.cxx | 4 +- sw/source/core/frmedt/feshview.cxx | 2 +- sw/source/core/frmedt/fews.cxx | 4 +- sw/source/core/inc/frame.hxx | 4 +- sw/source/core/layout/anchoredobject.cxx | 2 +- sw/source/core/layout/calcmove.cxx | 4 +- sw/source/core/layout/findfrm.cxx | 2 +- sw/source/core/layout/fly.cxx | 4 +- sw/source/core/layout/objectformatter.cxx | 2 +- sw/source/core/layout/objectformattertxtfrm.cxx | 2 +- sw/source/core/layout/pagechg.cxx | 2 +- sw/source/core/layout/sectfrm.cxx | 2 +- .../tocntntanchoredobjectposition.cxx | 2 +- sw/source/core/view/viewsh.cxx | 6 +- sw/source/filter/ww8/rtfattributeoutput.cxx | 2 +- sw/source/filter/xml/xmlexpit.cxx | 2 +- sw/source/filter/xml/xmlimpit.cxx | 2 +- sw/source/filter/xml/xmltble.cxx | 8 +- sw/source/filter/xml/xmltbli.cxx | 152 ++++++++++----------- sw/source/uibase/dochdl/swdtflvr.cxx | 2 +- sw/source/uibase/misc/redlndlg.cxx | 4 +- sw/source/uibase/shells/drwbassh.cxx | 4 +- sw/source/uibase/uno/unotxdoc.cxx | 4 +- sw/source/uibase/wrtsh/delete.cxx | 2 +- 28 files changed, 117 insertions(+), 117 deletions(-) (limited to 'sw') diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index c44f68f78eb9..1d2cd7b9e75c 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -50,7 +50,7 @@ #include -#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36)/72L) : (((TWIP)*127L-36)/72L)) class Test : public SwModelTestBase { diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 5d1e5fccb111..9955017d7ae7 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -185,10 +185,10 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() } catch(const css::lang::IndexOutOfBoundsException &) { - return -1L; + return -1; } } - return -1L; + return -1; } OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription() diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 523572b33369..a9cb2f0a6e04 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -460,7 +460,7 @@ sal_Int32 SwAccessibleFrame::GetChildIndex( SwAccessibleMap& rAccMap, sal_Int32 nPos = 0; return GetChildIndex( rAccMap, maVisArea, *mpFrame, rChild, nPos, IsInPagePreview() ) ? nPos - : -1L; + : -1; } sw::access::SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 1ec347554526..68f6b067be2a 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2427,7 +2427,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) return bSuccess ? GetPortionData().GetAccessiblePosition( aPos.nContent.GetIndex() ) - : -1L; + : -1; } OUString SwAccessibleParagraph::getSelectedText() diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 792ea4a41dcc..23986014cc79 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -729,7 +729,7 @@ sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( // iterate over all children to n-th isAccessibleChildSelected() sal_Int32 nChildren = const_cast(this)->getAccessibleChildCount(); // #i77106# if( nSelectedChildIndex >= nChildren ) - return -1L; + return -1; sal_Int32 n = 0; while( n < nChildren ) @@ -744,7 +744,7 @@ sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( ++n; } - return n < nChildren ? n : -1L; + return n < nChildren ? n : -1; } void SwAccessibleTable::GetStates( diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index bee5e916cae0..e3dedeb6398f 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -120,7 +120,7 @@ namespace { OUString aArrowName( SvxResId(pResId) ); long nCount = pLineEndList->Count(); long nIndex; - for( nIndex = 0L; nIndex < nCount; nIndex++ ) + for( nIndex = 0; nIndex < nCount; nIndex++ ) { const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nIndex); if( pEntry->GetName() == aArrowName ) diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 3233ea34800f..38b194f414ff 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -990,7 +990,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, ( _eVertRelOrient == text::RelOrientation::CHAR || _eVertRelOrient == text::RelOrientation::TEXT_LINE ) ) { - SwTwips nTop = 0L; + SwTwips nTop = 0; if ( _eVertRelOrient == text::RelOrientation::CHAR ) { SwRect aChRect; @@ -1036,7 +1036,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect, (_nAnchorId == RndStdIds::FLY_AT_CHAR) && _eHoriRelOrient == text::RelOrientation::CHAR ) { - SwTwips nLeft = 0L; + SwTwips nLeft = 0; SwRect aChRect; if ( _pToCharContentPos ) { diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index e2a3e190c0f7..aaae7fe92f53 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -452,12 +452,12 @@ public: method replaced 'old' method . Determines, if frame is moveable in given environment. if no environment - is given (parameter _pLayoutFrame == 0L), the movability in the actual + is given (parameter _pLayoutFrame == 0), the movability in the actual environment ((this)->IsFollow() ) { - sal_uInt32 nToPageNum = 0L; + sal_uInt32 nToPageNum = 0; const bool bMoveFwdByObjPos = SwLayouter::FrameMovedFwdByObjPos( *(GetAttrSet()->GetDoc()), *(static_cast(this)), diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 8aef88ce2d1c..81912ce649db 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1281,7 +1281,7 @@ static bool lcl_IsInSectionDirectly( const SwFrame *pUp ) OD 08.08.2003 #110978# method replaced 'old' method . Determines, if frame is moveable in given environment. if no environment - is given (parameter _pLayoutFrame == 0L), the movability in the actual + is given (parameter _pLayoutFrame == 0), the movability in the actual environment ( 0 && nDist > ( LONG_MAX - nSize ) ) nDist = LONG_MAX - nSize; - if ( nDist <= 0L ) + if ( nDist <= 0 ) return 0L; if ( Lower()->IsColumnFrame() ) @@ -1785,7 +1785,7 @@ SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst ) nVal = std::min( nDist, nHeight - nFormatHeight ); } - if ( nVal <= 0L ) + if ( nVal <= 0 ) return 0L; if ( Lower()->IsColumnFrame() ) diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 3ec0d996600e..65b37f91ad2e 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -103,7 +103,7 @@ class SwPageNumAndTypeOfAnchors sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const { - sal_uInt32 nRetPgNum = 0L; + sal_uInt32 nRetPgNum = 0; if ( _nIndex < Count()) { diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 3bbffccdc226..58ce8914da1c 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -512,7 +512,7 @@ SwAnchoredObject* SwObjectFormatterTextFrame::GetFirstObjWithMovedFwdAnchor( SwAnchoredObject* pRetAnchoredObj = nullptr; - sal_uInt32 i = 0L; + sal_uInt32 i = 0; for ( ; i < CountOfCollected(); ++i ) { SwAnchoredObject* pAnchoredObj = GetCollectedObj(i); diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 343c157dceae..f4a16cacb3a6 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -184,7 +184,7 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat, SwFrame* pSib, SwPageDesc *pPg Frame().Height( 0 ); long nWidth = pSh->VisArea().Width(); if ( !nWidth ) - nWidth = 5000L; //aendert sich sowieso + nWidth = 5000; //aendert sich sowieso Frame().Width ( nWidth ); } else diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index eb2af5feec80..69a26eb76506 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -1923,7 +1923,7 @@ SwTwips SwSectionFrame::Grow_( SwTwips nDist, bool bTst ) if( nFrameHeight > 0 && nDist > (LONG_MAX - nFrameHeight) ) nDist = LONG_MAX - nFrameHeight; - if ( nDist <= 0L ) + if ( nDist <= 0 ) return 0L; bool bInCalcContent = GetUpper() && IsInFly() && FindFlyFrame()->IsLocked(); diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 1893feb99a5d..2bf253500f5c 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -505,7 +505,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() // #i28701# - correction: use // instead of and do not adjust relative position // to get correct vertical position. - nVertOffsetToFrameAnchorPos = 0L; + nVertOffsetToFrameAnchorPos = 0; // #i11860# - use new method // to get top of frame for object positioning. const SwTwips nTopOfOrient = diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index a8950e56173b..ad71a22898a4 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -347,9 +347,9 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) aTmp1 = GetOut()->LogicToPixel( aTmp1 ); tools::Rectangle aTmp2( GetOut()->PixelToLogic( aTmp1 ) ); if ( aTmp2.Left() > aRect.Left() ) - aTmp1.Left() = std::max( 0L, aTmp1.Left() - 1L ); + aTmp1.Left() = std::max( 0L, aTmp1.Left() - 1 ); if ( aTmp2.Top() > aRect.Top() ) - aTmp1.Top() = std::max( 0L, aTmp1.Top() - 1L ); + aTmp1.Top() = std::max( 0L, aTmp1.Top() - 1 ); aTmp1.Right() += 1; aTmp1.Bottom() += 1; aTmp1 = GetOut()->PixelToLogic( aTmp1 ); @@ -1032,7 +1032,7 @@ void SwViewShell::SizeChgNotify() { Size aDocSize = GetDocSize(); std::stringstream ss; - ss << aDocSize.Width() + 2L * DOCUMENTBORDER << ", " << aDocSize.Height() + 2L * DOCUMENTBORDER; + ss << aDocSize.Width() + 2 * DOCUMENTBORDER << ", " << aDocSize.Height() + 2 * DOCUMENTBORDER; OString sSize = ss.str().c_str(); GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, sSize.getStr()); } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 31cc848bfd72..90ac57e73142 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2263,7 +2263,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) * 100% Escapement */ - m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500L) / 1000L); + m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000L); // 500L to round !! } diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 66770da5069d..541b31826414 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -297,7 +297,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, exportXML( rExport, rExport.GetAttrList(), rSet, rUnitConverter, rExport.GetNamespaceMap(), nFlags, &aIndexArray ); - if( rExport.GetAttrList().getLength() > 0L || + if( rExport.GetAttrList().getLength() > 0 || (nFlags & SvXmlExportFlags::EMPTY) || !aIndexArray.empty() ) { diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index c4ebf67e2162..c501056a02cd 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -897,7 +897,7 @@ bool SvXMLImportItemMapper::PutXMLValue( case MID_FRMSIZE_REL_COL_WIDTH: { sal_Int32 nPos = rValue.indexOf( '*' ); - if( -1L != nPos ) + if( -1 != nPos ) { sal_Int32 nValue = rValue.toInt32(); if( nValue < MINLAY ) diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 391e82d7f9cc..cb944abc9153 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -137,7 +137,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) : { const SwTableBox *pBox = rBoxes[nBox]; - if( nBox < nBoxes-1U || nWidth==0UL ) + if( nBox < nBoxes-1U || nWidth==0 ) { nCPos = nCPos + SwWriteTable::GetBoxWidth( pBox ); SwXMLTableColumn_Impl *pCol = @@ -148,7 +148,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) : if( nBox==nBoxes-1U ) { - OSL_ENSURE( nLine==0U && nWidth==0UL, + OSL_ENSURE( nLine==0U && nWidth==0, "parent width will be lost" ); nWidth = nCPos; } @@ -282,7 +282,7 @@ bool SwXMLTableFrameFormatsSort_Impl::AddRow( SwFrameFormat& rFrameFormat, if( bInsert ) { - rFrameFormat.SetName( rNamePrefix + "." + OUString::number(nLine+1UL) ); + rFrameFormat.SetName( rNamePrefix + "." + OUString::number(nLine+1) ); if ( i != aFormatList.end() ) ++i; aFormatList.insert( i, &rFrameFormat ); } @@ -728,7 +728,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTableNd ) const SwFormatFrameSize& rFrameSize = pTableFormat->GetFrameSize(); sal_uInt32 nAbsWidth = rFrameSize.GetSize().Width(); - sal_uInt32 nBaseWidth = 0UL; + sal_uInt32 nBaseWidth = 0; sal_Int8 nPrcWidth = rFrameSize.GetWidthPercent(); bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index a2fcad1b997d..611a5702fe7a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -183,7 +183,7 @@ class SwXMLTableCell_Impl public: - SwXMLTableCell_Impl( sal_uInt32 nRSpan=1UL, sal_uInt32 nCSpan=1UL ) : + SwXMLTableCell_Impl( sal_uInt32 nRSpan=1, sal_uInt32 nCSpan=1 ) : dValue( 0.0 ), pStartNode( nullptr ), nRowSpan( nRSpan ), @@ -471,18 +471,18 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( break; case XML_TOK_TABLE_NUM_COLS_SPANNED: nColSpan = (sal_uInt32)rValue.toInt32(); - if( nColSpan < 1UL ) - nColSpan = 1UL; + if( nColSpan < 1 ) + nColSpan = 1; break; case XML_TOK_TABLE_NUM_ROWS_SPANNED: nRowSpan = (sal_uInt32)rValue.toInt32(); - if( nRowSpan < 1UL ) - nRowSpan = 1UL; + if( nRowSpan < 1 ) + nRowSpan = 1; break; case XML_TOK_TABLE_NUM_COLS_REPEATED: nColRepeat = (sal_uInt32)rValue.toInt32(); - if( nColRepeat < 1UL ) - nColRepeat = 1UL; + if( nColRepeat < 1 ) + nColRepeat = 1; break; case XML_TOK_TABLE_FORMULA: { @@ -739,7 +739,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( SvXMLImportContext( rImport, nPrfx, rLName ), xMyTable( pTable ) { - sal_uInt32 nColRep = 1UL; + sal_uInt32 nColRep = 1; OUString aStyleName, aDfltCellStyleName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -898,8 +898,8 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) { nRowRepeat = (sal_uInt32)rValue.toInt32(); - if( nRowRepeat < 1UL ) - nRowRepeat = 1UL; + if( nRowRepeat < 1 ) + nRowRepeat = 1; } else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) { @@ -923,7 +923,7 @@ void SwXMLTableRowContext_Impl::EndElement() { GetTable()->FinishRow(); - if( nRowRepeat > 1UL ) + if( nRowRepeat > 1 ) GetTable()->InsertRepRows( nRowRepeat ); } } @@ -1486,7 +1486,7 @@ sal_Int32 SwXMLTableContext::GetColumnWidth( sal_uInt32 nCol, if( nLast > m_aColumnWidths.size() ) nLast = m_aColumnWidths.size(); - sal_Int32 nWidth2 = 0L; + sal_Int32 nWidth2 = 0; for( sal_uInt32 i=nCol; i < nLast; ++i ) nWidth2 += m_aColumnWidths[i].width; @@ -1519,12 +1519,12 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, if( m_nCurCol >= USHRT_MAX || m_nCurRow > USHRT_MAX ) return; - OSL_ENSURE( nRowSpan >=1UL, "SwXMLTableContext::InsertCell: row span is 0" ); - if( 0UL == nRowSpan ) - nRowSpan = 1UL; - OSL_ENSURE( nColSpan >=1UL, "SwXMLTableContext::InsertCell: col span is 0" ); - if( 0UL == nColSpan ) - nColSpan = 1UL; + OSL_ENSURE( nRowSpan >=1, "SwXMLTableContext::InsertCell: row span is 0" ); + if( 0 == nRowSpan ) + nRowSpan = 1; + OSL_ENSURE( nColSpan >=1, "SwXMLTableContext::InsertCell: col span is 0" ); + if( 0 == nColSpan ) + nColSpan = 1; // Until it is possible to add columns here, fix the column span. sal_uInt32 nColsReq = m_nCurCol + nColSpan; @@ -1536,12 +1536,12 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, // Check whether there are cells from a previous line already that reach // into the current row. - if( m_nCurRow > 0UL && nColSpan > 1UL ) + if( m_nCurRow > 0 && nColSpan > 1 ) { SwXMLTableRow_Impl *pCurRow = (*m_pRows)[m_nCurRow].get(); sal_uInt32 nLastCol = GetColumnCount() < nColsReq ? GetColumnCount() : nColsReq; - for( sal_uInt32 i=m_nCurCol+1UL; iGetCell(i)->IsUsed() ) { @@ -1594,9 +1594,9 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, } // Fill the cells - for( sal_uInt32 i=nColSpan; i>0UL; --i ) + for( sal_uInt32 i=nColSpan; i>0; --i ) { - for( sal_uInt32 j=nRowSpan; j>0UL; --j ) + for( sal_uInt32 j=nRowSpan; j>0; --j ) { const bool bCovered = i != nColSpan || j != nRowSpan; GetCell( nRowsReq-j, nColsReq-i ) @@ -1623,7 +1623,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, return; // Make sure there is at least one column. - if( 0==m_nCurRow && 0UL == GetColumnCount() ) + if( 0==m_nCurRow && 0 == GetColumnCount() ) InsertColumn( USHRT_MAX, true ); if (m_nCurRow < m_pRows->size()) @@ -1642,7 +1642,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName, } // We start at the first column ... - m_nCurCol=0UL; + m_nCurCol=0; // ... but this cell may be occupied already. while( m_nCurColIsUsed() ) @@ -1700,17 +1700,17 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode( sal_uInt32 nRow, if( GetColumnCount() == nCol ) { // The last cell is the right one here. - pPrevCell = GetCell( m_pRows->size() - 1U, GetColumnCount() - 1UL ); + pPrevCell = GetCell( m_pRows->size() - 1U, GetColumnCount() - 1 ); } - else if( nCol > 0UL ) + else if( nCol > 0 ) { // The previous cell in this row. - pPrevCell = GetCell( nRow, nCol-1UL ); + pPrevCell = GetCell( nRow, nCol-1 ); } - else if( nRow > 0UL ) + else if( nRow > 0 ) { // The last cell from the previous row. - pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL ); + pPrevCell = GetCell( nRow-1, GetColumnCount()-1 ); } const SwStartNode *pSttNd = nullptr; @@ -1737,12 +1737,12 @@ void SwXMLTableContext::FixRowSpan( sal_uInt32 nRow, sal_uInt32 nCol, for( sal_uInt32 i = nCol; i < nLastCol; i++ ) { sal_uInt32 j = nRow; - sal_uInt32 nRowSpan = 1UL; + sal_uInt32 nRowSpan = 1; SwXMLTableCell_Impl *pCell = GetCell( j, i ); - while( pCell && pCell->GetRowSpan() > 1UL ) + while( pCell && pCell->GetRowSpan() > 1 ) { pCell->SetRowSpan( nRowSpan++ ); - pCell = j > 0UL ? GetCell( --j, i ) : nullptr; + pCell = j > 0 ? GetCell( --j, i ) : nullptr; } } } @@ -1880,19 +1880,19 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, SwXMLTableRow_Impl *pRow = (*m_pRows)[i].get(); for( sal_uInt32 j=nLeftCol; jGetCell(j)->GetRowSpan() ); + bSplit = ( 1 == pRow->GetCell(j)->GetRowSpan() ); if( !bSplit ) break; } - if( bSplit && (nStartRow>nTopRow || i+1ULnTopRow || i+1GetCell(i)->GetRowSpan() > 1UL ) + if( pPrevRow->GetCell(i)->GetRowSpan() > 1 ) { const SwXMLTableCell_Impl *pCell2 = GetCell( nStartRow, i ); const sal_uInt32 nColSpan2 = pCell2->GetColSpan(); - FixRowSpan( nStartRow-1UL, i, nColSpan2 ); + FixRowSpan( nStartRow-1, i, nColSpan2 ); ReplaceWithEmptyCell( nStartRow, i, true ); i += nColSpan2; } @@ -2141,7 +2141,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, const SfxItemSet *pAutoItemSet = nullptr; const OUString& rStyleName = (*m_pRows)[nTopRow]->GetStyleName(); - if( 1UL == (nBottomRow - nTopRow) && + if( 1 == (nBottomRow - nTopRow) && !rStyleName.isEmpty() && GetSwImport().FindAutomaticStyle( XML_STYLE_FAMILY_TABLE_ROW, rStyleName, &pAutoItemSet ) ) @@ -2181,21 +2181,21 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // Could the table fragment be splitted horizontally behind // the current line? bool bHoriSplit = (*m_pRows)[nRow]->IsSplitable() && - nRow+1UL < nBottomRow && - 1UL == pCell->GetRowSpan(); + nRow+1 < nBottomRow && + 1 == pCell->GetRowSpan(); (*m_pRows)[nRow]->SetSplitable( bHoriSplit ); // Could the table fragment be splitted vertically behind the // current column (uptp the current line? - bSplit &= ( 1UL == pCell->GetColSpan() ); + bSplit &= ( 1 == pCell->GetColSpan() ); if( bSplit ) { bHoriSplitPossible |= bHoriSplit; // Could the current table fragment be splitted // horizontally behind the next column, too? - bHoriSplit &= (nCol+1UL < nRightCol && - 1UL == GetCell(nRow,nCol+1UL)->GetRowSpan()); + bHoriSplit &= (nCol+1 < nRightCol && + 1 == GetCell(nRow,nCol+1)->GetRowSpan()); bHoriSplitMayContinue |= bHoriSplit; } } @@ -2214,11 +2214,11 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // Could the table fragment be splitted vertically behind the // current column (uptp the current line? - bSplit = 1UL == pCell->GetColSpan(); + bSplit = 1 == pCell->GetColSpan(); } #if OSL_DEBUG_LEVEL > 0 - if( nCol == nRightCol-1UL ) + if( nCol == nRightCol-1 ) { OSL_ENSURE( bSplit, "Split-Flag wrong" ); if ( m_bHasSubTables ) @@ -2241,7 +2241,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, SwXMLTableCell_Impl *pCell = GetCell( nTopRow, nStartCol ); // #i95726# - some fault tolerance if( ( !m_bHasSubTables || ( pCell->GetRowSpan() == (nBottomRow-nTopRow) ) ) && - pCell->GetColSpan() == (nCol+1UL-nStartCol) && + pCell->GetColSpan() == (nCol+1-nStartCol) && ( pCell->GetStartNode() || pCell->GetSubTable() ) ) { // insert new empty cell for covered cells: @@ -2258,7 +2258,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // The remaining box neither contains lines nor rows (i.e. // is a content box - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; pBox = MakeTableBox( pLine, pCell, nStartCol, nSplitCol ); @@ -2275,7 +2275,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // the next column, too. That for, we check the next // column but remember the current one as a good place to // split. - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; } else if ( m_bHasSubTables ) { @@ -2293,7 +2293,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, OSL_ENSURE( bHoriSplitPossible || nSplitCol == nRightCol, "bHoriSplitPossible-Flag sollte gesetzt sein" ); - nSplitCol = nCol + 1UL; + nSplitCol = nCol + 1; } pBox = MakeTableBox( pLine, nTopRow, nStartCol, @@ -2332,10 +2332,10 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) pCell = pPrevRow->GetCell(i); if( pCell->GetRowSpan() > 1 ) { - FixRowSpan( m_nCurRow-1UL, i, 1UL ); + FixRowSpan( m_nCurRow-1, i, 1UL ); } } - for (sal_uLong i = m_pRows->size() - 1UL; i >= m_nCurRow; --i) + for (sal_uLong i = m_pRows->size() - 1; i >= m_nCurRow; --i) m_pRows->pop_back(); } @@ -2346,24 +2346,24 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // TODO: Do we have to keep both values, the relative and the absolute // width? - sal_Int32 nAbsWidth = 0L; - sal_Int32 nMinAbsColWidth = 0L; - sal_Int32 nRelWidth = 0L; - sal_Int32 nMinRelColWidth = 0L; - sal_uInt32 nRelCols = 0UL; + sal_Int32 nAbsWidth = 0; + sal_Int32 nMinAbsColWidth = 0; + sal_Int32 nRelWidth = 0; + sal_Int32 nMinRelColWidth = 0; + sal_uInt32 nRelCols = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end(); ++colIter) { if( colIter->isRelative ) { nRelWidth += colIter->width; - if( 0L == nMinRelColWidth || colIter->width < nMinRelColWidth ) + if( 0 == nMinRelColWidth || colIter->width < nMinRelColWidth ) nMinRelColWidth = colIter->width; nRelCols++; } else { nAbsWidth += colIter->width; - if( 0L == nMinAbsColWidth || colIter->width < nMinAbsColWidth ) + if( 0 == nMinAbsColWidth || colIter->width < nMinAbsColWidth ) nMinAbsColWidth = colIter->width; } } @@ -2373,17 +2373,17 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // If there a columns that have an absolute width, we have to // calculate a relative one for them. - if( nAbsCols > 0UL ) + if( nAbsCols > 0 ) { // All column that have absolute widths get relative widths; // these widths relate to each over like the original absolute // widths. The smallest column gets a width that hat the same // value as the smallest column that has an relative width // already. - if( 0L == nMinRelColWidth ) + if( 0 == nMinRelColWidth ) nMinRelColWidth = nMinAbsColWidth; - for( colIter = m_aColumnWidths.begin(); nAbsCols > 0UL && colIter < m_aColumnWidths.end(); ++colIter) + for( colIter = m_aColumnWidths.begin(); nAbsCols > 0 && colIter < m_aColumnWidths.end(); ++colIter) { if( !colIter->isRelative ) { @@ -2409,7 +2409,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) if( nRelWidth != m_nWidth && nRelWidth && nCols ) { double n = (double)m_nWidth / (double)nRelWidth; - nRelWidth = 0L; + nRelWidth = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end() - 1; ++colIter) { sal_Int32 nW = (sal_Int32)( colIter->width * n); @@ -2423,7 +2423,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // If there are columns that have relative widths, we have to // calculate a absolute widths for them. - if( nRelCols > 0UL ) + if( nRelCols > 0 ) { // The absolute space that is available for all columns with a // relative width. @@ -2464,12 +2464,12 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // Otherwise, if there is enough space for every column, every // column gets this space. - for( colIter = m_aColumnWidths.begin(); nRelCols > 0UL && colIter < m_aColumnWidths.end(); ++colIter ) + for( colIter = m_aColumnWidths.begin(); nRelCols > 0 && colIter < m_aColumnWidths.end(); ++colIter ) { if( colIter->isRelative ) { sal_Int32 nAbsCol; - if( 1UL == nRelCols ) + if( 1 == nRelCols ) { // The last column that has a relative width gets // all absolute space that is left. @@ -2509,7 +2509,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // column widths, every column get some extra width. sal_Int32 nExtraAbs = m_nWidth - nAbsWidth; sal_Int32 nAbsLastCol = m_aColumnWidths.back().width + nExtraAbs; - for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1UL; ++colIter ) + for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1; ++colIter ) { sal_Int32 nAbsCol = colIter->width; sal_Int32 nExtraAbsCol = (nAbsCol * nExtraAbs) / @@ -2527,7 +2527,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // Every column gets the minimum width plus some extra width. sal_Int32 nExtraAbs = m_nWidth - (nCols * MINLAY); sal_Int32 nAbsLastCol = MINLAY + nExtraAbs; - for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1UL; ++colIter ) + for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end()-1; ++colIter ) { sal_Int32 nAbsCol = colIter->width; sal_Int32 nExtraAbsCol = (nAbsCol * nExtraAbs) / @@ -2545,18 +2545,18 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) pBox ? pBox->GetTabLines() : m_pTableNode->GetTable().GetTabLines(); - sal_uInt32 nStartRow = 0UL; + sal_uInt32 nStartRow = 0; sal_uInt32 nRows = m_pRows->size(); - for(sal_uInt32 i=0UL; iGetCell(j)->GetRowSpan() ); + bSplit = ( 1 == pRow->GetCell(j)->GetRowSpan() ); if( !bSplit ) break; } @@ -2565,10 +2565,10 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) if( bSplit ) { SwTableLine *pLine = - MakeTableLine( pBox, nStartRow, 0UL, i+1UL, nCols ); - if( pBox || nStartRow>0UL ) + MakeTableLine( pBox, nStartRow, 0UL, i+1, nCols ); + if( pBox || nStartRow>0 ) rLines.push_back( pLine ); - nStartRow = i+1UL; + nStartRow = i+1; } } } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index d7c12cecf35a..3ff36e084ac8 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -628,7 +628,7 @@ bool SwTransferable::WriteObject( tools::SvRef& xStream, const SvxFontHeightItem& rDefaultFontHeight = static_cast(rItemPool.GetDefaultItem(EE_CHAR_FONTHEIGHT)); // SW should have no MasterPages - OSL_ENSURE(0L == pModel->GetMasterPageCount(), "SW with MasterPages (!)"); + OSL_ENSURE(0 == pModel->GetMasterPageCount(), "SW with MasterPages (!)"); for(sal_uInt16 a(0); a < pModel->GetPageCount(); a++) { diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 4785e25b8906..4b0879dbde27 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -688,7 +688,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli SvTreeListEntry *const pEntry = m_RedlineParents[i]->pTLBParent; if (pEntry) { - long nIdx = aLBoxArr.size() - 1L; + long nIdx = aLBoxArr.size() - 1; sal_uLong nAbsPos = pModel->GetAbsPos(pEntry); while (nIdx >= 0 && pModel->GetAbsPos(aLBoxArr[ static_cast< sal_uInt16 >(nIdx) ]) > nAbsPos) @@ -698,7 +698,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli } // clear TLB from behind - long nIdx = (long)aLBoxArr.size() - 1L; + long nIdx = (long)aLBoxArr.size() - 1; while (nIdx >= 0) m_pTable->RemoveEntry(aLBoxArr[ static_cast< sal_uInt16 >(nIdx--) ]); diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index cd1cf3df4cf3..99ada54d2d27 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -506,7 +506,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) { bDone = true; - if(1L == pSdrView->GetMarkedObjectCount()) + if(1 == pSdrView->GetMarkedObjectCount()) { // #i68101# SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); @@ -536,7 +536,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) { bDone = true; - if(1L == pSdrView->GetMarkedObjectCount()) + if(1 == pSdrView->GetMarkedObjectCount()) { SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 7c4162a9a2f1..c3afd987974f 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3092,8 +3092,8 @@ Size SwXTextDocument::getDocumentSize() SwViewShell* pViewShell = pDocShell->GetWrtShell(); Size aDocSize = pViewShell->GetDocSize(); - return Size(aDocSize.Width() + 2L * DOCUMENTBORDER, - aDocSize.Height() + 2L * DOCUMENTBORDER); + return Size(aDocSize.Width() + 2 * DOCUMENTBORDER, + aDocSize.Height() + 2 * DOCUMENTBORDER); } void SwXTextDocument::setPart(int nPart) diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 41163c58de00..d839ba57bfe5 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -270,7 +270,7 @@ long SwWrtShell::DelRight() } else EnterStdMode(); - nRet = 1L; + nRet = 1; break; } else -- cgit v1.2.3