ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

move fmtfield

Browse Source 
Change-Id: Ic3f4388ea2ca92d9e97d4a9e066eea07c7de79e5
Reviewed-on: https://gerrit.libreoffice.org/63363
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2018-11-14 13:48:40 +01:00
parent 9c2c650c38
commit 6eff96fa68
18 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/dialogs/DataBrowser.hxx
+1 -1
View File
@@ -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>
chart2/source/controller/dialogs/res_Trendline.hxx
+1 -1
View File
@@ -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;
chart2/source/controller/dialogs/tp_AxisPositions.hxx
+1 -1
View File
@@ -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>
chart2/source/controller/dialogs/tp_Scale.hxx
+1 -1
View File
@@ -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>
extensions/source/propctrlr/standardcontrol.hxx
+1 -1
View File
@@ -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>
extensions/source/propctrlr/usercontrol.hxx
+1 -1
View File
@@ -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"
include/svtools/fmtfield.hxx → include/vcl/fmtfield.hxx
+7 -7
View File
@@ -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: */
sc/source/ui/cctrl/checklistmenu.cxx
+1 -1
View File
@@ -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>
solenv/clang-format/blacklist
+2 -2
View File
@@ -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
svtools/Library_svt.mk
-1
View File
@@ -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 \
svtools/source/brwbox/ebbcontrols.cxx
+1 -1
View File
@@ -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>
svtools/source/inc/unoiface.hxx
+1 -1
View File
@@ -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>
svtools/source/uno/unoiface.cxx
+1 -1
View File
@@ -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>
svx/source/fmcomp/fmgridcl.cxx
+1 -1
View File
@@ -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>
svx/source/fmcomp/gridcell.cxx
+1 -1
View File
@@ -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>
sw/source/core/docnode/ndcopy.cxx
+1 -1
View File
@@ -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>
vcl/Library_vcl.mk
+1
View File
@@ -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 \
svtools/source/control/fmtfield.cxx → vcl/source/control/fmtfield.cxx
+1 -1
View File
@@ -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>