[Libreoffice-commits] core.git: include/svtools svtools/inc svtools/source svx/inc sw/inc

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Feb 14 19:55:28 UTC 2020


 include/svtools/editbrowsebox.hxx     |    6 +++---
 svtools/inc/pch/precompiled_svt.hxx   |    3 ++-
 svtools/source/brwbox/ebbcontrols.cxx |   10 ++++++++++
 svx/inc/pch/precompiled_svxcore.hxx   |    3 +--
 sw/inc/pch/precompiled_swui.hxx       |    3 +--
 5 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 2936c3ce0e10a92b808be02483c6d55089cdc208
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 14 09:36:04 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 14 20:54:50 2020 +0100

    use fwd decl of SpinField
    
    Change-Id: Ifea23e791ec53448a8591583f283b87430ef38c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88678
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 2ac388323e04..0be5603898e2 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -27,7 +27,6 @@
 #include <vcl/window.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/spinfld.hxx>
 
 #include <svtools/brwbox.hxx>
 #include <svtools/brwhead.hxx>
@@ -36,6 +35,7 @@
 
 class Button;
 class CheckBox;
+class SpinField;
 
 // EditBrowseBoxFlags (EBBF)
 
@@ -256,8 +256,8 @@ namespace svt
     {
     public:
         SpinCellController(SpinField* pSpinField);
-        const SpinField& GetSpinWindow() const { return static_cast<const SpinField &>(GetWindow()); }
-        SpinField& GetSpinWindow() { return static_cast<SpinField &>(GetWindow()); }
+        const SpinField& GetSpinWindow() const;
+        SpinField& GetSpinWindow();
 
         virtual void SetModified() override;
         virtual bool IsModified() const override;
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index a26b21753606..ac1920ba1b9b 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.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 16:04:02 using:
+ Generated on 2020-02-14 09:32:48 using:
  ./bin/update_pch svtools svt --cutoff=4 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -101,6 +101,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
+#include <vcl/button.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 822c6413e241..e928fef8bd05 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -18,6 +18,7 @@
 
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/button.hxx>
+#include <vcl/spinfld.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
@@ -454,6 +455,15 @@ namespace svt
         GetSpinWindow().SetModifyHdl( LINK(this, SpinCellController, ModifyHdl) );
     }
 
+    const SpinField& SpinCellController::GetSpinWindow() const
+    {
+        return static_cast<const SpinField &>(GetWindow());
+    }
+
+    SpinField& SpinCellController::GetSpinWindow()
+    {
+        return static_cast<SpinField &>(GetWindow());
+    }
 
     void SpinCellController::SetModified()
     {
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 8a4f0d60d792..ddf81c1dc526 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.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:37:51 using:
+ Generated on 2020-02-14 09:32:42 using:
  ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -62,7 +62,6 @@
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
-#include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
 #include <rtl/character.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index fd997e9135b5..806127d57a0e 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-05 19:55:24 using:
+ Generated on 2020-02-14 09:32:42 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:
@@ -151,7 +151,6 @@
 #include <vcl/scopedbitmapaccess.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>


More information about the Libreoffice-commits mailing list