mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

long->sal_Int32 in various Get/SetVersion

Browse Source 
sal_Int32 appears to be the widest type we need here

Change-Id: I1859936dbe7b6a95840c638c8ca5d4148849e12d
Reviewed-on: https://gerrit.libreoffice.org/42154
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-09-11 10:32:30 +02:00
parent 64fb35889d
commit 80b04f3d76
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sfx2/docfilt.hxx
View File

@@ -58,7 +58,7 @@ class SFX2_DLLPUBLIC SfxFilter
OUString maProvider; OUString maProvider;
SfxFilterFlags nFormatType; SfxFilterFlags nFormatType;
sal_uIntPtr nVersion; sal_Int32 nVersion;
SotClipboardFormatId lFormat; SotClipboardFormatId lFormat;
public: public:
@@ -98,8 +98,8 @@ public:
bool UsesStorage() const { return GetFormat() != SotClipboardFormatId::NONE; } bool UsesStorage() const { return GetFormat() != SotClipboardFormatId::NONE; }
void SetURLPattern( const OUString& rStr ); void SetURLPattern( const OUString& rStr );
void SetUIName( const OUString& rName ) { aUIName = rName; } void SetUIName( const OUString& rName ) { aUIName = rName; }
void SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; } void SetVersion( sal_Int32 nVersionP ) { nVersion = nVersionP; }
sal_uIntPtr GetVersion() const { return nVersion; } sal_Int32 GetVersion() const { return nVersion; }
OUString GetSuffixes() const; OUString GetSuffixes() const;
OUString GetDefaultExtension() const; OUString GetDefaultExtension() const;
const OUString& GetServiceName() const { return aServiceName; } const OUString& GetServiceName() const { return aServiceName; }

8
include/sot/storage.hxx
View File

@@ -40,7 +40,7 @@ friend class SotStorage;
protected: protected:
virtual std::size_t GetData(void* pData, std::size_t nSize) override; virtual std::size_t GetData(void* pData, std::size_t nSize) override;
virtual std::size_t PutData(const void* pData, std::size_t nSize) override; virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override; virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
virtual void FlushData() override; virtual void FlushData() override;
virtual ~SotStorageStream() override; virtual ~SotStorageStream() override;
public: public:
@@ -70,7 +70,7 @@ friend class SotStorageStream;
bool m_bIsRoot; // e.g.: File Storage bool m_bIsRoot; // e.g.: File Storage
bool m_bDelStm; bool m_bDelStm;
OString m_aKey; // aKey.Len != 0 -> encryption OString m_aKey; // aKey.Len != 0 -> encryption
long m_nVersion; sal_Int32 m_nVersion;
protected: protected:
virtual ~SotStorage() override; virtual ~SotStorage() override;
@@ -96,11 +96,11 @@ public:
const OString& GetKey() const { return m_aKey;} const OString& GetKey() const { return m_aKey;}
void SetVersion( long nVers ) void SetVersion( sal_Int32 nVers )
{ {
m_nVersion = nVers; m_nVersion = nVers;
} }
long GetVersion() const sal_Int32 GetVersion() const
{ {
return m_nVersion; return m_nVersion;
} }

6
include/tools/stream.hxx
View File

@@ -172,7 +172,7 @@ private:
unsigned char m_nCryptMask; unsigned char m_nCryptMask;
// Userdata // Userdata
long m_nVersion; // for external use sal_Int32 m_nVersion; // for external use
SvStream ( const SvStream& rStream ) = delete; SvStream ( const SvStream& rStream ) = delete;
SvStream& operator=( const SvStream& rStream ) = delete; SvStream& operator=( const SvStream& rStream ) = delete;
@@ -384,8 +384,8 @@ public:
bool IsWritable() const { return m_isWritable; } bool IsWritable() const { return m_isWritable; }
StreamMode GetStreamMode() const { return m_eStreamMode; } StreamMode GetStreamMode() const { return m_eStreamMode; }
long GetVersion() { return m_nVersion; } sal_Int32 GetVersion() { return m_nVersion; }
void SetVersion( long n ) { m_nVersion = n; } void SetVersion( sal_Int32 n ) { m_nVersion = n; }
friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // for Manips friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // for Manips