Skip to content

C
core
Kaydet (Commit) 15421d71 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Avoid reserved identifier 

Change-Id: I3ded47656c4e0f1c3134337bddab5713f29be27e
üst 165b087b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
sdext/source/presenter/PresenterScrollBar.cxx
Dosyayı görüntüle @ 15421d71
...@@ -449,7 +449,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven ...@@ -449,7 +449,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven
geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const
{ {
OSL_ASSERT(eArea>=0 && eArea<__AreaCount__); OSL_ASSERT(eArea>=0 && eArea<AreaCount);
return maBox[eArea]; return maBox[eArea];
} }
...@@ -602,7 +602,7 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo ...@@ -602,7 +602,7 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo
bool PresenterScrollBar::IsDisabled (const Area eArea) const bool PresenterScrollBar::IsDisabled (const Area eArea) const
{ {
OSL_ASSERT(eArea>=0 && eArea<__AreaCount__); OSL_ASSERT(eArea>=0 && eArea<AreaCount);
return ! maEnabledState[eArea]; return ! maEnabledState[eArea];
} }
......
sdext/source/presenter/PresenterScrollBar.hxx
Dosyayı görüntüle @ 15421d71
...@@ -157,7 +157,7 @@ public: ...@@ -157,7 +157,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None, enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None,
__AreaCount__ = None }; AreaCount = None };
protected: protected:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext; css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
...@@ -173,7 +173,7 @@ protected: ...@@ -173,7 +173,7 @@ protected:
::std::function<void (double)> maThumbMotionListener; ::std::function<void (double)> maThumbMotionListener;
Area meButtonDownArea; Area meButtonDownArea;
Area meMouseMoveArea; Area meMouseMoveArea;
css::geometry::RealRectangle2D maBox[__AreaCount__]; css::geometry::RealRectangle2D maBox[AreaCount];
bool mbIsNotificationActive; bool mbIsNotificationActive;
static std::weak_ptr<PresenterBitmapContainer> mpSharedBitmaps; static std::weak_ptr<PresenterBitmapContainer> mpSharedBitmaps;
std::shared_ptr<PresenterBitmapContainer> mpBitmaps; std::shared_ptr<PresenterBitmapContainer> mpBitmaps;
...@@ -185,7 +185,7 @@ protected: ...@@ -185,7 +185,7 @@ protected:
SharedBitmapDescriptor mpThumbStartDescriptor; SharedBitmapDescriptor mpThumbStartDescriptor;
SharedBitmapDescriptor mpThumbCenterDescriptor; SharedBitmapDescriptor mpThumbCenterDescriptor;
SharedBitmapDescriptor mpThumbEndDescriptor; SharedBitmapDescriptor mpThumbEndDescriptor;
bool maEnabledState[__AreaCount__]; bool maEnabledState[AreaCount];
css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; css::geometry::RealRectangle2D GetRectangle (const Area eArea) const;
virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment