[Libreoffice-commits] core.git: 3 commits - chart2/source sw/source winaccessibility/source
Takeshi Abe
tabe at fixedpoint.jp
Fri May 23 03:54:28 PDT 2014
chart2/source/view/main/GL3DRenderer.cxx | 18 +++---------------
sw/source/core/access/accdoc.cxx | 4 ++--
winaccessibility/source/service/msaaservice_impl.cxx | 2 +-
3 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 87e81e4e527044fbc76cdf8f1b8a244093c06bae
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 23 19:51:08 2014 +0900
boost::checked_deleter serves the purpose
Change-Id: I22b4ea752e32b449dcc07b70cc5dc0ba52ad7c45
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 8c0b449..6b96b5f 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -19,6 +19,7 @@
#include <StaticGeometry.h>
#include "glm/gtc/matrix_inverse.hpp"
+#include <boost/checked_delete.hpp>
#define DEBUG_FBO 1
@@ -840,19 +841,6 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo &polygon)
glUseProgram(0);
}
-namespace {
-
-template< typename T >
-struct DeletePointer
-{
- void operator()(T* p)
- {
- delete p;
- }
-};
-
-}
-
void OpenGL3DRenderer::RenderPolygon3DObject()
{
glDepthMask(GL_FALSE);
@@ -870,9 +858,9 @@ void OpenGL3DRenderer::RenderPolygon3DObject()
RenderPolygon3D(polygon);
}
std::for_each(polygon.verticesList.begin(),
- polygon.verticesList.end(), DeletePointer<Vertices3D>());
+ polygon.verticesList.end(), boost::checked_deleter<Vertices3D>());
std::for_each(polygon.normalsList.begin(),
- polygon.normalsList.end(), DeletePointer<Normals3D>());
+ polygon.normalsList.end(), boost::checked_deleter<Normals3D>());
delete polygon.vertices;
delete polygon.normals;
m_Polygon3DInfoList.pop_front();
commit 7e6052f2189168d2eb6c1a2add13b4d8baea8511
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 23 19:48:43 2014 +0900
catch exception by const ref
... redoing 8d52cd0b327e90b555c6beaf29219ba011cc7244
Change-Id: If4935cf5f9adecbc6b42d7440747ae2ba09e9e5a
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index b3016af..7c089b2 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -189,7 +189,7 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent (void)
if( xAcc->getAccessibleChild( i ) == xThis )
return i;
}
- catch(::com::sun::star::lang::IndexOutOfBoundsException)
+ catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
{
return -1L;
}
@@ -253,7 +253,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
return aBox;
}
- catch(::com::sun::star::lang::IndexOutOfBoundsException)
+ catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
{
return awt::Rectangle();
}
commit 74c3aded1a7f61b12a334271ae9c9dafea5e05c4
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri May 23 19:21:16 2014 +0900
catch exception by const ref
... redoing 0292b4269ec370818bb1ed48222fade636374a4a
Change-Id: Ie869d8cd011cdc64c87363a4c31e6afbd439808c
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 408771d..88b78e0 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -187,7 +187,7 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA
}
}
}
- catch (::com::sun::star::uno::RuntimeException)
+ catch (::com::sun::star::uno::RuntimeException const&)
{
// Ignore show events that throw DisposedExceptions in getAccessibleContext(),
// but keep revoking these windows in hide(s).
More information about the Libreoffice-commits
mailing list