summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--vcl/inc/slider.hxx (renamed from include/vcl/slider.hxx)30
-rw-r--r--vcl/source/app/salvtables.cxx2
-rw-r--r--vcl/source/control/slider.cxx2
-rw-r--r--vcl/source/window/builder.cxx2
5 files changed, 19 insertions, 19 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c359063ec310..10be36f3b785 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7837,7 +7837,6 @@ include/vcl/scopedbitmapaccess.hxx
include/vcl/scrbar.hxx
include/vcl/seleng.hxx
include/vcl/settings.hxx
-include/vcl/slider.hxx
include/vcl/sound.hxx
include/vcl/spinfld.hxx
include/vcl/split.hxx
@@ -17303,6 +17302,7 @@ vcl/inc/schedulerimpl.hxx
vcl/inc/scrptrun.h
vcl/inc/scrwnd.hxx
vcl/inc/sft.hxx
+vcl/inc/slider.hxx
vcl/inc/spin.hxx
vcl/inc/strings.hxx
vcl/inc/svdata.hxx
diff --git a/include/vcl/slider.hxx b/vcl/inc/slider.hxx
index 91e479f19ba1..6abccfceb527 100644
--- a/include/vcl/slider.hxx
+++ b/vcl/inc/slider.hxx
@@ -24,7 +24,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/scrbar.hxx>
-class VCL_DLLPUBLIC Slider final : public Control
+class Slider final : public Control
{
private:
tools::Rectangle maChannel1Rect;
@@ -55,20 +55,20 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
- SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE void ImplInitSettings();
- SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true );
- SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos );
- SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos );
- SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true );
- SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
- SAL_DLLPRIVATE bool ImplIsPageUp( const Point& rPos );
- SAL_DLLPRIVATE bool ImplIsPageDown( const Point& rPos );
- SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide );
- SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide );
- SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction );
- SAL_DLLPRIVATE void ImplDoSlide( long nNewPos );
- SAL_DLLPRIVATE void ImplDoSlideAction( ScrollType eScrollType );
+ void ImplInit( vcl::Window* pParent, WinBits nStyle );
+ void ImplInitSettings();
+ void ImplUpdateRects( bool bUpdate = true );
+ long ImplCalcThumbPos( long nPixPos );
+ long ImplCalcThumbPosPix( long nPos );
+ void ImplCalc( bool bUpdate = true );
+ void ImplDraw(vcl::RenderContext& rRenderContext);
+ bool ImplIsPageUp( const Point& rPos );
+ bool ImplIsPageDown( const Point& rPos );
+ long ImplSlide( long nNewPos, bool bCallEndSlide );
+ long ImplDoAction( bool bCallEndSlide );
+ void ImplDoMouseAction( const Point& rPos, bool bCallAction );
+ void ImplDoSlide( long nNewPos );
+ void ImplDoSlideAction( ScrollType eScrollType );
public:
Slider( vcl::Window* pParent, WinBits nStyle);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fedf54d2b833..fb68ee0c605d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -56,7 +56,7 @@
#include <vcl/menubtn.hxx>
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/ptrstyle.hxx>
-#include <vcl/slider.hxx>
+#include <slider.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/svtabbx.hxx>
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index f1f447f56673..d8d920f0718f 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -19,7 +19,7 @@
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
-#include <vcl/slider.hxx>
+#include <slider.hxx>
#include <vcl/settings.hxx>
#include "thumbpos.hxx"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 154eaaccd974..69758641ea23 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -47,7 +47,7 @@
#include <vcl/treelistentry.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/settings.hxx>
-#include <vcl/slider.hxx>
+#include <slider.hxx>
#include <vcl/weld.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <iconview.hxx>