filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff |binary sw/inc/splargs.hxx | 57 ++++++++++-------- 2 files changed, 32 insertions(+), 25 deletions(-)
New commits: commit bcd6496d0ec5f25e2e371f50e355344c289c158e Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 4 10:43:23 2013 +0000 add test-case for CVE-2013-3906-1.tiff Change-Id: I2cac26f3e949cbef16fb0c03e99d6aa9b04a7553 diff --git a/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff b/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff new file mode 100644 index 0000000..a770499 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/CVE-2013-3906-1.tiff differ commit 171653e4b71e236ba0e053b5c74f89baacc50482 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 4 09:23:59 2013 +0000 remove unnecessary inline keyword Change-Id: I00a0c94dd9131be3969e2cfd1320682774dced3f diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index fae40a1..03938d2 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -128,8 +128,8 @@ class SwInterHyphInfo { ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > xHyphWord; const Point aCrsrPos; - sal_Bool bNoLang : 1; - sal_Bool bCheck : 1; + bool bNoLang : 1; + bool bCheck : 1; public: sal_Int32 nStart; sal_Int32 nEnd; @@ -138,31 +138,38 @@ public: sal_Int32 nHyphPos; sal_uInt16 nMinTrail; - inline SwInterHyphInfo( const Point &rCrsrPos, - sal_Int32 nStartPos = 0, - sal_Int32 nLength = SAL_MAX_INT32 ) - : aCrsrPos( rCrsrPos ), - bNoLang(sal_False), bCheck(sal_False), - nStart(nStartPos), - nEnd( nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos + nLength ), - nWordStart(0), nWordLen(0), - nHyphPos(0), nMinTrail(0) - { } - inline sal_Int32 GetEnd() const - { return nEnd; } - inline const Point *GetCrsrPos() const - { return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : 0; } - inline sal_Bool IsCheck() const { return bCheck; } - inline void SetCheck( const sal_Bool bNew ) { bCheck = bNew; } - inline void SetNoLang( const sal_Bool bNew ) { bNoLang = bNew; } - - inline void SetHyphWord(const ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > &rxHW) - { xHyphWord = rxHW; } - inline ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > GetHyphWord() - { return xHyphWord; } + SwInterHyphInfo( const Point &rCrsrPos, sal_Int32 nStartPos = 0, + sal_Int32 nLength = SAL_MAX_INT32 ) + : aCrsrPos(rCrsrPos) + , bNoLang(false) + , bCheck(false) + , nStart(nStartPos) + , nEnd(nLength == SAL_MAX_INT32 ? SAL_MAX_INT32 : nStartPos + nLength) + , nWordStart(0), nWordLen(0) + , nHyphPos(0), nMinTrail(0) + { + } + sal_Int32 GetEnd() const + { + return nEnd; + } + const Point *GetCrsrPos() const + { + return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : 0; + } + bool IsCheck() const { return bCheck; } + void SetCheck( const bool bNew ) { bCheck = bNew; } + void SetNoLang( const bool bNew ) { bNoLang = bNew; } + void SetHyphWord(const ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > &rxHW) + { + xHyphWord = rxHW; + } + ::css::uno::Reference< ::css::linguistic2::XHyphenatedWord > GetHyphWord() + { + return xHyphWord; + } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits