[Libreoffice-commits] core.git: 10 commits - chart2/source sc/source sw/source ucb/source
Noel Grandin
noel at peralex.com
Mon May 26 05:48:03 PDT 2014
chart2/source/view/inc/GL3DRenderer.hxx | 2 -
chart2/source/view/main/GL3DRenderer.cxx | 48 +++++++++++++++++++++----------
sc/source/core/data/table2.cxx | 2 -
sw/source/ui/vba/vbarangehelper.cxx | 4 +-
sw/source/ui/vba/vbarangehelper.hxx | 2 -
sw/source/ui/vba/vbaview.cxx | 2 -
sw/source/ui/vba/vbaview.hxx | 2 -
sw/source/ui/vba/vbawrapformat.cxx | 2 -
sw/source/ui/vba/vbawrapformat.hxx | 2 -
ucb/source/ucp/tdoc/tdoc_content.cxx | 3 +
ucb/source/ucp/tdoc/tdoc_content.hxx | 3 +
ucb/source/ucp/tdoc/tdoc_provider.cxx | 7 ++--
ucb/source/ucp/tdoc/tdoc_provider.hxx | 9 +++--
13 files changed, 57 insertions(+), 31 deletions(-)
New commits:
commit 9a34b9152b98d246c7e11793490d039cb1d706ce
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 14:09:38 2014 +0200
cid#707399 Uncaught exception
Change-Id: I42d2cdb3a2341f156cd3fd70a9a476a8eb5423d8
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 78ef5fe..0e897ba 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -88,7 +88,9 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa
}
}
-uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange, const uno::Reference< text::XText >& rText ) throw ( uno::RuntimeException )
+uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange,
+ const uno::Reference< text::XText >& rText )
+ throw ( uno::RuntimeException, script::BasicErrorException )
{
uno::Reference< text::XTextCursor > xTextCursor;
bool bGotTextCursor = false;
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 417f9c7..b4be49c 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -30,7 +30,7 @@ class SwVbaRangeHelper
public:
static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( css::uno::RuntimeException );
- static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
+ static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException, css::script::BasicErrorException );
static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
commit ff2573ca68f957a2630af4e8f852947c2df32278
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 14:07:22 2014 +0200
cid#707410 Uncaught exception
Change-Id: I54bcc0fc7d54ca7bae35130ef620100c9088b4d2
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index af40d8e..b47188c 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -240,7 +240,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::
}
}
-uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException)
+uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException, script::BasicErrorException)
{
mxModel->lockControllers();
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index ebc081a..c2962a8 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -35,7 +35,7 @@ private:
css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
- css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException);
+ css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException);
css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
public:
commit 49352b4e54b3dc25704e11ac5b6b71b190eaa6ee
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 14:04:28 2014 +0200
cid#707415 Uncaught exception
Change-Id: Ia4674e74621fe152ba764f3beaa7376533977d19
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index a08cf9c..251e415 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -31,7 +31,7 @@ SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::R
m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
}
-void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
+void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException, script::BasicErrorException)
{
text::WrapTextMode eTextMode = text::WrapTextMode_NONE;
if( mnSide == word::WdWrapSideType::wdWrapLeft )
diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx
index 14a701d..d72cb05 100644
--- a/sw/source/ui/vba/vbawrapformat.hxx
+++ b/sw/source/ui/vba/vbawrapformat.hxx
@@ -34,7 +34,7 @@ private:
sal_Int32 mnSide;
private:
- void makeWrap() throw (css::uno::RuntimeException);
+ void makeWrap() throw (css::uno::RuntimeException, css::script::BasicErrorException);
float getDistance( const OUString& sName ) throw (css::uno::RuntimeException);
void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException);
commit e168210b3c3f4be09549a7b096ef5b962ffa8519
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 12:24:00 2014 +0200
cid#707435 Uncaught exception
Change-Id: I6c0195b3474e56191fc1ca8d7d251c8931815c11
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index b4b0f01..5804570 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -446,7 +446,8 @@ uno::Reference< io::XOutputStream >
ContentProvider::queryOutputStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( packages::WrongPasswordException )
+ throw ( packages::WrongPasswordException,
+ uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index d3f1364..0bbf318 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -129,7 +129,8 @@ public:
queryOutputStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( com::sun::star::packages::WrongPasswordException );
+ throw ( com::sun::star::packages::WrongPasswordException,
+ css::uno::RuntimeException );
com::sun::star::uno::Reference< com::sun::star::io::XStream >
queryStream( const OUString & rUri,
commit fb0d1fc5a62c928bf5824e1d75613ca2fb3a24a1
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 11:38:33 2014 +0200
cid#707434 Uncaught exception
Change-Id: Ibe227c7675723b337652f79ccce03f028cfe546f
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 69988cb..b4b0f01 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -408,7 +408,7 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const
uno::Reference< io::XInputStream >
ContentProvider::queryInputStream( const OUString & rUri,
const OUString & rPassword ) const
- throw ( packages::WrongPasswordException )
+ throw ( packages::WrongPasswordException, css::uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 5b099fc..d3f1364 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -122,7 +122,8 @@ public:
com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
queryInputStream( const OUString & rUri,
const OUString & rPassword ) const
- throw ( com::sun::star::packages::WrongPasswordException );
+ throw ( com::sun::star::packages::WrongPasswordException,
+ css::uno::RuntimeException );
com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >
queryOutputStream( const OUString & rUri,
commit 5da1b9c283d9756c0b12b216fc74111b686c0604
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 11:37:09 2014 +0200
cid#707433 Uncaught exception
Change-Id: I57581f61dcb83aac83673b8fe040981e28b320ba
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 1b0f11a..69988cb 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -486,7 +486,7 @@ uno::Reference< io::XStream >
ContentProvider::queryStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( packages::WrongPasswordException )
+ throw ( packages::WrongPasswordException, uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 963d912..5b099fc 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -134,7 +134,8 @@ public:
queryStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( com::sun::star::packages::WrongPasswordException );
+ throw ( com::sun::star::packages::WrongPasswordException,
+ css::uno::RuntimeException );
bool queryNamesOfChildren(
const OUString & rUri,
commit 021ba5cc808c0683656e84856307a52a2dba41b6
Author: Noel Grandin <noel at peralex.com>
Date: Mon May 26 11:35:29 2014 +0200
cid#707431 Uncaught exception
Change-Id: Icc5bea5e3e1d3782dfc6ca200ba24303945cb72c
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 81569d9..b8199ec 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2350,7 +2350,8 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
const uno::Reference<
ucb::XCommandEnvironment >& xEnv )
throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
+ task::DocumentPasswordRequest,
+ css::uno::RuntimeException )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index ec1a0d7..d7e7cec 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -144,7 +144,8 @@ private:
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::ucb::CommandFailedException,
- ::com::sun::star::task::DocumentPasswordRequest );
+ ::com::sun::star::task::DocumentPasswordRequest,
+ css::uno::RuntimeException );
bool renameData( const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& xOldId,
const com::sun::star::uno::Reference<
commit 727ea1e4ddd2178e9fbecd35f6a4bf8f8718ba43
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 23 17:27:35 2014 +0200
fix spelling of "indices"
Change-Id: I6dc8960d776b809aa701bf8e554e96131b6440c9
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 21f12c7..8b2b9a5 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -317,7 +317,7 @@ private:
std::vector<glm::vec3> m_Normals;
- std::vector<unsigned short> m_Indeices;
+ std::vector<unsigned short> m_Indices;
RoundBarMesh m_RoundBarMesh;
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 7bc4867..278dc56 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -308,7 +308,7 @@ void OpenGL3DRenderer::AddNormalData(GLuint normalBuf)
void OpenGL3DRenderer::AddIndexData(GLuint indexBuf)
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
- glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_Indeices.size() * sizeof(unsigned short), &m_Indeices[0], GL_STATIC_DRAW);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_Indices.size() * sizeof(unsigned short), &m_Indices[0], GL_STATIC_DRAW);
CHECK_GL_ERROR();
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
}
@@ -334,20 +334,20 @@ void OpenGL3DRenderer::SetVertex(PackedVertex &packed,
std::map<PackedVertex,unsigned short> &VertexToOutIndex,
std::vector<glm::vec3> &vertex,
std::vector<glm::vec3> &normal,
- std::vector<unsigned short> &indeices)
+ std::vector<unsigned short> &indices)
{
unsigned short index;
bool found = GetSimilarVertexIndex(packed, VertexToOutIndex, index);
if ( found )
{ // A similar vertex is already in the VBO, use it instead !
- indeices.push_back( index );
+ indices.push_back( index );
}
else
{ // If not, it needs to be added in the output data.
vertex.push_back(packed.position);
normal.push_back(packed.normal);
size_t newindex = vertex.size() - 1;
- indeices.push_back( newindex );
+ indices.push_back( newindex );
VertexToOutIndex[ packed ] = newindex;
}
}
@@ -367,7 +367,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
std::map<PackedVertex,unsigned short> VertexToOutIndex;
glm::vec3 actualVerteices[3];
glm::vec3 actualNormals[3];
- std::vector<unsigned short> indeices[5];
+ std::vector<unsigned short> indices[5];
glm::vec3 externSurNormal;
glm::mat4 corrctCoord = glm::translate(glm::vec3(width / 2.0f, height / 2.0f, depth / 2.0f - fRadius));
m_RoundBarMesh.topThreshold = topThreshold;
@@ -375,7 +375,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
m_RoundBarMesh.iMeshStartIndices = m_Vertices.size();
for (int k = 0; k < 5; k++)
{
- m_RoundBarMesh.iElementStartIndices[k] = indeices[k].size();
+ m_RoundBarMesh.iElementStartIndices[k] = indices[k].size();
}
for (size_t i = 0; i < vertices.size(); i += 3)
{
@@ -391,7 +391,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
{
{
PackedVertex packed = {actualVerteices[k], actualNormals[k]};
- SetVertex(packed, VertexToOutIndex, m_Vertices, m_Normals, indeices[surfaceIndex]);
+ SetVertex(packed, VertexToOutIndex, m_Vertices, m_Normals, indices[surfaceIndex]);
}
//add extern
@@ -401,7 +401,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
externSurNormal = (surfaceIndex == TOP_SURFACE) ? glm::vec3(0.0, 0.0, 1.0) : glm::vec3(0.0, 0.0, -1.0);
int tmpSurfaceIndex = (surfaceIndex == TOP_SURFACE) ? FLAT_TOP_SURFACE : FLAT_BOTTOM_SURFACE;
PackedVertex packed = {actualVerteices[k], externSurNormal};
- SetVertex(packed, VertexToOutIndex, m_Vertices, m_Normals, indeices[tmpSurfaceIndex]);
+ SetVertex(packed, VertexToOutIndex, m_Vertices, m_Normals, indices[tmpSurfaceIndex]);
}
}
@@ -410,13 +410,13 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
m_RoundBarMesh.iMeshSizes = m_Vertices.size() - m_RoundBarMesh.iMeshStartIndices;
for (int k = 0; k < 5; k++)
{
- m_RoundBarMesh.iElementSizes[k] = indeices[k].size() - m_RoundBarMesh.iElementStartIndices[k];
- m_RoundBarMesh.iElementStartIndices[k] = m_Indeices.size() * sizeof(unsigned short);
- for (unsigned int IdxCnt = 0; IdxCnt < indeices[k].size(); IdxCnt++)
+ m_RoundBarMesh.iElementSizes[k] = indices[k].size() - m_RoundBarMesh.iElementStartIndices[k];
+ m_RoundBarMesh.iElementStartIndices[k] = m_Indices.size() * sizeof(unsigned short);
+ for (unsigned int IdxCnt = 0; IdxCnt < indices[k].size(); IdxCnt++)
{
- m_Indeices.push_back(indeices[k][IdxCnt]);
+ m_Indices.push_back(indices[k][IdxCnt]);
}
- indeices[k].clear();
+ indices[k].clear();
}
vertices.clear();
normals.clear();
@@ -1025,7 +1025,7 @@ void OpenGL3DRenderer::AddShape3DExtrudeObject(bool roundedCorner, sal_uInt32 nC
}
m_Vertices.clear();
m_Normals.clear();
- m_Indeices.clear();
+ m_Indices.clear();
}
}
commit 7a0069b2e2d55e4bf47c48e1f54b86e4b9149998
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 23 17:25:20 2014 +0200
cid#1213562 Uninitialized scalar field
Change-Id: Ieec390aa1af1af53f375d707b920382f7a994fc1
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 7182a94..7bc4867 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -72,9 +72,27 @@ glm::vec4 getColorAsVector(sal_uInt32 nColor)
}
OpenGL3DRenderer::OpenGL3DRenderer():
- m_fViewAngle(30.0f)
+ m_iWidth(0)
+ , m_iHeight(0)
+ , m_3DUBOBuffer(0)
+ , m_3DActualSizeLight(0)
+ , m_NormalBuffer(0)
+ , m_VertexBuffer(0)
+ , m_CubeVertexBuf(0)
+ , m_CubeElementBuf(0)
+ , m_CubeNormalBuf(0)
+ , m_BoundBox(0)
+ , m_BoundBoxNormal(0)
+ , m_TextTexCoordBuf(0)
+ , m_RoundBarMesh()
+ , m_RenderVertexBuf(0)
+ , m_RenderTexCoordBuf(0)
+ , m_fViewAngle(30.0f)
, m_fHeightWeight(1.0f)
, mbPickingMode(false)
+ , mnPickingFbo(0)
+ , mnPickingRboDepth(0)
+ , mnPickingRboColor(0)
{
m_Polygon3DInfo.lineOnly = false;
m_Polygon3DInfo.twoSidesLighting = false;
commit 2bc74417150dd4301d4b864b6c95942384eb5daf
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 23 16:26:00 2014 +0200
cid#988429 Unintentional integer overflow
Change-Id: Ia8d6b29e03317b0891c8357875261263c4f01c2d
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 900c29b..b16aaa2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2997,7 +2997,7 @@ sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZ
return nHeight;
}
else
- return (sal_uLong) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight);
+ return (nEndRow - nStartRow + 1) * (sal_uLong)ScGlobal::nStdRowHeight;
}
More information about the Libreoffice-commits
mailing list