diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-26 00:38:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-26 10:05:17 +0100 |
| commit | 7a55d9f1f55f5098fa1d333a3b4acfa85319ea5c (patch) | |
| tree | 4e712696fb1928cf38b64d0a919e770754f67b49 /filter | |
| parent | 0e74ec80c0d2c24807a961c9c46d39d979799501 (diff) | |
enforce checking the return value of these
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 11 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 19 |
2 files changed, 12 insertions, 18 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index e51791ec5b6c..51bd8dabd3ed 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -594,12 +594,11 @@ public: static void MSDFFReadZString( SvStream& rIn, String& rStr, sal_uLong nMaxLen, bool bUniCode = sal_False ); - static sal_Bool ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn ); - static sal_Bool ReadCommonRecordHeader( SvStream& rSt, - sal_uInt8& rVer, - sal_uInt16& rInst, - sal_uInt16& rFbt, - sal_uInt32& rLength ); + static bool ReadCommonRecordHeader(DffRecordHeader& rRec, SvStream& rIn) + SAL_WARN_UNUSED_RESULT; + static bool ReadCommonRecordHeader(SvStream& rSt, sal_uInt8& rVer, + sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength) + SAL_WARN_UNUSED_RESULT; /* Konstruktor =========== diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 43e20118b2f6..143063078544 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6942,22 +6942,17 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, } /* static */ -sal_Bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec, SvStream& rIn) +bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec, + SvStream& rIn) { rRec.nFilePos = rIn.Tell(); - return SvxMSDffManager::ReadCommonRecordHeader( rIn,rRec.nRecVer, - rRec.nRecInstance, - rRec.nRecType, - rRec.nRecLen ); + return SvxMSDffManager::ReadCommonRecordHeader(rIn,rRec.nRecVer, + rRec.nRecInstance, rRec.nRecType, rRec.nRecLen); } - -/* auch static */ -sal_Bool SvxMSDffManager::ReadCommonRecordHeader( SvStream& rSt, - sal_uInt8& rVer, - sal_uInt16& rInst, - sal_uInt16& rFbt, - sal_uInt32& rLength ) +/* also static */ +bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt, + sal_uInt8& rVer, sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength) { sal_uInt16 nTmp(0); rSt >> nTmp >> rFbt >> rLength; |