diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-19 11:09:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-19 11:11:08 +0200 |
| commit | 5214b96a10fed8147e5801f13bdc463e8ad0f430 (patch) | |
| tree | a6a56adb018a29cbf3b82e0e809f6839750581ec /oox | |
| parent | d269b9ab6a035423b7e4195b4eccf723912e12a5 (diff) | |
defining a macro for two lines of code introduces more noise
.. than it solve
Change-Id: Ic60021aa428289fffb26bc349425e9b8be520d0a
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/vbaproject.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index cb737d7f52ea..d9baea00375e 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -293,10 +293,9 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg ) sal_Int32 nRecSize = aRecData.getLength(); switch( nRecId ) { -#define OOX_ENSURE_RECORDSIZE( cond ) OSL_ENSURE( cond, "VbaProject::importVba - invalid record size" ) case VBA_ID_PROJECTCODEPAGE: { - OOX_ENSURE_RECORDSIZE( nRecSize == 2 ); + OSL_ENSURE( nRecSize == 2, "VbaProject::importVba - invalid record size" ); OSL_ENSURE( maModules.empty(), "VbaProject::importVba - unexpected PROJECTCODEPAGE record" ); rtl_TextEncoding eNewTextEnc = rtl_getTextEncodingFromWindowsCodePage( aRecStrm.readuInt16() ); OSL_ENSURE( eNewTextEnc != RTL_TEXTENCODING_DONTKNOW, "VbaProject::importVba - unknown text encoding" ); @@ -313,7 +312,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg ) } break; case VBA_ID_PROJECTMODULES: - OOX_ENSURE_RECORDSIZE( nRecSize == 2 ); + OSL_ENSURE( nRecSize == 2, "VbaProject::importVba - invalid record size" ); OSL_ENSURE( maModules.empty(), "VbaProject::importVba - unexpected PROJECTMODULES record" ); nModuleCount = aRecStrm.readuInt16(); break; @@ -330,7 +329,6 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg ) maModulesByStrm[ rxModule->getStreamName() ] = rxModule; } break; -#undef OOX_ENSURE_RECORDSIZE } } OSL_ENSURE( nModuleCount == maModules.size(), "VbaProject::importVba - invalid module count" ); |