From 7a09d67e1c76db7cb6a87a2ceaa6de7325342b75 Mon Sep 17 00:00:00 2001 From: Noel Date: Wed, 28 Oct 2020 09:15:54 +0200 Subject: convert some more long -> tools::Long Change-Id: Ide9811c1a7582454b3fcf655b70ea106ed56509a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104914 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/source/cairo/cairo_textlayout.cxx | 2 +- canvas/source/vcl/textlayout.cxx | 8 ++++---- cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 +- cppcanvas/source/mtfrenderer/textaction.cxx | 2 +- drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +- i18npool/source/localedata/LocaleNode.cxx | 12 +++++++----- include/comphelper/numberedcollection.hxx | 5 +++-- include/svl/svdde.hxx | 2 +- include/vcl/toolkit/controllayout.hxx | 2 +- sc/source/core/data/postit.cxx | 10 +++++----- sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2 +- sd/source/ui/annotations/annotationmanager.cxx | 4 ++-- sd/source/ui/dlg/tpaction.cxx | 2 +- sd/source/ui/inc/tpaction.hxx | 2 +- svtools/source/table/tablecontrol_impl.cxx | 8 ++++---- svtools/source/table/tablecontrol_impl.hxx | 2 +- svx/source/accessibility/lookupcolorname.cxx | 2 +- svx/source/stbctrls/zoomsliderctrl.cxx | 2 +- sw/inc/EnhancedPDFExportHelper.hxx | 2 +- sw/source/core/docnode/ndtbl.cxx | 8 ++++---- sw/source/core/inc/tblrwcl.hxx | 2 +- toolkit/source/awt/animatedimagespeer.cxx | 2 +- ucb/source/ucp/cmis/cmis_content.cxx | 2 +- ucb/source/ucp/webdav/SerfSession.cxx | 2 +- vcl/source/control/throbber.cxx | 2 +- 25 files changed, 47 insertions(+), 44 deletions(-) diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 3d4b9ca5a7c3..b7235b30d3c1 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -273,7 +273,7 @@ namespace cairocanvas ::osl::MutexGuard aGuard( m_aMutex ); setupLayoutMode( rOutDev, mnTextDirection ); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< tools::Long []> aOffsets(new tools::Long[maLogicalAdvancements.getLength()]); if( maLogicalAdvancements.hasElements() ) setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 0e64c8f8a255..2a0e1fec1a70 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -21,7 +21,7 @@ #include #include - +#include #include #include #include @@ -118,7 +118,7 @@ namespace vclcanvas uno::Sequence(4), rendering::CompositeOperation::SOURCE); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState); std::vector< uno::Reference< rendering::XPolyPolygon2D> > aOutlineSequence; @@ -166,7 +166,7 @@ namespace vclcanvas uno::Sequence(4), rendering::CompositeOperation::SOURCE); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState); MetricVector aMetricVector; @@ -335,7 +335,7 @@ namespace vclcanvas if( maLogicalAdvancements.hasElements() ) { // TODO(P2): cache that - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); // TODO(F3): ensure correct length and termination for DX diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index e957ca79697a..c16534e3dda1 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2567,7 +2567,7 @@ namespace cppcanvas::internal // generating a DX array, and uniformly // distributing the excess/insufficient width // to every logical character. - std::unique_ptr< long []> pDXArray( new long[nLen] ); + std::unique_ptr< ::tools::Long []> pDXArray( new ::tools::Long[nLen] ); rVDev.GetTextArray( pAct->GetText(), pDXArray.get(), pAct->GetIndex(), pAct->GetLen() ); diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index df64f58c44e1..96cf8e9ee5f4 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -186,7 +186,7 @@ namespace cppcanvas::internal { // no external DX array given, create one from given // string - std::unique_ptr< long []> pCharWidths( new long[nLen] ); + std::unique_ptr< ::tools::Long []> pCharWidths( new ::tools::Long[nLen] ); rVDev.GetTextArray( rText, pCharWidths.get(), nStartPos, nLen ); diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index f2d2e205d76b..2820ebfbc03d 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -249,7 +249,7 @@ namespace drawinglayer::primitive2d if(nDXArrayCount) { OSL_ENSURE(nDXArrayCount == nTextLength, "DXArray size does not correspond to text portion size (!)"); - std::vector< long > aIntegerDXArray(nDXArrayCount); + std::vector< tools::Long > aIntegerDXArray(nDXArrayCount); for(sal_uInt32 a(0); a < nDXArrayCount; a++) { diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index da2acce25ba4..93c6b461e77f 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -26,6 +26,8 @@ #include #include +#include +#include #include "LocaleNode.hxx" #include @@ -166,9 +168,9 @@ OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of, { ++nError; fprintf( stderr, - "Error: more than %ld character%s (%ld) in %s '%s' not supported by application.\n", - sal::static_int_cast< long >(nMaxLen), (nMaxLen > 1 ? "s" : ""), - sal::static_int_cast< long >(nLen), + "Error: more than %" SAL_PRIdINT32 " character%s (%" SAL_PRIdINT32 ") in %s '%s' not supported by application.\n", + nMaxLen, (nMaxLen > 1 ? "s" : ""), + nLen, (pNode ? OSTR( pNode->getName()) : ""), OSTR( aVal)); } @@ -1339,8 +1341,8 @@ void LCSearchNode::generateCode (const OFileWriter &of) const { ++nError; fprintf( - stderr, "Error: LC_SEARCH: more than 1 child: %ld\n", - sal::static_int_cast< long >(getNumberOfChildren())); + stderr, "Error: LC_SEARCH: more than 1 child: %" SAL_PRIdINT32 "\n", + getNumberOfChildren()); } sal_Int32 i; LocaleNode* pSearchOptions = getChildAt( 0 ); diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index efb70288f3ba..9ba619a94eb3 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -58,10 +59,10 @@ class COMPHELPER_DLLPUBLIC NumberedCollection final : private ::cppu::BaseMutex }; typedef std::unordered_map< - long, + tools::Long, TNumberedItem > TNumberedItemHash; - typedef ::std::vector< long > TDeadItemList; + typedef ::std::vector< tools::Long > TDeadItemList; // interface diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index eecd48d72e91..beea2ef5e53d 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -286,7 +286,7 @@ protected: const DdeTopic* GetSysTopic() const { return pSysTopic; } private: std::vector aTopics; - std::vector< long > aFormats; + std::vector< tools::Long > aFormats; DdeTopic* pSysTopic; DdeString* pName; std::vector> diff --git a/include/vcl/toolkit/controllayout.hxx b/include/vcl/toolkit/controllayout.hxx index 53ffeab4b32c..00a39f25c5a0 100644 --- a/include/vcl/toolkit/controllayout.hxx +++ b/include/vcl/toolkit/controllayout.hxx @@ -43,7 +43,7 @@ struct VCL_DLLPUBLIC ControlLayoutData // where one character may consist of many glyphs std::vector< tools::Rectangle > m_aUnicodeBoundRects; // start indices of lines - std::vector< long > m_aLineIndices; + std::vector< tools::Long > m_aLineIndices; // notify parent control on destruction VclPtr m_pParent; diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 342e4f539d12..a5fe92ca91a0 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -245,13 +245,13 @@ void ScCaptionCreator::FitCaptionToRect( const tools::Rectangle* pVisRect ) tools::Rectangle aCaptRect = mxCaption->GetLogicRect(); Point aCaptPos = aCaptRect.TopLeft(); // move textbox inside right border of visible area - aCaptPos.setX( ::std::min< long >( aCaptPos.X(), rVisRect.Right() - aCaptRect.GetWidth() ) ); + aCaptPos.setX( ::std::min< tools::Long >( aCaptPos.X(), rVisRect.Right() - aCaptRect.GetWidth() ) ); // move textbox inside left border of visible area (this may move it outside on right side again) - aCaptPos.setX( ::std::max< long >( aCaptPos.X(), rVisRect.Left() ) ); + aCaptPos.setX( ::std::max< tools::Long >( aCaptPos.X(), rVisRect.Left() ) ); // move textbox inside bottom border of visible area - aCaptPos.setY( ::std::min< long >( aCaptPos.Y(), rVisRect.Bottom() - aCaptRect.GetHeight() ) ); + aCaptPos.setY( ::std::min< tools::Long >( aCaptPos.Y(), rVisRect.Bottom() - aCaptRect.GetHeight() ) ); // move textbox inside top border of visible area (this may move it outside on bottom side again) - aCaptPos.setY( ::std::max< long >( aCaptPos.Y(), rVisRect.Top() ) ); + aCaptPos.setY( ::std::max< tools::Long >( aCaptPos.Y(), rVisRect.Top() ) ); // update caption aCaptRect.SetPos( aCaptPos ); mxCaption->SetLogicRect( aCaptRect ); @@ -1207,7 +1207,7 @@ ScCaptionPtr ScNoteUtil::CreateTempCaption( pCaption->SetText( aBuffer.makeStringAndClear() ); ScCaptionUtil::SetDefaultItems( *pCaption, rDoc, nullptr ); // adjust caption size to text size - tools::Long nMaxWidth = ::std::min< long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP ); + tools::Long nMaxWidth = ::std::min< tools::Long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP ); pCaption->SetMergedItem( makeSdrTextAutoGrowWidthItem( true ) ); pCaption->SetMergedItem( makeSdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) ); pCaption->SetMergedItem( makeSdrTextMaxFrameWidthItem( nMaxWidth ) ); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 416a2baa66de..12d12c19beda 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -91,7 +91,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl sal_uInt16 mnCurrentZoom; sal_uInt16 mnMinZoom; sal_uInt16 mnMaxZoom; - std::vector< long > maSnappingPointOffsets; + std::vector< tools::Long > maSnappingPointOffsets; std::vector< sal_uInt16 > maSnappingPointZooms; Image maSliderButton; Image maIncreaseButton; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index b1c21ec8eef9..155862469313 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -469,8 +469,8 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText) for( const auto& rxAnnotation : aAnnotations ) { RealPoint2D aPoint( rxAnnotation->getPosition() ); - aTagRect.SetLeft( sal::static_int_cast< long >( aPoint.X * 100.0 ) ); - aTagRect.SetTop( sal::static_int_cast< long >( aPoint.Y * 100.0 ) ); + aTagRect.SetLeft( sal::static_int_cast< ::tools::Long >( aPoint.X * 100.0 ) ); + aTagRect.SetTop( sal::static_int_cast< ::tools::Long >( aPoint.Y * 100.0 ) ); aTagRect.SetRight( aTagRect.Left() + width - 1 ); aTagRect.SetBottom( aTagRect.Top() + height - 1 ); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 335930cb3ff2..be18308bb820 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -716,7 +716,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) break; case presentation::ClickAction_VERB: { - ::std::vector< long >::iterator aFound( ::std::find( aVerbVector.begin(), aVerbVector.end(), rStr.toInt32() ) ); + ::std::vector< tools::Long >::iterator aFound( ::std::find( aVerbVector.begin(), aVerbVector.end(), rStr.toInt32() ) ); if( aFound != aVerbVector.end() ) m_xLbOLEAction->select(aFound - aVerbVector.begin()); } diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 37a43c39f44d..249c9221de0a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -55,7 +55,7 @@ private: bool bTreeUpdated; std::vector maCurrentActions; OUString aLastFile; - ::std::vector< long > aVerbVector; + ::std::vector< tools::Long > aVerbVector; std::unique_ptr m_xLbAction; std::unique_ptr m_xFtTree; // jump destination controls diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 26e96c063325..0327e33728b7 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -687,7 +687,7 @@ namespace svt::table tools::Long TableControl_Impl::impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding, - bool const i_assumeVerticalScrollbar, ::std::vector< long >& o_newColWidthsPixel ) const + bool const i_assumeVerticalScrollbar, ::std::vector< tools::Long >& o_newColWidthsPixel ) const { // the available horizontal space tools::Long gridWidthPixel = m_rAntiImpl.GetOutputSizePixel().Width(); @@ -711,9 +711,9 @@ namespace svt::table // collect some meta data for our columns: // - their current (pixel) metrics tools::Long accumulatedCurrentWidth = 0; - ::std::vector< long > currentColWidths; + ::std::vector< tools::Long > currentColWidths; currentColWidths.reserve( colCount ); - typedef ::std::vector< ::std::pair< long, long > > ColumnLimits; + typedef ::std::vector< ::std::pair< tools::Long, long > > ColumnLimits; ColumnLimits effectiveColumnLimits; effectiveColumnLimits.reserve( colCount ); tools::Long accumulatedMinWidth = 0; @@ -963,7 +963,7 @@ namespace svt::table // - V-YES: all fine, result from 1. is still valid // - V-NO: redistribute the remaining space (if any) amongst all columns which allow it - ::std::vector< long > newWidthsPixel; + ::std::vector< tools::Long > newWidthsPixel; tools::Long gridWidthPixel = impl_ni_calculateColumnWidths( i_assumeInflexibleColumnsUpToIncluding, true, newWidthsPixel ); // the width/height of a scrollbar, needed several times below diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 998558ece08b..c435013606bb 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -375,7 +375,7 @@ namespace svt::table tools::Long impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding, bool const i_assumeVerticalScrollbar, - ::std::vector< long >& o_newColWidthsPixel + ::std::vector< tools::Long >& o_newColWidthsPixel ) const; /** positions all child windows, e.g. the both scrollbars, the corner window, and the data window diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index bebb52d32945..d74c22d3d984 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -44,7 +44,7 @@ public: OUString lookUp(tools::Long color) const; private: - typedef std::unordered_map< long, OUString > Map; + typedef std::unordered_map< tools::Long, OUString > Map; Map map_; }; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index e9673a323167..822c28ed59b5 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -41,7 +41,7 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl sal_uInt16 mnMinZoom; sal_uInt16 mnMaxZoom; sal_uInt16 mnSliderCenter; - std::vector< long > maSnappingPointOffsets; + std::vector< tools::Long > maSnappingPointOffsets; std::vector< sal_uInt16 > maSnappingPointZooms; Image maSliderButton; Image maIncreaseButton; diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index f5a6d5806a13..516edd30c799 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -180,7 +180,7 @@ class SwTaggedPDFHelper * painting process, the parameter bEditEngineOnly indicated that only * the bookmarks from the EditEngine have to be processed. */ -typedef std::set< long, lt_TableColumn > TableColumnsMapEntry; +typedef std::set< tools::Long, lt_TableColumn > TableColumnsMapEntry; typedef std::pair< SwRect, sal_Int32 > IdMapEntry; typedef std::vector< IdMapEntry > LinkIdMap; typedef std::map< const SwTable*, TableColumnsMapEntry > TableColumnsMap; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ff1db5358919..79b685f32359 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2600,12 +2600,12 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame ) rFill.SetRight( nRight ); rFill.SetRightMax( nRightMax ); - typedef std::map< long, std::pair< long, long >, FuzzyCompare > BoundaryMap; + typedef std::map< tools::Long, std::pair< tools::Long, long >, FuzzyCompare > BoundaryMap; BoundaryMap aBoundaries; BoundaryMap::iterator aIter; - std::pair< long, long > aPair; + std::pair< tools::Long, long > aPair; - typedef std::map< long, bool > HiddenMap; + typedef std::map< tools::Long, bool > HiddenMap; HiddenMap aHidden; HiddenMap::iterator aHiddenIter; @@ -2665,7 +2665,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame ) { const tools::Long nTabTop = aRectFnSet.GetPrtTop(*pTab); const tools::Long nKey = aRectFnSet.YDiff( rEntry.first, nTabTop ); - const std::pair< long, long > aTmpPair = rEntry.second; + const std::pair< tools::Long, long > aTmpPair = rEntry.second; const tools::Long nFirst = aRectFnSet.YDiff( aTmpPair.first, nTabTop ); const tools::Long nSecond = aTmpPair.second; diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 095c5a3c458c..cc1f0a514769 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -111,7 +111,7 @@ void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPa struct SwSaveRowSpan { sal_uInt16 mnSplitLine; // the line number where the table has been split - std::vector< long > mnRowSpans; // the row span attributes in this line + std::vector< tools::Long > mnRowSpans; // the row span attributes in this line SwSaveRowSpan( SwTableBoxes& rBoxes, sal_uInt16 nSplitLn ); }; diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index ecee7b365194..b14a3efafaa5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -219,7 +219,7 @@ namespace toolkit // find the set with the smallest difference between window size and image size const ::Size aWindowSizePixel = pThrobber->GetSizePixel(); - tools::Long nMinimalDistance = ::std::numeric_limits< long >::max(); + tools::Long nMinimalDistance = ::std::numeric_limits< tools::Long >::max(); for ( ::std::vector< Size >::const_iterator check = aImageSizes.begin(); check != aImageSizes.end(); ++check diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index cf12bdd8409f..f7974159fe30 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -115,7 +115,7 @@ namespace break; case libcmis::PropertyType::Integer: { - vector< long > aCmisLongs = pProperty->getLongs( ); + vector< tools::Long > aCmisLongs = pProperty->getLongs( ); uno::Sequence< sal_Int64 > aLongs( aCmisLongs.size( ) ); sal_Int64* aLongsArr = aLongs.getArray( ); sal_Int32 i = 0; diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 8f7a7e38c754..2b993d5fd4a8 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -1017,7 +1017,7 @@ sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, Init( rEnv ); // refresh existing lock. - theLock->timeout = static_cast< long >( nTimeout ); + theLock->timeout = static_cast< tools::Long >( nTimeout ); TimeValue startCall; osl_getSystemTime( &startCall ); diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 4f79ab9fcca4..0f38fe11baca 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -108,7 +108,7 @@ void Throbber::initImages() size_t nPreferredSet = 0; if ( aImageSets.size() > 1 ) { - tools::Long nMinimalDistance = ::std::numeric_limits< long >::max(); + tools::Long nMinimalDistance = ::std::numeric_limits< tools::Long >::max(); for ( ::std::vector< ::std::vector< Image > >::const_iterator check = aImageSets.begin(); check != aImageSets.end(); ++check -- cgit