[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/source vcl/unx
Caolán McNamara
caolanm at redhat.com
Fri Feb 7 12:52:18 PST 2014
chart2/inc/ChartView.hxx | 3 ++-
chart2/source/view/main/ChartView.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.cxx | 11 +++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 6377907addf266d783ba741a7d4f425f86fb7b20
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 7 20:50:48 2014 +0000
coverity#705773 Resource leak
Change-Id: I630fc03502b7bc510313656ae11ae1159f2319ae
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index c3b878d..ead695c 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1194,12 +1194,15 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
sal_Int32 nOutSize = 0;
sal_uInt8* pBytes = X11_getBmpFromPixmap( m_pDisplay, aPixmap, aColormap, nOutSize );
- if( pBytes && nOutSize )
+ if( pBytes )
{
- rData = Sequence< sal_Int8 >( nOutSize );
- memcpy( rData.getArray(), pBytes, nOutSize );
+ if( nOutSize )
+ {
+ rData = Sequence< sal_Int8 >( nOutSize );
+ memcpy( rData.getArray(), pBytes, nOutSize );
+ bSuccess = true;
+ }
X11_freeBmp( pBytes );
- bSuccess = true;
}
}
}
commit 4fe6abdf69488dd52806085f812b69317b0d2d49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 7 20:47:18 2014 +0000
coverity#737046 Uncaught exception
Change-Id: Icc089ca0b320c7db0e00b48a787e1657d65514ae
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 766563a..f44d952 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -191,7 +191,8 @@ public:
// XDumper
virtual OUString SAL_CALL dump()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
void setViewDirty();
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 001c786..3bdf762 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3014,7 +3014,7 @@ uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::Runt
return aServiceNames;
}
-OUString ChartView::dump() throw (uno::RuntimeException)
+OUString ChartView::dump() throw (uno::RuntimeException, std::exception)
{
impl_updateView();
if(!mxRootShape.is())
More information about the Libreoffice-commits
mailing list