diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-06-13 13:11:50 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-06-14 18:34:57 +0200 |
| commit | 4b1490406d5ff419f632b581bed9744291600dc0 (patch) | |
| tree | a555bddab7b751bad35a863e4bf8efb101b7b9b2 /svx/source | |
| parent | 90d77c7d18050437d47ba967e4c4ad7e523ced0e (diff) | |
tdf#118110 - Mouse wheel should work with the shapes desk
scrollwindow removed
Change-Id: Id38dd75120effe63314fb3665417c728f3822712
Reviewed-on: https://gerrit.libreoffice.org/55748
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
(cherry picked from commit dc5a7f14cb44c06c19772249973d06df1f4eccaa)
Reviewed-on: https://gerrit.libreoffice.org/55797
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/inc/DefaultShapesPanel.hxx | 3 | ||||
| -rw-r--r-- | svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx index 3759b1d859cd..d2e94258b965 100644 --- a/svx/source/inc/DefaultShapesPanel.hxx +++ b/svx/source/inc/DefaultShapesPanel.hxx @@ -60,7 +60,6 @@ private: VclPtr<ValueSet> mpCalloutSet; VclPtr<ValueSet> mpStarSet; VclPtr<ValueSet> mp3DObjectSet; - VclPtr<VclScrolledWindow> mpScrollWindow; Reference< XFrame > mxFrame; std::map<VclPtr<ValueSet>, std::map<sal_uInt16, rtl::OUString>> mpShapesSetMap; @@ -74,4 +73,4 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 671eeeba55b4..1f8c2d10b58c 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -34,7 +34,6 @@ DefaultShapesPanel::DefaultShapesPanel ( SvxShapeCommandsMap(), mxFrame(rxFrame) { - get(mpScrollWindow, "scrolledwindow1"); get(mpLineArrowSet, "LinesArrows"); get(mpCurveSet, "Curves"); get(mpConnectorSet, "Connectors"); @@ -92,7 +91,6 @@ void DefaultShapesPanel::Initialize() void DefaultShapesPanel::dispose() { mpShapesSetMap.clear(); - mpScrollWindow.clear(); mpLineArrowSet.clear(); mpCurveSet.clear(); mpConnectorSet.clear(); |