diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-24 16:22:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-27 08:18:16 +0200 |
| commit | 38ecca9b30e0fc5f7cc6264857f983e40dd58195 (patch) | |
| tree | 3ad61e6d5cddcf161d27cfe4c6ca85fcf1cab8f6 /sw | |
| parent | remove some unused defines (diff) | |
| download | core-38ecca9b30e0fc5f7cc6264857f983e40dd58195.tar.gz core-38ecca9b30e0fc5f7cc6264857f983e40dd58195.zip | |
inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code
Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0c2ad80c87eb..174f7f014a2e 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -52,11 +52,6 @@ #include <stdio.h> #endif -#define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \ - OSL_ENSURE(aCon, aError); \ - if (!(aCon)) \ - return aRet; - using namespace ::com::sun::star::lang; //-begin @@ -7474,7 +7469,9 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) // one or two bytes at the beginning at the sprm id sal_uInt16 wwSprmParser::GetSprmId(const sal_uInt8* pSp) const { - ASSERT_RET_ON_FAIL(pSp, "Why GetSprmId with pSp of 0", 0); + OSL_ENSURE(pSp, "Why GetSprmId with pSp of 0"); + if (!pSp) + return 0; sal_uInt16 nId = 0; |