chart2/source/controller/dialogs/DataBrowser.hxx | 2 +- chart2/source/controller/dialogs/res_Trendline.hxx | 2 +- chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2 +- chart2/source/controller/dialogs/tp_Scale.hxx | 2 +- extensions/source/propctrlr/standardcontrol.hxx | 2 +- extensions/source/propctrlr/usercontrol.hxx | 2 +- include/vcl/fmtfield.hxx | 14 +++++++------- sc/source/ui/cctrl/checklistmenu.cxx | 2 +- solenv/clang-format/blacklist | 4 ++-- svtools/Library_svt.mk | 1 - svtools/source/brwbox/ebbcontrols.cxx | 2 +- svtools/source/inc/unoiface.hxx | 2 +- svtools/source/uno/unoiface.cxx | 2 +- svx/source/fmcomp/fmgridcl.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 2 +- sw/source/core/docnode/ndcopy.cxx | 2 +- vcl/Library_vcl.mk | 1 + vcl/source/control/fmtfield.cxx | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 6eff96fa686d71f90478c262e5522a905ca3eff2 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Nov 14 11:06:13 2018 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Nov 14 13:48:40 2018 +0100 move fmtfield Change-Id: Ic3f4388ea2ca92d9e97d4a9e066eea07c7de79e5 Reviewed-on: https://gerrit.libreoffice.org/63363 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 4681e4ff6412..213f3ef9175a 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DATABROWSER_HXX #include <svtools/editbrowsebox.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <memory> #include <vector> diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 785d61d4065d..604b8d38d236 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -24,7 +24,7 @@ #include <svl/itemset.hxx> #include <svx/chrtitem.hxx> #include <vcl/field.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> class SvNumberFormatter; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 154dafdad0ad..656e04f59367 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_AXISPOSITIONS_HXX #include <sfx2/tabdlg.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <vcl/button.hxx> #include <vcl/lstbox.hxx> diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index ec89fb4fc475..8e6c7aacf266 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SCALE_HXX #include <sfx2/tabdlg.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/field.hxx> diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index d9ec0552e3ed..6da36353c28e 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -33,7 +33,7 @@ #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <svtools/calendar.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <svx/colorbox.hxx> #include <set> diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 06e01d8a00ef..01d57088f28f 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -21,7 +21,7 @@ #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_USERCONTROL_HXX #include "commoncontrol.hxx" -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <svtools/fileurlbox.hxx> #include "standardcontrol.hxx" diff --git a/include/svtools/fmtfield.hxx b/include/vcl/fmtfield.hxx similarity index 97% rename from include/svtools/fmtfield.hxx rename to include/vcl/fmtfield.hxx index 6be6e44c59b0..16b01dd3c1e5 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/vcl/fmtfield.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_FMTFIELD_HXX -#define INCLUDED_SVTOOLS_FMTFIELD_HXX +#ifndef INCLUDED_VCL_FMTFIELD_HXX +#define INCLUDED_VCL_FMTFIELD_HXX #include <svtools/svtdllapi.h> #include <vcl/spinfld.hxx> @@ -38,7 +38,7 @@ enum class FORMAT_CHANGE_TYPE }; -class SVT_DLLPUBLIC FormattedField : public SpinField +class VCL_DLLPUBLIC FormattedField : public SpinField { private: // A SvNumberFormatter is very expensive (regarding time and space), it is a Singleton @@ -51,7 +51,7 @@ private: ~StaticFormatter(); operator SvNumberFormatter* () { return GetFormatter(); } - SVT_DLLPUBLIC static SvNumberFormatter* GetFormatter(); + VCL_DLLPUBLIC static SvNumberFormatter* GetFormatter(); }; protected: @@ -253,7 +253,7 @@ protected: }; -class SVT_DLLPUBLIC DoubleNumericField final : public FormattedField +class VCL_DLLPUBLIC DoubleNumericField final : public FormattedField { public: DoubleNumericField(vcl::Window* pParent, WinBits nStyle); @@ -270,7 +270,7 @@ private: }; -class DoubleCurrencyField final : public FormattedField +class VCL_DLLPUBLIC DoubleCurrencyField final : public FormattedField { public: DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle); @@ -291,6 +291,6 @@ private: bool m_bChangingFormat; }; -#endif // INCLUDED_SVTOOLS_FMTFIELD_HXX +#endif // INCLUDED_VCL_FMTFIELD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 68a7fea25e00..492c64b3d1c7 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> #include <document.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 475e66ae2c35..e8bc0fc4e5dc 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7046,7 +7046,6 @@ include/svtools/filechangedchecker.hxx include/svtools/filectrl.hxx include/svtools/fileurlbox.hxx include/svtools/fileview.hxx -include/svtools/fmtfield.hxx include/svtools/foldertree.hxx include/svtools/fontsubstconfig.hxx include/svtools/framestatuslistener.hxx @@ -7939,6 +7938,7 @@ include/vcl/fixed.hxx include/vcl/fixedhyper.hxx include/vcl/floatwin.hxx include/vcl/fltcall.hxx +include/vcl/fmtfield.hxx include/vcl/fntstyle.hxx include/vcl/font.hxx include/vcl/fontcapabilities.hxx @@ -13895,7 +13895,6 @@ svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/filectrl.cxx svtools/source/control/fileurlbox.cxx -svtools/source/control/fmtfield.cxx svtools/source/control/headbar.cxx svtools/source/control/hyperlabel.cxx svtools/source/control/indexentryres.cxx @@ -17973,6 +17972,7 @@ vcl/source/control/field.cxx vcl/source/control/field2.cxx vcl/source/control/fixed.cxx vcl/source/control/fixedhyper.cxx +vcl/source/control/fmtfield.cxx vcl/source/control/imgctrl.cxx vcl/source/control/imp_listbox.cxx vcl/source/control/listbox.cxx diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 5bbfb0925363..a10c57ce21cf 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -109,7 +109,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/control/ctrltool \ svtools/source/control/filectrl \ svtools/source/control/fileurlbox \ - svtools/source/control/fmtfield \ svtools/source/control/headbar \ svtools/source/control/hyperlabel \ svtools/source/control/indexentryres \ diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index c94dfaa61bf4..7aad65c5d480 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -18,7 +18,7 @@ #include <svtools/editbrowsebox.hxx> #include <vcl/decoview.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <vcl/xtextedt.hxx> #include <algorithm> diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 4de164ec6769..1e4a10b82dc7 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XTextLayoutConstrains.hpp> #include <svtools/svmedit.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <cppuhelper/implbase.hxx> diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index e5f3cade1ec4..a94d9ede4c33 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -32,7 +32,7 @@ #include <cppuhelper/queryinterface.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <svl/numuno.hxx> #include <svtools/calendar.hxx> #include <vcl/treelistbox.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 99ea376c76f8..8ad74993d68c 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -60,7 +60,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <svl/numuno.hxx> #include <tools/multisel.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 3231452d8434..526917920bee 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -59,7 +59,7 @@ #include <rtl/math.hxx> #include <svtools/calendar.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <svl/numuno.hxx> #include <svtools/svmedit.hxx> #include <svx/dialmgr.hxx> diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 88d2cef844c7..4088485a4964 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -27,7 +27,7 @@ #include <docary.hxx> #include <ddefld.hxx> #include <swddetbl.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <ndindex.hxx> #include <vector> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 965cb4bd4130..855cf2dfb32f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -182,6 +182,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/control/field \ vcl/source/control/fixed \ vcl/source/control/fixedhyper \ + vcl/source/control/fmtfield \ vcl/source/control/imgctrl \ vcl/source/control/listctrl \ vcl/source/control/longcurr \ diff --git a/svtools/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx similarity index 99% rename from svtools/source/control/fmtfield.cxx rename to vcl/source/control/fmtfield.cxx index 08d10c781eba..5a6948e793a6 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/vcl/source/control/fmtfield.cxx @@ -25,7 +25,7 @@ #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> #include <svl/zformat.hxx> -#include <svtools/fmtfield.hxx> +#include <vcl/fmtfield.hxx> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/SearchOptions.hpp> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
