svx/source/gallery2/galtheme.cxx | 8 ++++++++ sw/source/filter/ww8/ww8scan.cxx | 8 ++++---- sw/source/filter/ww8/ww8scan.hxx | 9 +-------- 3 files changed, 13 insertions(+), 12 deletions(-)
New commits: commit 3a1abb6804c0012718e11dab15d4f35acdef243a Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 16 10:35:35 2014 +0100 coverity#707280 Uncaught exception Change-Id: I764f6472903e6aebef55af1e96c4941e8429d18f diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 5672d9f..41f607c 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -652,11 +652,19 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg sal_uIntPtr nStorErr = 0; + try { SvStorageRef aTempStorageRef( new SvStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); aSvDrawStorageRef->CopyTo( aTempStorageRef ); nStorErr = aSvDrawStorageRef->GetError(); } + catch (const css::ucb::ContentCreationException& e) + { + SAL_WARN("svx", "failed to open: " + << aTmpURL.GetMainURL(INetURLObject::NO_DECODE) + << "due to : " << e.Message); + nStorErr = ERRCODE_IO_GENERAL; + } if( !nStorErr ) { commit bfd22d4ba76df2ab3939339ddb5030f3c7082cb8 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 16 09:44:09 2014 +0100 coverity#708510 Uninitialized scalar field and coverity708511 Uninitialized scalar field Change-Id: I05b5d836f3a207e70f8fff84524866a54a15daa2 diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index bbf74a0..1800a82 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6519,9 +6519,9 @@ void WW8PLCF_HdFt::UpdateIndex( sal_uInt8 grpfIhdt ) nIdxOffset++; } -WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) : bUseThaiLineBreakingRules(false) +WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) { - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + memset(this, 0, sizeof(WW8Dop)); fDontUseHTMLAutoSpacing = true; //default fAcetateShowAtn = true; //default const sal_uInt32 nMaxDopSize = 0x268; @@ -6743,10 +6743,10 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) delete[] pDataPtr; } -WW8Dop::WW8Dop() : bUseThaiLineBreakingRules(false) +WW8Dop::WW8Dop() { // first set everything to a default of 0 - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + memset(this, 0, sizeof(WW8Dop)); fWidowControl = true; fpc = 1; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index b3ca7ca..893df81 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1497,7 +1497,7 @@ namespace nsHdFtFlags } /// Document Properties -class WW8Dop +struct WW8Dop { public: /* Error Status */ @@ -1506,9 +1506,6 @@ public: Corresponds only roughly to the actual structure of the Winword DOP, the winword FIB version matters to what exists. */ - // Initialisier-Dummy: - sal_uInt8 nDataStart; - bool fFacingPages : 1; // 1 when facing pages should be printed bool fWidowControl : 1; //a: orig 97 docs say @@ -1729,9 +1726,6 @@ public: bool fAcetateShowInsDel : 1; bool fAcetateShowProps : 1; - // 2. Initialisier-Dummy: - sal_uInt8 nDataEnd; - bool bUseThaiLineBreakingRules; /* Constructor for importing, needs to know the version of word used */ @@ -1741,7 +1735,6 @@ public: WW8Dop(); bool Write(SvStream& rStrm, WW8Fib& rFib) const; -public: sal_uInt32 GetCompatabilityOptions() const; void SetCompatabilityOptions(sal_uInt32 a32Bit); // i#78591#
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits