diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 15:39:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-20 07:09:15 +0100 |
| commit | 214804d132ad134a65cdbc60fc136230fedcd325 (patch) | |
| tree | a0f560a2735c0c89f5a7687264499ca6f7e75766 /include/sot | |
| parent | cf4228fa0aaea82858f05848fe5a6a96b34405a0 (diff) | |
sal_uLong->sal_uInt32 in SotClipboardFormatId
Change-Id: Ibe48a6ae3cdb91a5eed2cf6d572b19df87a51d84
Reviewed-on: https://gerrit.libreoffice.org/46806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/formats.hxx | 4 | ||||
| -rw-r--r-- | include/sot/stg.hxx | 2 | ||||
| -rw-r--r-- | include/sot/storage.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index 4e36686203a8..a1f5f8858335 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -24,7 +24,7 @@ // - predefined formats - // Do NOT change the order of these values as the implementation depends on them! -enum class SotClipboardFormatId : sal_uLong +enum class SotClipboardFormatId : sal_uInt32 { // standard formats for that Copy/Paste methods exist STRING = 1, @@ -181,7 +181,7 @@ enum class SotClipboardFormatId : sal_uLong /** Make it easier to iterate over format IDs */ inline SotClipboardFormatId& operator++(SotClipboardFormatId& v) { - v = static_cast<SotClipboardFormatId>(static_cast<sal_uLong>(v) + 1); + v = static_cast<SotClipboardFormatId>(static_cast<sal_uInt32>(v) + 1); return v; } diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 4f2b19c0255e..b932f9139b09 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -79,7 +79,7 @@ public: virtual bool Equals( const BaseStorageStream& rStream ) const = 0; }; -enum class SotClipboardFormatId : sal_uLong; +enum class SotClipboardFormatId : sal_uInt32; class SAL_DLLPUBLIC_RTTI BaseStorage : public StorageBase { diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 4ca0bc9d9387..b8cbe947557a 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -29,7 +29,7 @@ #include <sot/storinfo.hxx> #include <sot/sotdllapi.h> -enum class SotClipboardFormatId : sal_uLong; +enum class SotClipboardFormatId : sal_uInt32; class SotStorage; class BaseStorageStream; |