diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-19 10:46:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-19 13:52:32 +0200 |
commit | 73b115b1a399f57efd727eb71d7ef9e4a27afbc9 (patch) | |
tree | d92dd80efaec35fd7850f5073ba1586dfbd72b5c /include | |
parent | 2471d6f44c7e8ecbe86a90eeb593b899a08a7408 (diff) |
use tools::Long in svl
Change-Id: Ic63d3c0ebd1e58d7bab5b0fd6313cabddc16eb98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104517
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/svl/imageitm.hxx | 4 | ||||
-rw-r--r-- | include/svl/metitem.hxx | 2 | ||||
-rw-r--r-- | include/svl/poolitem.hxx | 3 | ||||
-rw-r--r-- | include/svl/svdde.hxx | 21 |
4 files changed, 16 insertions, 14 deletions
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index ccecc5356637..c135216cc482 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -39,8 +39,8 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - void SetRotation( long nValue ); - long GetRotation() const; + void SetRotation( tools::Long nValue ); + tools::Long GetRotation() const; void SetMirrored( bool bSet ); bool IsMirrored() const; }; diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index be5b1b7ba497..9d64d6bdd34f 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -27,7 +27,7 @@ class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item public: explicit SfxMetricItem( sal_uInt16 nWhich, sal_uInt32 nValue ); - virtual void ScaleMetrics( long lMult, long lDiv ) override; + virtual void ScaleMetrics( tools::Long lMult, tools::Long lDiv ) override; virtual bool HasMetrics() const override; }; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index f1bb0cfab4d3..ce4ebeaef679 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -29,6 +29,7 @@ #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <tools/mapunit.hxx> +#include <tools/long.hxx> #include <boost/property_tree/ptree_fwd.hpp> class IntlWrapper; @@ -164,7 +165,7 @@ public: OUString &rText, const IntlWrapper& rIntlWrapper ) const; - virtual void ScaleMetrics( long lMult, long lDiv ); + virtual void ScaleMetrics( tools::Long lMult, tools::Long lDiv ); virtual bool HasMetrics() const; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index c0d5975e84c7..eecd48d72e91 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -27,6 +27,7 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/link.hxx> +#include <tools/long.hxx> #include <memory> #include <vector> @@ -56,14 +57,14 @@ class SVL_DLLPUBLIC DdeData public: DdeData(); - DdeData(SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING); + DdeData(SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER tools::Long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING); DdeData(SAL_UNUSED_PARAMETER const OUString&); DdeData(const DdeData&); DdeData(DdeData&&) noexcept; ~DdeData(); void const * getData() const; - long getSize() const; + tools::Long getSize() const; SotClipboardFormatId GetFormat() const; @@ -91,7 +92,7 @@ protected: Link<bool,void> aDone; bool bBusy; - DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 ); + DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER tools::Long = 0 ); public: virtual ~DdeTransaction(); @@ -110,7 +111,7 @@ public: void SetFormat( SotClipboardFormatId nFmt ) { aDdeData.SetFormat( nFmt ); } SotClipboardFormatId GetFormat() const { return aDdeData.GetFormat(); } - long GetError() const; + tools::Long GetError() const; private: friend class DdeInternal; @@ -127,7 +128,7 @@ class SVL_DLLPUBLIC DdeLink : public DdeTransaction Link<void*,void> aNotify; public: - DdeLink( DdeConnection&, const OUString&, long = 0 ); + DdeLink( DdeConnection&, const OUString&, tools::Long = 0 ); virtual ~DdeLink() override; void SetNotifyHdl( const Link<void*,void>& rLink ) { aNotify = rLink; } @@ -146,21 +147,21 @@ public: class SVL_DLLPUBLIC DdeRequest : public DdeTransaction { public: - DdeRequest( DdeConnection&, const OUString&, long = 0 ); + DdeRequest( DdeConnection&, const OUString&, tools::Long = 0 ); }; class SVL_DLLPUBLIC DdePoke : public DdeTransaction { public: - DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 ); + DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, tools::Long = 0 ); }; class SVL_DLLPUBLIC DdeExecute : public DdeTransaction { public: - DdeExecute( DdeConnection&, const OUString&, long = 0 ); + DdeExecute( DdeConnection&, const OUString&, tools::Long = 0 ); }; @@ -177,7 +178,7 @@ public: DdeConnection( SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER const OUString& ); ~DdeConnection(); - long GetError() const; + tools::Long GetError() const; static const std::vector<DdeConnection*>& GetConnections(); @@ -316,7 +317,7 @@ public: }; -inline long DdeTransaction::GetError() const +inline tools::Long DdeTransaction::GetError() const { return rDde.GetError(); } |