include/sot/formats.hxx | 4 ++-- include/sot/stg.hxx | 2 +- include/sot/storage.hxx | 2 +- include/vcl/outdev.hxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit e6ea3bbef30a0b6e04236ecb52cba4ac39f6332f Author: Noel Grandin <[email protected]> Date: Tue Dec 19 08:50:52 2017 +0200 sal_uLong->sal_uInt32 in DrawModeFlags Change-Id: I99f703c487b87926bfd9cab5c8ace4c7509a72bf Reviewed-on: https://gerrit.libreoffice.org/46807 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 51d296fa8da0..a22f8a12a811 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -206,7 +206,7 @@ namespace o3tl } // DrawModes -enum class DrawModeFlags : sal_uLong +enum class DrawModeFlags : sal_uInt32 { Default = 0x00000000, BlackLine = 0x00000001, commit 214804d132ad134a65cdbc60fc136230fedcd325 Author: Noel Grandin <[email protected]> Date: Mon Dec 18 15:39:29 2017 +0200 sal_uLong->sal_uInt32 in SotClipboardFormatId Change-Id: Ibe48a6ae3cdb91a5eed2cf6d572b19df87a51d84 Reviewed-on: https://gerrit.libreoffice.org/46806 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
