[Libreoffice-commits] core.git: basctl/inc include/sfx2 include/svtools reportdesign/inc svtools/source sw/inc sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sun Feb 16 19:19:33 UTC 2020
basctl/inc/pch/precompiled_basctl.hxx | 3 +--
include/sfx2/stbitem.hxx | 4 ++--
include/svtools/brwbox.hxx | 2 +-
reportdesign/inc/pch/precompiled_rptui.hxx | 3 +--
svtools/source/brwbox/brwbox1.cxx | 1 +
svtools/source/brwbox/brwbox2.cxx | 3 ++-
sw/inc/pch/precompiled_swui.hxx | 3 +--
sw/source/uibase/utlui/wordcountctrl.cxx | 1 +
8 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit b0bc9a81c23d04aed3e01642a33b711da35e4751
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 16 15:34:55 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Feb 16 20:19:00 2020 +0100
use fwd decls of StatusBar
Change-Id: Ib7ba9978e348a824a23310f9a4e6cfb6b7c18f0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88811
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 92dc157242a9..6a8c8065274b 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-14 21:46:02 using:
+ Generated on 2020-02-16 15:31:09 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:
@@ -149,7 +149,6 @@
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
-#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 4531d0a23b81..e49a81e78e88 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -23,11 +23,11 @@
#include <sfx2/dllapi.h>
#include <svl/poolitem.hxx>
#include <svtools/statusbarcontroller.hxx>
-#include <vcl/status.hxx>
-
+#include <vcl/vclptr.hxx>
class SfxModule;
class SfxStatusBarControl;
+class StatusBar;
svt::StatusbarController* SfxStatusBarControllerFactory(
const css::uno::Reference< css::frame::XFrame >& rFrame,
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index d8533f923dcd..f7c4919a1c3f 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/status.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/vclptr.hxx>
#include <tools/multisel.hxx>
@@ -40,6 +39,7 @@ class BrowserColumn;
class BrowserDataWin;
class BrowserHeader;
class ScrollBar;
+class StatusBar;
namespace svt {
class BrowseBoxImpl;
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 6060869edb98..1cb01665f7f4 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.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:42:29 using:
+ Generated on 2020-02-16 15:31:14 using:
./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -145,7 +145,6 @@
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index dcd34afe000b..4c548c32d2c7 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -26,6 +26,7 @@
#include <tools/fract.hxx>
#include <sal/log.hxx>
#include <vcl/scrbar.hxx>
+#include <vcl/status.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 afbc767a3828..92cd50a2cc92 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -24,10 +24,11 @@
#include <svtools/brwbox.hxx>
#include "datwin.hxx"
#include <svtools/colorcfg.hxx>
-#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/scrbar.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/status.hxx>
#include <tools/multisel.hxx>
#include <tools/fract.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 9314d94b2ab7..10d4bf0eea3b 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 21:46:46 using:
+ Generated on 2020-02-16 15:31:35 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:
@@ -150,7 +150,6 @@
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx
index a3762edeba4e..93eba3c736df 100644
--- a/sw/source/uibase/utlui/wordcountctrl.cxx
+++ b/sw/source/uibase/utlui/wordcountctrl.cxx
@@ -11,6 +11,7 @@
#include <strings.hrc>
#include <wordcountctrl.hxx>
#include <svl/stritem.hxx>
+#include <vcl/status.hxx>
SFX_IMPL_STATUSBAR_CONTROL(SwWordCountStatusBarControl, SfxStringItem);
More information about the Libreoffice-commits
mailing list