summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx4
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index d7312955a28a..56e5cc970790 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -449,7 +449,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven
geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const
{
- OSL_ASSERT(eArea>=0 && eArea<__AreaCount__);
+ OSL_ASSERT(eArea>=0 && eArea<AreaCount);
return maBox[eArea];
}
@@ -602,7 +602,7 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo
bool PresenterScrollBar::IsDisabled (const Area eArea) const
{
- OSL_ASSERT(eArea>=0 && eArea<__AreaCount__);
+ OSL_ASSERT(eArea>=0 && eArea<AreaCount);
return ! maEnabledState[eArea];
}
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index b44de88bd47d..542972374244 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -157,7 +157,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None,
- __AreaCount__ = None };
+ AreaCount = None };
protected:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -173,7 +173,7 @@ protected:
::std::function<void (double)> maThumbMotionListener;
Area meButtonDownArea;
Area meMouseMoveArea;
- css::geometry::RealRectangle2D maBox[__AreaCount__];
+ css::geometry::RealRectangle2D maBox[AreaCount];
bool mbIsNotificationActive;
static std::weak_ptr<PresenterBitmapContainer> mpSharedBitmaps;
std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
@@ -185,7 +185,7 @@ protected:
SharedBitmapDescriptor mpThumbStartDescriptor;
SharedBitmapDescriptor mpThumbCenterDescriptor;
SharedBitmapDescriptor mpThumbEndDescriptor;
- bool maEnabledState[__AreaCount__];
+ bool maEnabledState[AreaCount];
css::geometry::RealRectangle2D GetRectangle (const Area eArea) const;
virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0;