openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409434 - in /incubator/ooo/branches/gbuild/main/writerfilter: source/doctok/ source/filter/ source/resourcemodel/ unocomponent/debugservices/rtftok/
Date Wed, 14 Nov 2012 21:39:00 GMT
Author: arist
Date: Wed Nov 14 21:38:59 2012
New Revision: 1409434

URL: http://svn.apache.org/viewvc?rev=1409434&view=rev
Log:
writerfilter10_09_3bf5ecb86397.patch
# HG changeset patch
# User Henning Brinkmann <hbrinkm@openoffice.org>
# Date 1295517941 -3600
# Node ID 3bf5ecb86397018337d150a575f76658c44306ea
# Parent  d55fc25e48ab45f1249a88d18231c7c71e3797bc
resolved issues found by cppcheck


Modified:
    incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8StreamImpl.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/filter/ImportFilter.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/source/resourcemodel/resourcemodel.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
    incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8DocumentImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8DocumentImpl.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8DocumentImpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8DocumentImpl.cxx Wed
Nov 14 21:38:59 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
Wed Nov 14 21:38:59 2012
@@ -188,6 +188,7 @@ void WW8PropertiesReference::resolve(Pro
         }
         catch (ExceptionOutOfBounds e)
         {
+            (void) e;
         }
     }
 }

Modified: incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8StreamImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8StreamImpl.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8StreamImpl.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/doctok/WW8StreamImpl.cxx Wed Nov
14 21:38:59 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/filter/ImportFilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/filter/ImportFilter.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/filter/ImportFilter.cxx (original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/filter/ImportFilter.cxx Wed Nov
14 21:38:59 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/source/resourcemodel/resourcemodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/source/resourcemodel/resourcemodel.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/source/resourcemodel/resourcemodel.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/source/resourcemodel/resourcemodel.cxx
Wed Nov 14 21:38:59 2012
@@ -439,6 +439,7 @@ void WW8PropertiesHandler::attribute(Id 
         }
         catch (ExceptionOutOfBounds e)
         {
+            output.addItem("<exception/>");
         }
 
         output.addItem("</properties>");
@@ -456,6 +457,7 @@ void WW8PropertiesHandler::attribute(Id 
         }
         catch (ExceptionOutOfBounds e)
         {
+            output.addItem("<exception>Out Of Bounds</exception>");
         }
     }
 
@@ -471,6 +473,7 @@ void WW8PropertiesHandler::attribute(Id 
         }
         catch (ExceptionOutOfBounds e)
         {
+            output.addItem("<exception>Out Of Bounds</exception>");
         }
     }
 

Modified: incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
Wed Nov 14 21:38:59 2012
@@ -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: incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx?rev=1409434&r1=1409433&r2=1409434&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
Wed Nov 14 21:38:59 2012
@@ -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_)
 	{



Mime
View raw message