1 files changed, 14 insertions, 3 deletions

diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index c434a4f06555..d0f8672cc698 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -25,6 +25,7 @@
 #include <svtools/colorcfg.hxx>
 #include <svx/weldeditview.hxx>
 #include <vcl/timer.hxx>
+#include <mutex>
 
 namespace com::sun::star::beans { class XMultiPropertySet; }
 
@@ -36,15 +37,16 @@ namespace dbaui
         class ChangesListener;
         friend class ChangesListener;
 
+        std::unique_ptr<weld::ScrolledWindow> m_xScrolledWindow;
         Link<LinkParamNone*,void> m_aModifyLink;
         const svtools::ColorConfig m_aColorConfig;
         Timer m_aUpdateDataTimer;
         const SyntaxHighlighter m_aHighlighter;
         svtools::ColorConfig m_ColorConfig;
-        SfxItemPool* m_pItemPool;
+        rtl::Reference<SfxItemPool> m_pItemPool;
 
         rtl::Reference<ChangesListener> m_listener;
-        osl::Mutex m_mutex;
+        std::mutex m_mutex;
         css::uno::Reference<css::beans::XMultiPropertySet> m_notifier;
 
         bool m_bInUpdate;
@@ -52,6 +54,8 @@ namespace dbaui
 
         DECL_LINK(ModifyHdl, LinkParamNone*, void);
         DECL_LINK(ImplUpdateDataHdl, Timer*, void);
+        DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void);
+        DECL_LINK(EditStatusHdl, EditStatus&, void);
 
         Color GetColorValue(TokenType aToken);
 
@@ -62,13 +66,20 @@ namespace dbaui
         static void SetItemPoolFont(SfxItemPool* pItemPool);
 
         void UpdateData();
+
+        void SetScrollBarRange();
+        void DoScroll();
+
+        virtual void EditViewScrollStateChange() override;
+
     public:
-        SQLEditView();
+        SQLEditView(std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
         virtual void makeEditEngine() override;
         virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
         virtual ~SQLEditView() override;
 
         virtual bool KeyInput(const KeyEvent& rKEvt) override;
+        virtual bool Command(const CommandEvent& rCEvt) override;
 
         void SetTextAndUpdate(const OUString& rNewText);