Author: damjan
Date: Wed Feb 24 01:21:38 2016
New Revision: 1732000
URL: http://svn.apache.org/viewvc?rev=1732000&view=rev
Log:
Merge r1409434 from branches/gbuild:
resolved issues found by cppcheck
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8StreamImpl.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/ImportFilter.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/resourcemodel.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 01:21:38 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409433,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409428,1409432-1409434,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8DocumentImpl.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
Wed Feb 24 01:21:38 2016
@@ -192,7 +192,8 @@ mbInSection(false), mbInParagraphGroup(f
("Data"));
}
catch (ExceptionNotFound e)
- {
+ {
+ (void) e;
}
try
@@ -202,6 +203,7 @@ mbInSection(false), mbInParagraphGroup(f
}
catch (ExceptionNotFound e)
{
+ (void) e;
}
mpCHPFKPCache =
@@ -871,6 +873,7 @@ writerfilter::Reference<Properties>::Poi
}
catch (ExceptionOutOfBounds e)
{
+ (void) e;
}
}
@@ -1009,7 +1012,9 @@ writerfilter::Reference<Table>::Pointer_
pResult = writerfilter::Reference<Table>::Pointer_t(pList);
}
- catch (ExceptionOutOfBounds aException) {
+ catch (ExceptionOutOfBounds aException)
+ {
+ (void) aException;
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
Wed Feb 24 01:21:38 2016
@@ -192,6 +192,7 @@ void WW8PropertiesReference::resolve(Pro
}
catch (ExceptionOutOfBounds e)
{
+ (void) e;
}
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8StreamImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8StreamImpl.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8StreamImpl.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/doctok/WW8StreamImpl.cxx
Wed Feb 24 01:21:38 2016
@@ -118,10 +118,9 @@ WW8Stream::Pointer_t WW8StreamImpl::getS
}
catch (...)
{
+ throw ExceptionNotFound("Stream not found");
}
- if (pResult.get() == NULL)
- throw ExceptionNotFound("Stream not found");
return pResult;
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/ImportFilter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/ImportFilter.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/ImportFilter.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/filter/ImportFilter.cxx
Wed Feb 24 01:21:38 2016
@@ -72,8 +72,9 @@ sal_Bool WriterFilter::filter( const uno
::oox::core::FilterDetect aDetector( m_xContext );
xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc );
}
- catch( uno::Exception& )
+ catch( uno::Exception& e)
{
+ (void) e;
}
if ( !xInputStream.is() )
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/resourcemodel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/resourcemodel.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/resourcemodel.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/source/resourcemodel/resourcemodel.cxx
Wed Feb 24 01:21:38 2016
@@ -441,6 +441,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception/>");
}
output.addItem("</properties>");
@@ -458,6 +459,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
}
@@ -473,6 +475,7 @@ void WW8PropertiesHandler::attribute(Id
}
catch (ExceptionOutOfBounds e)
{
+ output.addItem("<exception>Out Of Bounds</exception>");
}
}
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
Wed Feb 24 01:21:38 2016
@@ -263,7 +263,7 @@ class MyRtfScannerHandler : public write
public:
MyRtfScannerHandler(uno::Reference<lang::XMultiServiceFactory>
&xServiceFactory_, uno::Reference<com::sun::star::ucb::XSimpleFileAccess>
&xFileAccess_, uno::Reference<embed::XStorage> &xStorage_) :
- objDataLevel(0), numOfOLEs(0),
+ objDataLevel(0), numOfOLEs(0), hb(' '), numOfOLEChars(0),
xServiceFactory(xServiceFactory_),
xFileAccess(xFileAccess_),
xStorage(xStorage_)
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx?rev=1732000&r1=1731999&r2=1732000&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
Wed Feb 24 01:21:38 2016
@@ -164,7 +164,7 @@ class XmlRtfScannerHandler : public writ
public:
XmlRtfScannerHandler(uno::Reference<lang::XMultiServiceFactory>
&xServiceFactory_, uno::Reference<com::sun::star::ucb::XSimpleFileAccess>
&xFileAccess_) :
- objDataLevel(0), numOfOLEs(0),
+ objDataLevel(0), numOfOLEs(0), hb(' '), numOfOLEChars(0),
xServiceFactory(xServiceFactory_),
xFileAccess(xFileAccess_)
{
