[Libreoffice-commits] core.git: 2 commits - writerfilter/source

[Stephan Bergmann]

 writerfilter/source/dmapper/FontTable.cxx       |    3 ---
 writerfilter/source/dmapper/StyleSheetTable.cxx |   11 +++--------
 writerfilter/source/filter/WriterFilter.cxx     |    2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 20d08026218cf4257693c706c97030b8d518aa68
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jul 30 15:44:02 2014 +0200

    Fix *_component_getFactory function type
    
    Change-Id: If66efdb6a00c383ba72898f601ff3d674e153704

diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index d600e58..9d37117 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -45,7 +45,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] =
     { 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL writerfilter_component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL writerfilter_component_getFactory(sal_Char const * implName, void * xMgr, void * xRegistry )
 {
     return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries );
 }
commit a45d968888e5970786528a74fd2063a6f9f25460
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jul 30 14:43:47 2014 +0200

    Remove redundant casts to void
    
    ...leftovers from de02d221e104f74bfa595d5e6c41248093c640f3 "printfs in comments"
    
    Change-Id: I0125ac2b5ea0b4450e8f707f980959443a6c4d27

diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 67c0aae..59cd5d0 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -113,9 +113,6 @@ void FontTable::lcl_sprm(Sprm& rSprm)
         return ;
     sal_uInt32 nSprmId = rSprm.getId();
 
-    Value::Pointer_t pValue = rSprm.getValue();
-    sal_Int32 nIntValue = pValue->getInt();
-    (void)nIntValue;
     switch(nSprmId)
     {
         case NS_ooxml::LN_CT_Font_charset:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 36f99ee..8f50037 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -411,7 +411,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
     if(!m_pImpl->m_pCurrentEntry)
         return ;
     int nIntValue = val.getInt();
-    (void)nIntValue;
     OUString sValue = val.getString();
 
     // The default type is paragraph, and it needs to be processed first,
@@ -512,7 +511,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
     sal_uInt32 nSprmId = rSprm.getId();
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue.get() ? pValue->getInt() : 0;
-    (void)nIntValue;
     OUString sStringValue = pValue.get() ? pValue->getString() : OUString();
 
     switch(nSprmId)
@@ -1190,9 +1188,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
 #endif
                             SAL_WARN("writerfilter", aMessage.getStr());
                         }
-                        catch( const uno::Exception& rEx)
+                        catch( const uno::Exception& )
                         {
-                            (void) rEx;
                             OSL_FAIL( "Some style properties could not be set");
                         }
                     }
@@ -1600,9 +1597,8 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
             {
                 xStyleProps->setPropertyValue( aCharPropIter->Name, aCharPropIter->Value );
             }
-            catch( const uno::Exception& rEx )
+            catch( const uno::Exception& )
             {
-                (void)rEx;
                 OSL_FAIL( "Exception in StyleSheetTable::getOrCreateCharStyle - Style::setPropertyValue");
             }
             ++aCharPropIter;
@@ -1610,9 +1606,8 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
         xCharStyles->insertByName( sListLabel, uno::makeAny( xStyle) );
         m_pImpl->m_aListCharStylePropertyVector.push_back( ListCharStylePropertyMap_t( sListLabel, rCharProperties ));
     }
-    catch( const uno::Exception& rEx )
+    catch( const uno::Exception& )
     {
-        (void)rEx;
         OSL_FAIL( "Exception in StyleSheetTable::getOrCreateCharStyle");
     }