[Libreoffice-commits] core.git: include/sfx2 include/sot include/tools

[Noel Grandin]

 include/sfx2/docfilt.hxx |    6 +++---
 include/sot/storage.hxx  |    8 ++++----
 include/tools/stream.hxx |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 80b04f3d767bced56c68839731c48284bc1a59e3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Sep 11 10:32:30 2017 +0200

    long->sal_Int32 in various Get/SetVersion
    
    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 75b889f451d3..95fde5036d06 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -58,7 +58,7 @@ class SFX2_DLLPUBLIC SfxFilter
     OUString maProvider;
 
     SfxFilterFlags  nFormatType;
-    sal_uIntPtr     nVersion;
+    sal_Int32       nVersion;
     SotClipboardFormatId lFormat;
 
 public:
@@ -98,8 +98,8 @@ public:
     bool            UsesStorage() const { return GetFormat() != SotClipboardFormatId::NONE; }
     void SetURLPattern( const OUString& rStr );
     void            SetUIName( const OUString& rName ) { aUIName = rName; }
-    void            SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; }
-    sal_uIntPtr           GetVersion() const { return nVersion; }
+    void            SetVersion( sal_Int32 nVersionP ) { nVersion = nVersionP; }
+    sal_Int32       GetVersion() const { return nVersion; }
     OUString GetSuffixes() const;
     OUString GetDefaultExtension() const;
     const OUString& GetServiceName() const { return aServiceName; }
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2aa3ac0131d8..4ca0bc9d9387 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -40,7 +40,7 @@ friend class SotStorage;
 protected:
     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 sal_uInt64      SeekPos(sal_uInt64 nPos) override;
+    virtual sal_uInt64  SeekPos(sal_uInt64 nPos) override;
     virtual void        FlushData() override;
                         virtual ~SotStorageStream() override;
 public:
@@ -70,7 +70,7 @@ friend class SotStorageStream;
     bool            m_bIsRoot;   // e.g.: File Storage
     bool            m_bDelStm;
     OString         m_aKey;      // aKey.Len != 0  -> encryption
-    long            m_nVersion;
+    sal_Int32       m_nVersion;
 
 protected:
                         virtual ~SotStorage() override;
@@ -96,11 +96,11 @@ public:
 
     const OString&      GetKey() const { return m_aKey;}
 
-    void                SetVersion( long nVers )
+    void                SetVersion( sal_Int32 nVers )
                         {
                             m_nVersion = nVers;
                         }
-    long                GetVersion() const
+    sal_Int32           GetVersion() const
                         {
                             return m_nVersion;
                         }
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index cd7f20e57e91..0a4164e8dfa6 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -172,7 +172,7 @@ private:
     unsigned char   m_nCryptMask;
 
     // Userdata
-    long            m_nVersion;   // for external use
+    sal_Int32       m_nVersion;   // for external use
 
                     SvStream ( const SvStream& rStream ) = delete;
     SvStream&       operator=( const SvStream& rStream ) = delete;
@@ -384,8 +384,8 @@ public:
     bool            IsWritable() const { return m_isWritable; }
     StreamMode      GetStreamMode() const { return m_eStreamMode; }
 
-    long            GetVersion() { return m_nVersion; }
-    void            SetVersion( long n ) { m_nVersion = n; }
+    sal_Int32       GetVersion() { return m_nVersion; }
+    void            SetVersion( sal_Int32 n ) { m_nVersion = n; }
 
     friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // for Manips