summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-14 21:45:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-16 20:18:29 +0100
commit700936e43df0ac06accac1b3a8218e221e46455c (patch)
treed9d4fb8ae5904ea33e626190dc26b237cfc32fc9
parent76e14924edcecc4312229b5a9b9b9a80f597695d (diff)
use fwd decls
Change-Id: I06a4049d84d3ef755b713c045f686361782bdfc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88807 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx12
-rw-r--r--include/svtools/brwbox.hxx2
-rw-r--r--include/svtools/scrwin.hxx4
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx17
-rw-r--r--starmath/source/edit.cxx1
-rw-r--r--svtools/source/brwbox/brwbox1.cxx1
-rw-r--r--svtools/source/brwbox/brwbox2.cxx1
-rw-r--r--svtools/source/brwbox/datwin.cxx1
-rw-r--r--svtools/source/brwbox/datwin.hxx3
-rw-r--r--svtools/source/control/scrwin.cxx4
-rw-r--r--sw/inc/pch/precompiled_swui.hxx3
11 files changed, 15 insertions, 34 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index ecd91070e149..92dc157242a9 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-13 21:29:21 using:
+ Generated on 2020-02-14 21:46:02 using:
./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -114,15 +114,12 @@
#include <vcl/combobox.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/ctrl.hxx>
-#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
-#include <vcl/dockwin.hxx>
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -136,7 +133,6 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaactiontypes.hxx>
@@ -160,7 +156,6 @@
#include <vcl/textfilter.hxx>
#include <vcl/textview.hxx>
#include <vcl/timer.hxx>
-#include <vcl/toolbox.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
#include <vcl/treelistentries.hxx>
@@ -396,7 +391,6 @@
#include <sfx2/request.hxx>
#include <sfx2/shell.hxx>
#include <sfx2/stbitem.hxx>
-#include <sfx2/tbxctrl.hxx>
#include <sfx2/viewfrm.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@@ -426,12 +420,8 @@
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/statusbarcontroller.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/toolbarmenu.hxx>
#include <svtools/toolboxcontroller.hxx>
-#include <svtools/valueset.hxx>
#include <svx/DiagramDataInterface.hxx>
-#include <svx/Palette.hxx>
-#include <svx/SvxColorValueSet.hxx>
#include <svx/XPropertyEntry.hxx>
#include <svx/ipolypolygoneditorcontroller.hxx>
#include <svx/itextprovider.hxx>
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index af44c7613b8a..d8533f923dcd 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVTOOLS_BRWBOX_HXX
#include <svtools/svtdllapi.h>
-#include <vcl/scrbar.hxx>
#include <vcl/status.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/vclptr.hxx>
@@ -40,6 +39,7 @@
class BrowserColumn;
class BrowserDataWin;
class BrowserHeader;
+class ScrollBar;
namespace svt {
class BrowseBoxImpl;
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index f63ba409c58d..c232ae4879b8 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -21,10 +21,12 @@
#define INCLUDED_SVTOOLS_SCRWIN_HXX
#include <svtools/svtdllapi.h>
-#include <vcl/scrbar.hxx>
+#include <vcl/window.hxx>
#include <vcl/vclptr.hxx>
class DataChangedEvent;
+class ScrollBar;
+class ScrollBarBox;
class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window
{
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 306c66fdef39..7d492672cafd 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-13 17:43:02 using:
+ Generated on 2020-02-16 15:22:47 using:
./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -26,7 +26,6 @@
#include <cassert>
#include <cstddef>
#include <cstring>
-#include <deque>
#include <functional>
#include <initializer_list>
#include <map>
@@ -93,11 +92,11 @@
#include <vcl/button.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/commandinfoprovider.hxx>
-#include <vcl/customweld.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
+#include <vcl/fixed.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
@@ -437,36 +436,24 @@
#include <sfx2/sfxresid.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/sidebar/Context.hxx>
-#include <sidebar/ControllerFactory.hxx>
#include <sfx2/sidebar/Deck.hxx>
-#include <sidebar/DeckDescriptor.hxx>
-#include <sidebar/DeckTitleBar.hxx>
-#include <sidebar/DrawHelper.hxx>
-#include <sidebar/Paint.hxx>
#include <sfx2/sidebar/Panel.hxx>
-#include <sidebar/PanelDescriptor.hxx>
-#include <sidebar/PanelTitleBar.hxx>
#include <sfx2/sidebar/ResourceManager.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/sidebar/SidebarController.hxx>
#include <sfx2/sidebar/SidebarDockingWindow.hxx>
#include <sfx2/sidebar/TabBar.hxx>
#include <sfx2/sidebar/Theme.hxx>
-#include <sidebar/TitleBar.hxx>
#include <sfx2/sidebar/Tools.hxx>
#include <sfx2/signaturestate.hxx>
#include <sfx2/stbitem.hxx>
#include <sfx2/styfitem.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/tbxctrl.hxx>
-#include <templatecontaineritem.hxx>
#include <sfx2/templatedlg.hxx>
#include <sfx2/templatelocalview.hxx>
-#include <templateviewitem.hxx>
#include <sfx2/thumbnailview.hxx>
-#include <thumbnailviewitem.hxx>
#include <sfx2/tplpitem.hxx>
-#include <unoctitm.hxx>
#include <sfx2/viewfac.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 515b924ee1ef..ae7c4aca99a8 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -22,6 +22,7 @@
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
+#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
#include <editeng/editview.hxx>
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index e9be5c9bc4a3..dcd34afe000b 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -25,6 +25,7 @@
#include <tools/debug.hxx>
#include <tools/fract.hxx>
#include <sal/log.hxx>
+#include <vcl/scrbar.hxx>
#include <algorithm>
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 877277701e14..afbc767a3828 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -27,6 +27,7 @@
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/ptrstyle.hxx>
+#include <vcl/scrbar.hxx>
#include <tools/multisel.hxx>
#include <tools/fract.hxx>
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index c40b9142892c..074ce53aec4f 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -23,6 +23,7 @@
#include <vcl/commandevent.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
+#include <vcl/scrbar.hxx>
#include <vcl/ptrstyle.hxx>
#include <tools/debug.hxx>
#include <tools/fract.hxx>
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index ade56223aa03..d0fa8ff31db1 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -21,14 +21,13 @@
#include <svtools/brwbox.hxx>
#include <svtools/brwhead.hxx>
+#include <vcl/scrbar.hxx>
#include <vcl/timer.hxx>
#include <vcl/transfer.hxx>
#include <vector>
-
#define MIN_COLUMNWIDTH 2
-
class ButtonFrame
{
tools::Rectangle const aRect;
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index d503ff5928fc..65754a1db569 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -18,10 +18,10 @@
*/
#include <svtools/scrwin.hxx>
-#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
-
+#include <vcl/settings.hxx>
+#include <vcl/scrbar.hxx>
ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) :
Window( pParent, WB_CLIPCHILDREN ),
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 806127d57a0e..9314d94b2ab7 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-14 09:32:42 using:
+ Generated on 2020-02-14 21:46:46 using:
./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -149,7 +149,6 @@
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>