[Libreoffice-commits] core.git: 15 commits - comphelper/source configmgr/source connectivity/source vbahelper/source vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 27 09:03:36 PST 2014
comphelper/source/misc/servicedecl.cxx | 8 +-
configmgr/source/access.cxx | 4 -
configmgr/source/configurationregistry.cxx | 1
configmgr/source/rootaccess.cxx | 4 -
configmgr/source/rootaccess.hxx | 3
configmgr/source/update.cxx | 11 ++-
configmgr/source/valueparser.cxx | 2
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 5 -
vcl/source/control/fixed.cxx | 33 ++--------
vcl/source/filter/jpeg/JpegWriter.cxx | 1
vcl/source/filter/sgfbram.cxx | 5 +
vcl/source/filter/sgvmain.cxx | 2
vcl/source/gdi/outdev3.cxx | 21 ++----
vcl/source/gdi/outdev6.cxx | 6 -
15 files changed, 46 insertions(+), 62 deletions(-)
New commits:
commit 7e1f826822ecfe9b4530be474ff563d510bbc1b5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 16:02:43 2014 +0000
coverity#704393 Logically dead code
Change-Id: Id46cdef80e3e8d4b56c22e8efc72aca885e0f406
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 1b194d5..bd8f10e 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -359,12 +359,6 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
if( OUTDEV_PRINTER == meOutDevType )
{
- if(100 <= nTransparencePercent)
- {
- // #i112959# 100% transparent, draw nothing
- return;
- }
-
Rectangle aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
const Size aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
const long nBaseExtent = std::max( FRound( aDPISize.Width() / 300. ), 1L );
commit 6e37a423fd906728d8fb7b05df4ca0123b524f62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 16:01:06 2014 +0000
coverity#1000521 Logically dead code
Change-Id: I9cf7d002de2bf8b33f17bd24403b8e77fe471a68
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index dd93f55..5ec4950 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5791,19 +5791,14 @@ SalLayout* OutputDevice::ImplLayout( const OUString& rOrigStr, sal_Int32 nMinInd
if( bFiltered && nCutStop != nCutStart && pDXArray )
{
- if( !nLen )
- pDXArray = NULL;
- else
- {
- sal_Int32* pAry = (sal_Int32*)alloca(sizeof(sal_Int32)*nLen);
- if( nCutStart > nMinIndex )
- memcpy( pAry, pDXArray, sizeof(sal_Int32)*(nCutStart-nMinIndex) );
- // note: nCutStart will never be smaller than nMinIndex
- memcpy( pAry+nCutStart-nMinIndex,
- pDXArray + nOrgLen - (nCutStop-nMinIndex),
- sizeof(sal_Int32)*(nLen - (nCutStart-nMinIndex)) );
- pDXArray = pAry;
- }
+ sal_Int32* pAry = (sal_Int32*)alloca(sizeof(sal_Int32)*nLen);
+ if( nCutStart > nMinIndex )
+ memcpy( pAry, pDXArray, sizeof(sal_Int32)*(nCutStart-nMinIndex) );
+ // note: nCutStart will never be smaller than nMinIndex
+ memcpy( pAry+nCutStart-nMinIndex,
+ pDXArray + nOrgLen - (nCutStop-nMinIndex),
+ sizeof(sal_Int32)*(nLen - (nCutStart-nMinIndex)) );
+ pDXArray = pAry;
}
}
commit df3c3ed1f08b62d7f9bbaae46bfc292c6a6585a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:58:18 2014 +0000
coverity#738968 Unused pointer value
Change-Id: I0fabc525f5c052823946da93587ff1caaada9ab1
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index bddda57..026de6e 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -161,12 +161,11 @@ dispatchRequests (const uno::Reference< frame::XModel>& xModel, const OUString &
uno::Sequence<beans::PropertyValue> dispatchProps(1);
sal_Int32 nProps = sProps.getLength();
- beans::PropertyValue* pDest = dispatchProps.getArray();
if ( nProps )
{
dispatchProps.realloc( nProps + 1 );
- // need to reaccquire pDest after realloc
- pDest = dispatchProps.getArray();
+ // need to accquire pDest after realloc
+ beans::PropertyValue* pDest = dispatchProps.getArray();
const beans::PropertyValue* pSrc = sProps.getConstArray();
for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
*pDest = *pSrc;
commit 06cfc634cd8d91a78be6692cd6954aabfbe37712
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:55:36 2014 +0000
coverity#735559 Logically dead code
Change-Id: I75205d46243c18bbd63532aea1965a0e058ef739
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 76a5dc9..3bdb513 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -864,36 +864,17 @@ FixedBitmap::~FixedBitmap()
void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
const Point& rPos, const Size& rSize )
{
- sal_uInt16 nStyle = 0;
Bitmap* pBitmap = &maBitmap;
- if( nStyle & IMAGE_DRAW_COLORTRANSFORM )
- {
- // only images support IMAGE_DRAW_COLORTRANSFORM
- Image aImage( maBitmap );
- if ( !(!aImage) )
- {
- if ( GetStyle() & WB_SCALE )
- pDev->DrawImage( rPos, rSize, aImage, nStyle );
- else
- {
- Point aPos = ImplCalcPos( GetStyle(), rPos, aImage.GetSizePixel(), rSize );
- pDev->DrawImage( aPos, aImage, nStyle );
- }
- }
- }
- else
+ // do we have a Bitmap?
+ if ( !(!(*pBitmap)) )
{
- // do we have a Bitmap?
- if ( !(!(*pBitmap)) )
+ if ( GetStyle() & WB_SCALE )
+ pDev->DrawBitmap( rPos, rSize, *pBitmap );
+ else
{
- if ( GetStyle() & WB_SCALE )
- pDev->DrawBitmap( rPos, rSize, *pBitmap );
- else
- {
- Point aPos = ImplCalcPos( GetStyle(), rPos, pBitmap->GetSizePixel(), rSize );
- pDev->DrawBitmap( aPos, *pBitmap );
- }
+ Point aPos = ImplCalcPos( GetStyle(), rPos, pBitmap->GetSizePixel(), rSize );
+ pDev->DrawBitmap( aPos, *pBitmap );
}
}
}
commit c9b41602a0149b16ada3b46ee56dab987c836658
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:50:04 2014 +0000
coverity#708315 Uninitialized scalar field
Change-Id: I1a93fcb6107bdce10b1f967337e75c525ab24640
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 102eb4d..3a027a2 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -132,6 +132,7 @@ JPEGWriter::JPEGWriter( SvStream& rStream, const css::uno::Sequence< css::beans:
mrStream ( rStream ),
mpReadAccess ( NULL ),
mpBuffer ( NULL ),
+ mbNative ( false ),
mpExpWasGrey ( pExportWasGrey )
{
FilterConfigItem aConfigItem( (css::uno::Sequence< css::beans::PropertyValue >*) pFilterData );
commit 4a3c101276f1ef391f346e84c896fdf12e44a76d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:48:45 2014 +0000
coverity#708316 Uninitialized scalar field
Change-Id: I506ee57c59255494bbde91762da43c8b04b0f086
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index bb43d71..92a4334 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -172,7 +172,10 @@ private:
sal_uInt16 Count;
sal_uInt8 Data;
public:
- PcxExpand() { Count=0; }
+ PcxExpand()
+ : Count(0)
+ , Data(0)
+ {}
sal_uInt8 GetByte(SvStream& rInp);
};
commit 463dbd42d16f0378f66001b5111ab19e49d8e891
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:47:25 2014 +0000
coverity#440937 Logically dead code
Change-Id: If388006a7f53aee5ffe42a152ab917ca5aca2072
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index c176675..d745b4b 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -623,7 +623,7 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr
if (ry<1) ry=1;
MaxR=rx;
b0=Int2;
- i0=MaxR; if (MaxR<1) MaxR=1;
+ i0=MaxR;
i=MaxR;
while (i>=0) {
b=Int1+sal_Int16((sal_Int32(Int2-Int1)*sal_Int32(i)) /sal_Int32(MaxR));
commit d1c2f9849e82e6c5d2297fc43f787d5c3483fe6c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:44:34 2014 +0000
coverity#707688 Uninitialized scalar field
Change-Id: If45153679e199eb749b8c877fc8593304ac35100
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index afac79c..b580d37 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -57,6 +57,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet()
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(NULL)
,m_xMetaData(NULL)
+ ,m_nColPos(0)
,m_bBOF(sal_True)
,m_bEOF(sal_True)
{
commit 6a3c12f3036bba46541767f573b7f34b521240e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:43:56 2014 +0000
coverity#707687 Uninitialized scalar field
Change-Id: I955a302418c56b6f34f89ff04b1e27c4d1b2722e
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index c56272c..afac79c 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -69,6 +69,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet( MetaDataResultSetType _e
,::comphelper::OPropertyContainer(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_aStatement(NULL)
,m_xMetaData(NULL)
+ ,m_nColPos(0)
,m_bBOF(sal_True)
,m_bEOF(sal_True)
{
commit 3110ff212cdd6591448de48d655e0f5d69a6b4cd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:40:51 2014 +0000
coverity#707684 Uninitialized scalar field
Change-Id: I960aa77ce107c4f02f1e331cda07b75435beed5d
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index f213d64..1ed0214 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -256,7 +256,7 @@ css::uno::Any parseValue(
}
-ValueParser::ValueParser(int layer): layer_(layer), state_() {}
+ValueParser::ValueParser(int layer): type_(TYPE_ERROR), layer_(layer), state_() {}
ValueParser::~ValueParser() {}
commit e06b894af5700db6341c349ea43aaa93de6bfc2d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:37:02 2014 +0000
coverity#983618 Uncaught exception
Change-Id: I3abf410e7235b8dd1d126a3c8705e3ef9722e93b
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 36b04b4..ac53c94 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -78,10 +78,12 @@ private:
virtual void SAL_CALL insertExtensionXcuFile(
sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL insertModificationXcuFile(
OUString const & fileUri,
@@ -103,7 +105,8 @@ void Service::insertExtensionXcsFile(
void Service::insertExtensionXcuFile(
sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException,
+ std::exception)
{
Broadcaster bc;
{
@@ -118,7 +121,7 @@ void Service::insertExtensionXcuFile(
}
void Service::removeExtensionXcuFile(OUString const & fileUri)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
Broadcaster bc;
{
commit aece42b7b4223a472d846061f983cfe139473a46
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:35:34 2014 +0000
coverity#983617 Uncaught exception
Change-Id: I3f9c98d235d1bd5155653c6a56b757393bca2979
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 96fa39f..59b2bbd 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -155,7 +155,9 @@ void RootAccess::removeChangesListener(
}
void RootAccess::commitChanges()
- throw (css::lang::WrappedTargetException, css::uno::RuntimeException)
+ throw (css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
+ std::exception)
{
assert(thisIs(IS_UPDATE));
if (!alive_)
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index b36cc9e..25d1308 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -92,7 +92,8 @@ public:
virtual void SAL_CALL commitChanges()
throw (
com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL hasPendingChanges()
throw (com::sun::star::uno::RuntimeException);
commit 773db5198ee21941c34aba84014552bf41df699d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:34:30 2014 +0000
coverity#707681 Uninitialized scalar field
Change-Id: I88796c85447571d446c398439066029c3a200b4b
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 6bf87a4..f22bc81 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -317,6 +317,7 @@ private:
Service::Service(
css::uno::Reference< css::uno::XComponentContext > const & context)
+ : readOnly_(false)
{
assert(context.is());
try {
commit 8dec95f1d591fe2e5418717a8d810bb19c4d769b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:32:07 2014 +0000
coverity#707680 Uninitialized scalar field
Change-Id: I763dc95a393bf296a7f3f5ce2a739f175fd528fb
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 1148ac5..8e4bd82 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1976,7 +1976,9 @@ bool Access::isDisposed() const {
return disposed_;
}
-Access::ModifiedChild::ModifiedChild() {}
+Access::ModifiedChild::ModifiedChild():
+ directlyModified(false)
+{}
Access::ModifiedChild::ModifiedChild(
rtl::Reference< ChildAccess > const & theChild, bool theDirectlyModified):
commit 7cc3e9ca0c52f28ea4a57d0f5fb3ae6ae8332954
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 27 15:27:15 2014 +0000
coverity#706277 Uncaught exception
Change-Id: I1941e0a3a662faaac1fb9374437f3984b3a5c6d8
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index d48fd4c..18dd143 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -51,12 +51,12 @@ public:
// XSingleComponentFactory:
virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithContext(
uno::Reference<uno::XComponentContext> const& xContext )
- throw (uno::Exception);
+ throw (uno::Exception, std::exception);
virtual uno::Reference<uno::XInterface> SAL_CALL
createInstanceWithArgumentsAndContext(
uno::Sequence<uno::Any> const& args,
uno::Reference<uno::XComponentContext> const& xContext )
- throw (uno::Exception);
+ throw (uno::Exception, std::exception);
private:
virtual ~Factory();
@@ -90,7 +90,7 @@ uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames()
// XSingleComponentFactory:
uno::Reference<uno::XInterface> ServiceDecl::Factory::createInstanceWithContext(
uno::Reference<uno::XComponentContext> const& xContext )
- throw (uno::Exception)
+ throw (uno::Exception, std::exception)
{
return m_rServiceDecl.m_createFunc(
m_rServiceDecl, uno::Sequence<uno::Any>(), xContext );
@@ -100,7 +100,7 @@ uno::Reference<uno::XInterface>
ServiceDecl::Factory::createInstanceWithArgumentsAndContext(
uno::Sequence<uno::Any > const& args,
uno::Reference<uno::XComponentContext> const& xContext )
- throw (uno::Exception)
+ throw (uno::Exception, std::exception)
{
return m_rServiceDecl.m_createFunc(
m_rServiceDecl, args, xContext );
More information about the Libreoffice-commits
mailing list