summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-15 09:02:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-15 09:02:44 +0100
commit6feb524aaf58009a55ea4d4e660c09b67adf26fa (patch)
treee55ba1ae5eb40b05100884850c14858ad351eb84 /include
parentd9d92d20fdc414c5956290c10c4d473dcb836ceb (diff)
More loplugin:cstylecast: svtools
Change-Id: Ia9517b20d6579a77a81906aff16068b732ada878
Diffstat (limited to 'include')
-rw-r--r--include/svtools/htmltokn.h4
-rw-r--r--include/svtools/svlbitm.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index 26706c5fc43d..46e0fb57fb2f 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -283,14 +283,14 @@ enum class HtmlTokenId : sal_Int16
constexpr bool isOffToken(HtmlTokenId nToken)
{
return (nToken == HtmlTokenId::NONE || nToken >= HtmlTokenId::ONOFF_START)
- ? (1 & (int)nToken)
+ ? (1 & static_cast<int>(nToken))
: throw std::logic_error("Assertion failed!"); // C++11 does not do assert in constexpr
}
constexpr HtmlTokenId getOnToken(HtmlTokenId nToken)
{
return (nToken == HtmlTokenId::NONE || nToken >= HtmlTokenId::ONOFF_START)
- ? HtmlTokenId(~1 & (int)nToken)
+ ? HtmlTokenId(~1 & static_cast<int>(nToken))
: throw std::logic_error("Assertion failed!"); // C++11 does not do assert in constexpr
}
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 2fbe1e6e9cf8..9bfe7e20e137 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -89,8 +89,8 @@ public:
SvTreeListEntry* GetActEntry() const;
- void SetImage(SvBmp nIndex, const Image& aImage) { aBmps[(int)nIndex] = aImage; }
- Image& GetImage(SvBmp nIndex) { return aBmps[(int)nIndex]; }
+ void SetImage(SvBmp nIndex, const Image& aImage) { aBmps[static_cast<int>(nIndex)] = aImage; }
+ Image& GetImage(SvBmp nIndex) { return aBmps[static_cast<int>(nIndex)]; }
void SetDefaultImages( const Control* pControlForSettings );
// set images according to the color scheme of the Control