chart2/source/controller/dialogs/tp_AxisPositions.cxx | 4 ++-- chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2 +- cui/source/inc/cuitabline.hxx | 2 +- include/svx/sxcecitm.hxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 8f67e2633af1386fbfe15b53b4e309dcda988a6f Author: Noel Grandin <[email protected]> AuthorDate: Thu Feb 3 11:03:28 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Feb 3 17:12:27 2022 +0100 tools::Long -> sal_Int32 Change-Id: Ife7fc63f4ad0f3dcd34c9079d74044bae7924988 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129403 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 6812e9f94818..037bc3002567 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -100,8 +100,8 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos )); // tick marks - tools::Long nTicks=0; - tools::Long nMinorTicks=0; + sal_Int32 nTicks=0; + sal_Int32 nMinorTicks=0; if(m_xCB_MinorInner->get_active()) nMinorTicks|=CHAXIS_MARK_INNER; diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 62e35cede66f..69cc0ba83f95 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -308,7 +308,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI break; case SCHATTR_AXIS_TIME_RESOLUTION: { - tools::Long nTimeResolution=0; + sal_Int32 nTimeResolution=0; if( rTimeIncrement.TimeResolution >>= nTimeResolution ) rOutItemSet.Put( SfxInt32Item( nWhichId, nTimeResolution ) ); else if( m_pExplicitScale ) diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 704852b187fe..7e4d7798f563 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -96,7 +96,7 @@ private: bool m_bNewSize; /// a graphic to be displayed in the preview in case that an automatic symbol is chosen Graphic m_aAutoSymbolGraphic; - tools::Long m_nSymbolType; + sal_Int32 m_nSymbolType; /// attributes for the shown symbols; only necessary if not equal to line properties std::unique_ptr<SfxItemSet> m_xSymbolAttr; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index dae0a918d889..6619c04be050 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -67,7 +67,7 @@ public: class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem final : public SfxInt32Item { public: - SdrCaptionEscRelItem(tools::Long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} + SdrCaptionEscRelItem(sal_Int32 nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; virtual SdrCaptionEscRelItem* Clone(SfxItemPool* pPool=nullptr) const override;
