diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-04-19 20:36:58 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-22 15:36:50 +0200 |
commit | e12fa18c69cbe1f441e972f3519d33638f15658e (patch) | |
tree | 323c049c122220ad5dc91fc6d1c3dfe613793ff9 /svx | |
parent | 0b48cee16d459d27ebd090d008ec9398c86fc581 (diff) |
tdf#42949 Simplify use of rtl::math::approxEqual in include/basegfx/
Turns out we can save about 500Mb of preprocessor input if we use
rtl_math_approxEqual from rtl/math.h instead of its C++ wrapper
rtl::math::approxEqual from rtl/math.hxx
and manage the fallout accordingly.
Before:
bin/includebloat.awk | head
sum total bytes included (excluding system headers): 19017296671
After:
$ bin/includebloat.awk | head
sum total bytes included (excluding system headers): 18535432672
Change-Id: I1691171f3a309405a7099882ad9989d147f59118
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92508
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx')
34 files changed, 34 insertions, 1 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 7cdafddd4929..cddb4571e93a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -48,6 +48,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <sal/log.hxx> +#include <rtl/math.hxx> using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx index d34b3a501c53..d5561ec5b32c 100644 --- a/svx/source/dialog/ClassificationCommon.cxx +++ b/svx/source/dialog/ClassificationCommon.cxx @@ -10,6 +10,7 @@ #include <svx/ClassificationCommon.hxx> #include <svx/ClassificationField.hxx> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 286113e01dfb..62d60094b1e2 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <rtl/math.hxx> #include <svx/framelink.hxx> #include <editeng/borderline.hxx> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 3a0e28473148..32a6b3d9576e 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -41,6 +41,7 @@ #include <editeng/lrspitem.hxx> #include <editeng/protitem.hxx> #include <osl/diagnose.h> +#include <rtl/math.hxx> #include "rlrcitem.hxx" #include <memory> diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index dddf6c3c930a..401e1b085410 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -25,6 +25,7 @@ #include <svx/globl3d.hxx> #include <basegfx/point/b3dpoint.hxx> #include <sdr/contact/viewcontactofe3dcube.hxx> +#include <rtl/ustrbuf.hxx> // DrawContact section diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 4f5269e1e6a1..d4aa1f024ae5 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -34,6 +34,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> +#include <rtl/ustrbuf.hxx> // DrawContact section diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 47ae21449a1b..37060f96e73a 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -31,6 +31,7 @@ #include <sdr/contact/viewcontactofe3dlathe.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <rtl/ustrbuf.hxx> // DrawContact section diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 131ea08de758..eca597bb4eeb 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/uno/Sequence.h> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/e3dsceneupdater.hxx> +#include <rtl/ustrbuf.hxx> using namespace com::sun::star; diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 7ca73dd76b83..66b13477067e 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -36,6 +36,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/svdmodel.hxx> +#include <rtl/ustrbuf.hxx> namespace { diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 95f439db5bc9..e5e6939c1872 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -29,6 +29,7 @@ #include <basegfx/vector/b3dvector.hxx> #include <basegfx/point/b3dpoint.hxx> #include <sdr/contact/viewcontactofe3dsphere.hxx> +#include <rtl/ustrbuf.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact() diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.cxx b/svx/source/sidebar/glow/GlowPropertyPanel.cxx index 545394e5f7b6..07e10e916fff 100644 --- a/svx/source/sidebar/glow/GlowPropertyPanel.cxx +++ b/svx/source/sidebar/glow/GlowPropertyPanel.cxx @@ -18,6 +18,7 @@ #include <svx/svddef.hxx> #include <svx/svxids.hrc> #include <svx/xcolit.hxx> +#include <rtl/math.hxx> namespace { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d0c7226dc020..ccab4da45a4a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -21,6 +21,7 @@ #include <cassert> #include <math.h> #include <sal/log.hxx> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index b08023a3fe0a..7e360f4b43cd 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -25,6 +25,7 @@ #include <svx/svdotable.hxx> #include <osl/thread.h> +#include <rtl/strbuf.hxx> #include <svx/svdoole2.hxx> #include <svx/xgrad.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 6c77b5b306ce..3d4e6bfc409b 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -81,6 +81,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2drange.hxx> #include <svdobjplusdata.hxx> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include "presetooxhandleadjustmentrelations.hxx" diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 8081df8269e5..7b1b5cc5db61 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/RelOrientation.hpp> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index cedb72282ef6..b6c3168f6cbb 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -28,6 +28,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <tools/bigint.hxx> #include <tools/helpers.hxx> +#include <rtl/ustrbuf.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 658a67f290e6..93978f1ef592 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -23,6 +23,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <math.h> +#include <rtl/ustrbuf.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 327ed76d661c..f4dd1c994eca 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -23,6 +23,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svl/hint.hxx> +#include <rtl/ustrbuf.hxx> #include <sdr/contact/viewcontactofsdredgeobj.hxx> #include <sdr/properties/connectorproperties.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index e565f3de71e0..5c216bd2835d 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -20,6 +20,7 @@ #include <unotools/streamwrap.hxx> #include <sfx2/lnkbase.hxx> +#include <rtl/ustrbuf.hxx> #include <tools/helpers.hxx> #include <tools/stream.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 1824546f5670..0ee6ef6a8fb6 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -32,6 +32,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <libxml/xmlwriter.h> +#include <rtl/ustrbuf.hxx> #include <vcl/canvastools.hxx> // BaseProperties section diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 5a7c334b2132..af407f84be7b 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -62,6 +62,7 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xpoly.hxx> +#include <rtl/ustrbuf.hxx> #include <unotools/syslocale.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 6e68116928a6..886ff96fd983 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -22,6 +22,7 @@ #include <svx/svdomedia.hxx> #include <rtl/ustring.hxx> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <ucbhelper/content.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 50afc8fcbd36..65b30eaed7e3 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -77,6 +77,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <editeng/outlobj.hxx> #include <svx/svdpage.hxx> +#include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <bitmaps.hlst> diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index a5fc10fb7e8d..aa91331b5393 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -25,6 +25,7 @@ #include <svx/svdpage.hxx> #include <sdr/properties/pageproperties.hxx> #include <sdr/contact/viewcontactofpageobj.hxx> +#include <rtl/ustrbuf.hxx> // BaseProperties section diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index bba20891df41..93b08170fcb6 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -19,6 +19,7 @@ #include <tools/bigint.hxx> #include <tools/helpers.hxx> +#include <rtl/ustrbuf.hxx> #include <svx/svdopath.hxx> #include <math.h> #include <svx/xpoly.hxx> diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 3fdfeb035d39..0c648189317a 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -28,6 +28,7 @@ #include <svx/strings.hrc> #include <sdr/properties/rectangleproperties.hxx> #include <sdr/contact/viewcontactofsdrrectobj.hxx> +#include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include <vcl/ptrstyle.hxx> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 915a387bebe2..49cea290ae4c 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -32,6 +32,7 @@ #include <svx/svdview.hxx> #include <svx/svdorect.hxx> #include <svx/svdviter.hxx> +#include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <svx/sdrpagewindow.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index bec8f74cb481..1fc49087a839 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -24,7 +24,7 @@ #include <svx/svdograf.hxx> #include <svx/svddrgv.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - +#include <rtl/ustrbuf.hxx> sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const { diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index af98fec68d0c..b47fda17bf4f 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -21,6 +21,7 @@ #include <svx/svdtrans.hxx> #include <math.h> #include <svx/xpoly.hxx> +#include <rtl/ustrbuf.hxx> #include <vcl/virdev.hxx> #include <tools/bigint.hxx> diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 545d9759d9af..7672e29cb021 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -52,6 +52,7 @@ #include <editeng/frmdiritem.hxx> #include <cppuhelper/implbase.hxx> #include <libxml/xmlwriter.h> +#include <rtl/ustrbuf.hxx> #include <boost/property_tree/ptree.hpp> diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index f19637c85976..5ca8a22d1b2b 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -39,6 +39,7 @@ #include <svx/chrtitem.hxx> #include <svx/sdasitm.hxx> #include <svl/intitem.hxx> +#include <rtl/math.hxx> #include <svx/extrusionbar.hxx> #include <extrusiondepthdialog.hxx> diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index ab51c4d3889b..1a29fbcaca86 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -24,6 +24,7 @@ #include <svx/dialmgr.hxx> #include <svx/xtable.hxx> +#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 6fd1646d79f0..3b84601fac27 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -31,6 +31,7 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <rtl/ustrbuf.hxx> #include <memory> using namespace ::com::sun::star; diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index b7ee2b94a5a8..8a53168b491b 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -23,6 +23,7 @@ #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/xtable.hxx> +#include <rtl/ustrbuf.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/BitmapTools.hxx> |