[Libreoffice-commits] core.git: 14 commits - chart2/source editeng/source include/svx sc/inc sc/source sd/source sfx2/source svx/source sw/source ucb/source vcl/generic vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Jun 10 02:49:12 PDT 2014
chart2/source/model/main/ChartModel_Persistence.cxx | 7 ++
chart2/source/view/main/GL3DRenderer.cxx | 5 ++
editeng/source/items/textitem.cxx | 3 -
include/svx/fmdpage.hxx | 2
include/svx/unoapi.hxx | 3 -
include/svx/unopage.hxx | 2
sc/inc/pageuno.hxx | 8 +--
sc/source/ui/unoobj/pageuno.cxx | 3 -
sd/source/ui/dlg/docprev.cxx | 4 -
sfx2/source/doc/docfile.cxx | 2
sfx2/source/doc/objxtor.cxx | 49 +++++++++++---------
svx/source/form/fmdpage.cxx | 2
svx/source/unodraw/unopage.cxx | 5 +-
sw/source/core/doc/DocumentDrawModelManager.cxx | 13 ++++-
ucb/source/ucp/tdoc/tdoc_content.cxx | 3 -
ucb/source/ucp/tdoc/tdoc_content.hxx | 5 +-
vcl/generic/fontmanager/fontmanager.cxx | 2
vcl/source/fontsubset/sft.cxx | 2
18 files changed, 75 insertions(+), 45 deletions(-)
New commits:
commit ea93714e9427e6802e843c4585871aeef0a5e28d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 10:20:53 2014 +0100
coverity#735616 Division or modulo by float zero
Change-Id: I5aaad2cd80e6930cbca57b4df2bfee3a6989ca41
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index cd015cd..c939d18 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -90,9 +90,9 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rP
if( nHeight < 0 ) nHeight = 0;
double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
- double dRatioPreV=((double) nWidth ) / nHeight;
+ double dRatioPreV = nHeight ? (((double) nWidth ) / nHeight) : 0.0;
- if (dRatio>dRatioPreV)
+ if (dRatio > dRatioPreV)
{
rSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio));
rPoint=Point( 0, (sal_uInt16)((nHeight-rSize.Height())/2));
commit d7cd613067dbc07eae0dd1aa5a4a72ae40090325
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 10:19:11 2014 +0100
titchy tweak
Change-Id: Ia28447cf35ceb550778297dc515746e93c7d86e4
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 267afd4..aca8885 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2116,7 +2116,7 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen)
sal_uInt32 tag = GetUInt32(sfntP, 12 + 16 * i, 1);
sal_uInt32 off = GetUInt32(sfntP, 12 + 16 * i + 8, 1);
- sal_uInt32 len = GetUInt32(sfntP, 12 + 16 * i + 12, 1);
+ sal_uInt32 len = GetUInt32(sfntP, nLargestFixedOffsetPos, 1);
if (tag != T_glyf) {
HexFmtBlockWrite(h, sfntP + off, len);
commit 91101dc0437c68b1993e8772f31922661ef0be2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 10:14:02 2014 +0100
coverity#441139 Explicit null dereferenced
Change-Id: I015125fca5cd3e4c1ac2407c0449fe641991f8f6
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index ec0ebbe..3eaf8e3 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2785,7 +2785,7 @@ void SfxMedium::CompleteReOpen()
if ( pImp->pTempFile )
pImp->m_aName = pImp->pTempFile->GetFileName();
}
- else
+ else if (pTmpFile)
{
pTmpFile->EnableKillingFile( true );
delete pTmpFile;
commit e123213f46eb1b1e278bc816a97e51f0f3a2ac86
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 10:10:30 2014 +0100
coverity#735422 Logically dead code
Change-Id: I5639746f25024b0808e9c4e620bb0fa9f1a2c0b6
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e4b5b8d..eb7aaec 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -832,8 +832,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
// CONVERT_TWIPS is not set.
if( bConvert )
{
- long nTwips = bConvert ? nHeight : convertMm100ToTwip(nHeight);
- aFontHeight.Height = (float)( nTwips / 20.0 );
+ aFontHeight.Height = (float)( nHeight / 20.0 );
}
else
{
commit 8f49a83b3c41dfe846a93d6220f27c75ef2fb0b2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 10:07:49 2014 +0100
coverity#1213562 Uninitialized scalar field
Change-Id: I0161cbe1aeebb1fdc8e19ab5b627b319c4c9f7eb
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index fa793d0..dc39999 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -93,6 +93,11 @@ OpenGL3DRenderer::OpenGL3DRenderer():
, mnPickingFbo(0)
, mnPickingRboDepth(0)
, mnPickingRboColor(0)
+ , m_BatchModelMatrixBuf(0)
+ , m_BatchNormalMatrixBuf(0)
+ , m_BatchColorBuf(0)
+ , m_Batch3DUBOBuffer(0)
+ , m_Batch3DActualSizeLight(0)
{
m_Polygon3DInfo.lineOnly = false;
m_Polygon3DInfo.twoSidesLighting = false;
commit 1979afcc9b407f82a23dafdc99452ad390e8e7ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:56:47 2014 +0100
coverity#706877 Uncaught exception
Change-Id: I7364afe103f9912b31bde7f4e84baf16633b05f8
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index f67720c..8de301c 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -27,11 +27,11 @@
class ScPageObj : public SvxFmDrawPage
{
public:
- ScPageObj( SdrPage* pPage );
- virtual ~ScPageObj() throw();
+ ScPageObj(SdrPage* pPage);
+ virtual ~ScPageObj() throw();
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- _CreateShape( SdrObject *pObj ) const throw(std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 7cb1392..744ac5e 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -33,7 +33,8 @@ ScPageObj::~ScPageObj() throw()
{
}
-uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const throw(std::exception)
+uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const
+ throw (css::uno::RuntimeException, std::exception)
{
uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj ));
commit fea4482ea8bfcb79c2ad83c5402ee84c4d9c3580
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:46:58 2014 +0100
coverity#706615 Uncaught exception
and hopefully a boat load more
Change-Id: I31cd4e530bd38dda845478a36d8216b7b3f9d7fd
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 2a7e4c5..ef40d73 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -757,52 +757,59 @@ namespace
}
#endif
-
Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
{
#ifndef DISABLE_SCRIPTING
- if ( !pImp->m_bNoBasicCapabilities )
- return lcl_getOrCreateLibraryContainer( false, pImp->xDialogLibraries, GetModel() );
+ try
+ {
+ if ( !pImp->m_bNoBasicCapabilities )
+ return lcl_getOrCreateLibraryContainer( false, pImp->xDialogLibraries, GetModel() );
- BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this );
- if ( pBasMgr )
- return pBasMgr->GetDialogLibraryContainer().get();
+ BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this );
+ if ( pBasMgr )
+ return pBasMgr->GetDialogLibraryContainer().get();
+ }
+ catch (const css::ucb::ContentCreationException& e)
+ {
+ SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ }
- OSL_FAIL( "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?" );
+ SAL_WARN("sfx.doc", "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?");
#endif
return SFX_APP()->GetDialogContainer();
}
-
-
Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
{
#ifndef DISABLE_SCRIPTING
- if ( !pImp->m_bNoBasicCapabilities )
- return lcl_getOrCreateLibraryContainer( true, pImp->xBasicLibraries, GetModel() );
-
- BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this );
- if ( pBasMgr )
- return pBasMgr->GetScriptLibraryContainer().get();
+ try
+ {
+ if ( !pImp->m_bNoBasicCapabilities )
+ return lcl_getOrCreateLibraryContainer( true, pImp->xBasicLibraries, GetModel() );
- OSL_FAIL( "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?" );
+ BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this );
+ if ( pBasMgr )
+ return pBasMgr->GetScriptLibraryContainer().get();
+ }
+ catch (const css::ucb::ContentCreationException& e)
+ {
+ SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ }
+ SAL_WARN("sfx.doc", "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?");
#endif
return SFX_APP()->GetBasicContainer();
}
-
-
StarBASIC* SfxObjectShell::GetBasic() const
{
#ifdef DISABLE_SCRIPTING
return NULL;
#else
- return GetBasicManager()->GetLib(0);
+ BasicManager * pMan = GetBasicManager();
+ return pMan ? pMan->GetLib(0) : NULL;
#endif
}
-
-
void SfxObjectShell::InitBasicManager_Impl()
/* [Description]
commit ac4d9437b317def515c5d7493d294f47d4102d93
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:36:44 2014 +0100
coverity#706262 Uncaught exception
Change-Id: I4fb1642153a0abe66ee9290e31813eb11623b527
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index f976a30..ca3a2df 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/io/TempFile.hpp>
#include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <ucbhelper/content.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -126,7 +127,11 @@ Reference< embed::XStorage > lcl_createStorage(
xStorageFact->createInstanceWithArguments( aStorageArgs ), uno::UNO_QUERY_THROW );
OSL_ENSURE( xStorage.is(), "No Storage" );
}
- catch( const ::com::sun::star::ucb::ContentCreationException & rEx )
+ catch(const css::ucb::ContentCreationException& rEx)
+ {
+ ASSERT_EXCEPTION( rEx );
+ }
+ catch(const css::ucb::CommandFailedException& rEx)
{
ASSERT_EXCEPTION( rEx );
}
commit ef955b0c5e1264f5ce1262156125002279918b7b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:32:26 2014 +0100
coverity#707245 Uncaught exception
Change-Id: I9579078a845cd25e25b863e08de94aec1687d596
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index e564570..8717f2f 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -40,7 +40,7 @@ protected:
// The following method is called when a SvxShape object should be created.
// Derived classes can create a derivation or an object aggregating SvxShape.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
- throw (std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
SvxFmDrawPage( SdrPage* pPage );
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 8dc123b..beba5e1 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun:
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating object.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
- throw (std::exception);
+ throw (css::uno::RuntimeException, std::exception);
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index a7245b1..2147289 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -83,7 +83,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
}
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
- throw (std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
if( FmFormInventor == pObj->GetObjInventor() )
{
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index e6baa06..0ede8d0 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -838,7 +838,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
}
Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const
- throw (std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
pObj->GetObjInventor(),
commit d09279cd0aecb65027304a73e9fbaf141688dff6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:31:20 2014 +0100
coverity#707429 Uncaught exception
Change-Id: I745028d5bfbb6b1152abf6e0fe4dbc9c697b5d4b
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 6a2676b..cbfb551 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2876,7 +2876,8 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
+ task::DocumentPasswordRequest,
+ css::uno::RuntimeException )
{
OSL_ENSURE( m_aProps.getType() == STREAM,
"Content::getTruncatedOutputStream - content is no stream!" );
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 8b5c5b7..a173d24 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -230,8 +230,9 @@ private:
getTruncatedOutputStream(
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw ( ::com::sun::star::ucb::CommandFailedException,
- ::com::sun::star::task::DocumentPasswordRequest );
+ throw ( css::ucb::CommandFailedException,
+ css::task::DocumentPasswordRequest,
+ css::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
queryChildContent( const OUString & rRelativeChildUri );
commit e77a2cb2f82e3f928501875cf981167b1576e069
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:29:30 2014 +0100
coverity#1222236 Resource leak
Change-Id: Iadd6621cebe9426c7c54c81f584b9c6766157f56
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 3936c88..edc2be1 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1085,8 +1085,8 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU
aFamily = aName;
}
}
- DisposeNameRecords( pNameRecords, nNameRecords );
}
+ DisposeNameRecords( pNameRecords, nNameRecords );
if( !aFamily.isEmpty() )
{
rNames.push_front( aFamily );
commit db176b0ed328b5b1b9e0a1950ab3daf11e6c0539
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:27:09 2014 +0100
coverity#1222241 Uncaught exception
Change-Id: Ibaf3a5305082b60fadb8a2499712dc4a460cb449
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 7334bd2..74bd154 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -39,7 +39,7 @@ class SfxItemPool;
* Deprecated: This will be replaced with a function returning XShape.
*/
SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
/** Returns a StarOffice API wrapper for the given SdrObject */
SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw ();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index db268de..e6baa06 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -885,7 +885,7 @@ uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw
}
SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, 0, 0, referer );
}
commit 1e3eca93162a664c2b79124f37528579bb767e58
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:26:19 2014 +0100
coverity#1222243 Uncaught exception
Change-Id: Ia0e1d109023c133104574c380a5e7abda5ae2480
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 4415721..7334bd2 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -38,7 +38,8 @@ class SfxItemPool;
* Creates a StarOffice API wrapper with the given type and inventor
* Deprecated: This will be replaced with a function returning XShape.
*/
-SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer ) throw();
+SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer)
+ throw (css::uno::RuntimeException);
/** Returns a StarOffice API wrapper for the given SdrObject */
SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw ();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index d6e2386..db268de 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -884,7 +884,8 @@ uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw
return aSeq;
}
-SvxShape* CreateSvxShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer ) throw()
+SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer)
+ throw (css::uno::RuntimeException)
{
return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, 0, 0, referer );
}
commit e6e8069b6c7ec2e69315a29cab55f9c950a26cfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 10 09:23:58 2014 +0100
coverity#1222244 Uninitialized scalar field
Change-Id: Ia12b3fff503c47945d8237c09e679882f1a0ce5a
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index 09fdbd7..e87ae39 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -45,8 +45,17 @@ class XSpellChecker1;
namespace sw
{
-DocumentDrawModelManager::DocumentDrawModelManager( SwDoc& i_rSwdoc ) : m_rSwdoc(i_rSwdoc), mpDrawModel(0) {}
-
+DocumentDrawModelManager::DocumentDrawModelManager(SwDoc& i_rSwdoc)
+ : m_rSwdoc(i_rSwdoc)
+ , mpDrawModel(0)
+ , mnHeaven(0)
+ , mnHell(0)
+ , mnControls(0)
+ , mnInvisibleHeaven(0)
+ , mnInvisibleHell(0)
+ , mnInvisibleControls(0)
+{
+}
// Is also called by the Sw3 Reader, if there was an error when reading the
// drawing layer. If it is called by the Sw3 Reader the layer is rebuilt
More information about the Libreoffice-commits
mailing list