solenv/clang-format/excludelist | 4 ++-- starmath/Library_sm.mk | 1 + starmath/inc/scrwin.hxx | 14 +++++--------- starmath/inc/view.hxx | 2 +- starmath/source/scrwin.cxx | 2 +- svtools/Library_svt.mk | 1 - 6 files changed, 10 insertions(+), 14 deletions(-)
New commits: commit 209dd51b88bbf12bca548ca9fa31e78d1ae8bde5 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 27 19:45:46 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Aug 28 10:21:23 2020 +0200 move ScrollableWindow to beside its only consumer Change-Id: I9c73dba293cd831834a560e9fd8e8c2d135e2358 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101494 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 84ddb0686497..7f6d46a1276a 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6607,7 +6607,6 @@ include/svtools/rtftoken.h include/svtools/ruler.hxx include/svtools/sampletext.hxx include/svtools/scriptedtext.hxx -include/svtools/scrwin.hxx include/svtools/sfxecode.hxx include/svtools/slidesorterbaropt.hxx include/svtools/soerr.hxx @@ -12639,6 +12638,7 @@ starmath/inc/helpids.h starmath/inc/node.hxx starmath/inc/parse.hxx starmath/inc/rect.hxx +starmath/inc/scrwin.hxx starmath/inc/smdll.hxx starmath/inc/smmod.hxx starmath/inc/strings.hxx @@ -12689,6 +12689,7 @@ starmath/source/parse.cxx starmath/source/rect.cxx starmath/source/register.cxx starmath/source/register.hxx +starmath/source/scrwin.cxx starmath/source/smdetect.cxx starmath/source/smdetect.hxx starmath/source/smdll.cxx @@ -13004,7 +13005,6 @@ svtools/source/control/inettbc.cxx svtools/source/control/managedmenubutton.cxx svtools/source/control/ruler.cxx svtools/source/control/scriptedtext.cxx -svtools/source/control/scrwin.cxx svtools/source/control/tabbar.cxx svtools/source/control/toolbarmenu.cxx svtools/source/control/valueacc.cxx diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 33fb7525bba0..5d75c87eb58f 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/rtfexport \ starmath/source/parse \ starmath/source/rect \ + starmath/source/scrwin \ starmath/source/smdll \ starmath/source/smmod \ starmath/source/symbol \ diff --git a/include/svtools/scrwin.hxx b/starmath/inc/scrwin.hxx similarity index 87% rename from include/svtools/scrwin.hxx rename to starmath/inc/scrwin.hxx index c232ae4879b8..253f6c59d3f6 100644 --- a/include/svtools/scrwin.hxx +++ b/starmath/inc/scrwin.hxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SCRWIN_HXX -#define INCLUDED_SVTOOLS_SCRWIN_HXX +#pragma once -#include <svtools/svtdllapi.h> #include <vcl/window.hxx> #include <vcl/vclptr.hxx> @@ -28,7 +26,7 @@ class DataChangedEvent; class ScrollBar; class ScrollBarBox; -class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window +class ScrollableWindow : public vcl::Window { private: Point aPixOffset; // offset to virtual window (pixel) @@ -41,8 +39,8 @@ private: VclPtr<ScrollBarBox> aCornerWin; // window in the bottom right corner bool bScrolling:1; // user controlled scrolling - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar *, void ); - DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar *, void ); + DECL_LINK( ScrollHdl, ScrollBar *, void ); + DECL_LINK( EndScrollHdl, ScrollBar *, void ); public: ScrollableWindow( vcl::Window* pParent ); @@ -64,9 +62,7 @@ public: virtual void Scroll( long nDeltaX, long nDeltaY, ScrollFlags nFlags = ScrollFlags::NONE ) override; private: - SVT_DLLPRIVATE Size GetOutputSizePixel() const; + Size GetOutputSizePixel() const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index b3625b7dc76b..5f3a8c52d547 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -26,13 +26,13 @@ #include <rtl/ref.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/viewsh.hxx> -#include <svtools/scrwin.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/shell.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/timer.hxx> #include "document.hxx" #include "edit.hxx" +#include "scrwin.hxx" class SmViewShell; class SmPrintUIOptions; diff --git a/svtools/source/control/scrwin.cxx b/starmath/source/scrwin.cxx similarity index 99% rename from svtools/source/control/scrwin.cxx rename to starmath/source/scrwin.cxx index b56fe3db82d4..110338a05207 100644 --- a/svtools/source/control/scrwin.cxx +++ b/starmath/source/scrwin.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/scrwin.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/scrbar.hxx> +#include <scrwin.hxx> ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) : Window( pParent, WB_CLIPCHILDREN ), diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 752c2ce27d0e..be89ea4c2b56 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/control/managedmenubutton \ svtools/source/control/ruler \ svtools/source/control/scriptedtext \ - svtools/source/control/scrwin \ svtools/source/control/tabbar \ svtools/source/control/toolbarmenu \ svtools/source/control/valueacc \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
