diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-21 15:26:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-22 08:07:45 +0200 |
| commit | 180dd91c189de0bf03d5062e33c20da94c5d35d9 (patch) | |
| tree | c44efef174c8ba3ba07cb6eeb5b5aca388729c6e /include | |
| parent | f308520f1e3624c88e2a0e99be2eb26e2f2d0fc4 (diff) | |
long->tools::Long in emfio..filter
Change-Id: I961cee10d45d628ff70dea0694a7a63a4fe867ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104624
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 20 | ||||
| -rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 2 | ||||
| -rw-r--r-- | include/filter/msfilter/util.hxx | 3 |
3 files changed, 13 insertions, 12 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 78ea42bae527..2c72722e9cf8 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -446,14 +446,14 @@ protected: SvStream* pStData2; SdrModel* pSdrModel; - long nMapMul; - long nMapDiv; - long nMapXOfs; - long nMapYOfs; - long nEmuMul; - long nEmuDiv; - long nPntMul; - long nPntDiv; + tools::Long nMapMul; + tools::Long nMapDiv; + tools::Long nMapXOfs; + tools::Long nMapYOfs; + tools::Long nEmuMul; + tools::Long nEmuDiv; + tools::Long nPntMul; + tools::Long nPntDiv; bool bNeedMap; sal_uInt32 nSvxMSDffSettings; sal_uInt32 nSvxMSDffOLEConvFlags; @@ -605,7 +605,7 @@ public: sal_uInt32 nOffsDgg, SvStream* pStData, SdrModel* pSdrModel_, - long nApplicationScale, + tools::Long nApplicationScale, Color mnDefaultColor_, SvStream* pStData2_ = nullptr, bool bSkipImages = false ); @@ -630,7 +630,7 @@ public: const GDIMetaFile*, const tools::SvRef<SotStorage> & rDest ); - void SetModel(SdrModel* pModel, long nApplicationScale); + void SetModel(SdrModel* pModel, tools::Long nApplicationScale); SdrModel* GetModel() const { return pSdrModel; } void Scale(sal_Int32& rVal) const; void Scale(Point& rPos) const; diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 7ec9ee7c0ab7..1f8069ba70c6 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -52,7 +52,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp; css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr; SfxObjectShell& mrDocSh; - static void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, long nNewSize ); + static void ScaleImage( css::uno::Reference< css::graphic::XGraphic >& xGraphic, tools::Long nNewSize ); public: CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr ); diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index ea72d72b3d20..cb70198ebedd 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -17,6 +17,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/datetime.hxx> +#include <tools/long.hxx> class Color; @@ -37,7 +38,7 @@ MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour); /** Convert from DTTM to Writer's DateTime */ -MSFILTER_DLLPUBLIC DateTime DTTM2DateTime( long lDTTM ); +MSFILTER_DLLPUBLIC DateTime DTTM2DateTime( tools::Long lDTTM ); /** Convert DateTime to xsd::dateTime string. |