diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /svgio | |
| parent | 826f1bca40a01f0a249d5b6cbb7c39c11638a060 (diff) | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/inc/svgtools.hxx | 4 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgdocumenthandler.cxx | 4 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgtools.cxx | 18 |
3 files changed, 3 insertions, 23 deletions
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx index cc4a1da908c4..7d339fac6230 100644 --- a/svgio/inc/svgtools.hxx +++ b/svgio/inc/svgtools.hxx @@ -30,10 +30,6 @@ namespace svgio { namespace svgreader { -#ifdef DBG_UTIL - // error helper - void myAssert(const OUString& rMessage); -#endif // recommended value for this device dependent unit, see CSS2 section 4.3.2 Lengths #define F_SVG_PIXEL_PER_INCH 96.0 diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index 72e1adf9bee7..4d7171e8fef8 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -400,9 +400,7 @@ namespace svgio default: { /// invalid token, ignore -#ifdef DBG_UTIL - myAssert( "Unknown Base SvgToken <" + aName + "> (!)" ); -#endif + SAL_WARN( "svgio", "Unknown Base SvgToken <" + aName + "> (!)" ); break; } } diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index 2f22d1966172..cb85a7e635f0 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -29,16 +29,6 @@ namespace svgio { namespace svgreader { -#ifdef DBG_UTIL - void myAssert(const OUString& rMessage) - { - OString aMessage2; - - rMessage.convertToString(&aMessage2, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR); - OSL_ENSURE(false, aMessage2.getStr()); - } -#endif - // common non-token strings const OUString commonStrings::aStrUserSpaceOnUse("userSpaceOnUse"); const OUString commonStrings::aStrObjectBoundingBox("objectBoundingBox"); @@ -191,9 +181,7 @@ namespace svgio } case Unit_none: { -#ifdef DBG_UTIL - myAssert("Design error, this case should have been handled in the caller"); -#endif + SAL_WARN("svgio", "Design error, this case should have been handled in the caller"); return mfNumber; } default: @@ -237,9 +225,7 @@ namespace svgio if ( aViewPort.isEmpty() ) { -#ifdef DBG_UTIL - myAssert("Design error, this case should have been handled in the caller"); -#endif + SAL_WARN("svgio", "Design error, this case should have been handled in the caller"); // no viewPort, assume a normal page size (A4) aViewPort = basegfx::B2DRange( 0.0, |