diff options
| -rw-r--r-- | include/svl/itempool.hxx | 4 | ||||
| -rw-r--r-- | include/svl/undo.hxx | 7 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 98f8a01f426a..8f380da9d233 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -216,9 +216,9 @@ public: void SetFileFormatVersion( sal_uInt16 nFileFormatVersion ); bool IsCurrentVersionLoading() const; - static int IsWhich(sal_uInt16 nId) { + static bool IsWhich(sal_uInt16 nId) { return nId && nId <= SFX_WHICH_MAX; } - static int IsSlot(sal_uInt16 nId) { + static bool IsSlot(sal_uInt16 nId) { return nId && nId > SFX_WHICH_MAX; } static const SfxItemPool* GetStoringPool(); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 00522c67451c..8da6edf2e977 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -220,11 +220,8 @@ namespace svl class SAL_NO_VTABLE IUndoManager { public: - enum - { - CurrentLevel = true, - TopLevel = false - }; + static bool const CurrentLevel = true; + static bool const TopLevel = false; virtual ~IUndoManager() { }; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index e4e011355bc8..f63327b66558 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -820,7 +820,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) rStream >> nSlot; sal_uInt16 nMappedWhich = GetWhich(nSlot, sal_False); - int bKnownItem = bOwnPool || IsWhich(nMappedWhich); + bool bKnownItem = bOwnPool || IsWhich(nMappedWhich); sal_uInt16 nRef(0), nCount(0), nVersion(0); sal_uInt32 nAttrSize(0); @@ -915,7 +915,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) *ppArr = pNewArr; // die Items merken, die schon im Pool sind - int bEmpty = sal_True; + bool bEmpty = true; if ( 0 != pOldArr ) for ( size_t n = 0; bEmpty && n < pOldArr->size(); ++n ) bEmpty = pOldArr->operator[](n) == 0; @@ -968,7 +968,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) rStream >> nSlot; sal_uInt16 nMappedWhich = GetWhich(nSlot, sal_False); - int bKnownItem = bOwnPool || IsWhich(nMappedWhich); + bool bKnownItem = bOwnPool || IsWhich(nMappedWhich); sal_uLong nPos = nLastPos; sal_uInt32 nSize(0); |