diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-08 14:05:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-08 20:44:43 +0200 |
| commit | 3e7679738413054c7e6ce973380eac501bf41cf2 (patch) | |
| tree | ad80f5bd2f11020fa864488792b6cc0e98a00207 /sd | |
| parent | 3bfac2a7fad9737f31443292699bd6fee6ac3a6f (diff) | |
move comphelper::string::toInt32 to o3tl
so we can use it in places where we cannot include comphelper
Change-Id: Iba0ba3e4c0dcf0f9d1f09092a77c3b2010ec4f6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132732
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 03a0a0d18b9b..fff458c854e6 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> -#include <comphelper/string.hxx> +#include <o3tl/string_view.hxx> #include <editeng/outlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> @@ -696,11 +696,11 @@ bool SdXMLFilter::Import( ErrCode& nError ) sal_Int32 nIndex = sBuildId.indexOf('$'); if( nIndex != -1 ) { - sal_Int32 nUPD = comphelper::string::toInt32(sBuildId.subView( 0, nIndex )); + sal_Int32 nUPD = o3tl::toInt32(sBuildId.subView( 0, nIndex )); if( nUPD == 300 ) { - sal_Int32 nBuildId = comphelper::string::toInt32(sBuildId.subView( nIndex+1 )); + sal_Int32 nBuildId = o3tl::toInt32(sBuildId.subView( nIndex+1 )); if( (nBuildId > 0) && (nBuildId < 9316) ) bTransform = true; // treat OOo 3.0 beta1 as OOo 2.x } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 53e9373a37d5..affa21b03978 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/i18n/ScriptType.hpp> -#include <comphelper/string.hxx> +#include <o3tl/string_view.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -370,11 +370,11 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi sal_Int32 nDistance (0); if (rsDistance.endsWith("px")) { - nDistance = comphelper::string::toInt32(rsDistance.subView(0,rsDistance.getLength()-2)); + nDistance = o3tl::toInt32(rsDistance.subView(0,rsDistance.getLength()-2)); } else if (rsDistance.endsWith("l")) { - const sal_Int32 nLines (comphelper::string::toInt32(rsDistance.subView(0,rsDistance.getLength()-1))); + const sal_Int32 nLines (o3tl::toInt32(rsDistance.subView(0,rsDistance.getLength()-1))); // Take the height of the first line as the height of every line. const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0)); nDistance = nFirstLineHeight * nLines; |