diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-27 23:19:53 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-28 10:29:36 -0500 |
commit | 477e1eac51cd2840472a2eab8ef68cc352742705 (patch) | |
tree | ed3a0738ed4ce0370c1785ea1c6fe074777b05a4 /starmath/inc/ElementsDockingWindow.hxx | |
parent | b256135f1fe5a31735352ec2795e580b5a12fb09 (diff) |
Resolves: fdo#65583 Elements Dock window needs scroll bar
Based on the patch on Bugzilla by
Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Includes b521c754cba4ef96cf02e0d8913ffcf14fe168d4
Conflicts:
starmath/source/ElementsDockingWindow.cxx
Change-Id: I215b83894f228b1cc8908f98858b85c8d5378ddb
Reviewed-on: https://gerrit.libreoffice.org/9526
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/inc/ElementsDockingWindow.hxx')
-rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index ac2f3b4be8d7..2a726c43a7ba 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -16,11 +16,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX #define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX +#include <boost/scoped_ptr.hpp> #include <sfx2/dockwin.hxx> #include <svx/dlgctrl.hxx> +#include <vcl/scrbar.hxx> #include <document.hxx> #include <node.hxx> @@ -67,7 +70,6 @@ public: class SmElementsControl : public Control { - static const sal_uInt16 aUnaryBinaryOperatorsList[][2]; static const sal_uInt16 aRelationsList[][2]; static const sal_uInt16 aSetOperations[][2]; @@ -95,6 +97,7 @@ class SmElementsControl : public Control SmElementList maElementList; Size maMaxElementDimensions; bool mbVerticalMode; + boost::scoped_ptr< ScrollBar > mpScroll; void addElement(OUString aElementVisual, OUString aElementSource, OUString aHelpText); @@ -113,6 +116,9 @@ public: void setVerticalMode(bool bVertical); void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; } + + DECL_LINK( ScrollHdl, void* ); + void DoScroll(long nDelta); }; class SmElementsDockingWindow : public SfxDockingWindow @@ -151,7 +157,6 @@ protected: virtual ~SmElementsDockingWindowWrapper(); }; - -#endif // _SYMBOLDOCKINGWINDOW_HXX_ +#endif // INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |