include/vcl/toolkit/fmtfield.hxx | 9 +++++----
solenv/clang-format/blacklist | 2 +-
svx/inc/pch/precompiled_svxcore.hxx | 3 +--
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
vcl/inc/jsdialog/jsdialogbuilder.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/fmtfield.cxx | 2 +-
vcl/source/uitest/uiobject.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ba556833e19b401496b5bf7304de574c64780f81
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jul 5 17:52:22 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 6 14:53:44 2020 +0200
exile fmtfield.hxx to toolkit headers
Change-Id: I4d16dd079d4f8900d5e04677742679d6592f7066
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98165
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/fmtfield.hxx b/include/vcl/toolkit/fmtfield.hxx
similarity index 95%
rename from include/vcl/fmtfield.hxx
rename to include/vcl/toolkit/fmtfield.hxx
index c1b8adc73c80..8960d09406ea 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/toolkit/fmtfield.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_FMTFIELD_HXX
-#define INCLUDED_VCL_FMTFIELD_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include <vcl/formatter.hxx>
#include <vcl/spinfld.hxx>
@@ -91,6 +94,4 @@ private:
bool m_bPrependCurrSym;
};
-#endif // INCLUDED_VCL_FMTFIELD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index bddf53247817..72366ca871b4 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7349,7 +7349,6 @@ include/vcl/field.hxx
include/vcl/fixed.hxx
include/vcl/floatwin.hxx
include/vcl/formatter.hxx
-include/vcl/fmtfield.hxx
include/vcl/fntstyle.hxx
include/vcl/font.hxx
include/vcl/fontcapabilities.hxx
@@ -7449,6 +7448,7 @@ include/vcl/toolkit/dialog.hxx
include/vcl/toolkit/field.hxx
include/vcl/toolkit/fixed.hxx
include/vcl/toolkit/fixedhyper.hxx
+include/vcl/toolkit/fmtfield.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/lstbox.hxx
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index 9e628b68e5c8..7d34038a8de4 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-07-02 16:18:48 using:
+ Generated on 2020-07-05 17:54:04 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:
@@ -119,7 +119,6 @@
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
-#include <vcl/formatter.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index b5407feef977..4c9a01d2ab0c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -92,7 +92,7 @@
#include <vcl/toolkit/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/longcurr.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 1832c3a9fe48..e630919b206e 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -43,7 +43,7 @@
#include <controls/filectrl.hxx>
#include <svl/zforlist.hxx>
#include <vcl/button.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/graph.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/toolkit/combobox.hxx>
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 1ef216f18c99..3842d950d029 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -17,7 +17,7 @@
#include <vcl/builder.hxx>
#include <salvtables.hxx>
#include <vcl/button.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
class ToolBox;
class ComboBox;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 57b4fa29e5a5..6343dfe21ffe 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -48,7 +48,7 @@
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/headbar.hxx>
#include <vcl/ivctrl.hxx>
#include <vcl/layout.hxx>
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 40f3e4c0a711..391e9b98870f 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -27,7 +27,7 @@
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <svl/zformat.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/uitest/uiobject.hxx>
#include <vcl/uitest/formattedfielduiobject.hxx>
#include <vcl/weld.hxx>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index f7c3c79de9d3..29b3c296b8d2 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -19,7 +19,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/toolkit/spin.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/spinfld.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/dialog.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c31611e89a2b..2ab065ada2d5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -27,7 +27,7 @@
#include <vcl/edit.hxx>
#include <vcl/toolkit/field.hxx>
#include <vcl/fieldvalues.hxx>
-#include <vcl/fmtfield.hxx>
+#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/toolkit/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/headbar.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
