[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   22 +++++++--------
 writerfilter/source/dmapper/DomainMapper_Impl.cxx        |    2 -
 writerfilter/source/dmapper/FontTable.cxx                |    1 
 writerfilter/source/dmapper/FormControlHelper.cxx        |    1 
 writerfilter/source/dmapper/ThemeTable.cxx               |    6 ----
 writerfilter/source/filter/ImportFilter.cxx              |    1 
 6 files changed, 12 insertions(+), 21 deletions(-)

New commits:
commit 2a777a1014365c3cdf5902fcfd67e9bb77baedd1
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sat Oct 13 12:28:24 2012 +0200

    writerfilter: fix new clang warnings
    
    Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index f8786c9..e6d63f5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -545,19 +545,19 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 if ( rInfo.pTableDefaults->size( ) )
                     pAllCellProps->insert( rInfo.pTableDefaults );
 
-                    // Fill the cell properties with the ones of the style
-                    sal_Int32 nCellStyleMask = 0;
-                    const PropertyMap::iterator aCnfStyleIter =
+                // Fill the cell properties with the ones of the style
+                sal_Int32 nCellStyleMask = 0;
+                const PropertyMap::iterator aCnfStyleIter =
                     aCellIterator->get()->find( PropertyDefinition( PROP_CNF_STYLE, false ) );
-                    if ( aCnfStyleIter != aCellIterator->get( )->end( ) )
-                    {
-                        if ( rInfo.pTableStyle ) {
-                            OUString sMask;
-                            aCnfStyleIter->second >>= sMask;
-                            nCellStyleMask = sMask.toInt32( 2 );
-                        }
-                        aCellIterator->get( )->erase( aCnfStyleIter );
+                if ( aCnfStyleIter != aCellIterator->get( )->end( ) )
+                {
+                    if ( rInfo.pTableStyle ) {
+                        OUString sMask;
+                        aCnfStyleIter->second >>= sMask;
+                        nCellStyleMask = sMask.toInt32( 2 );
                     }
+                    aCellIterator->get( )->erase( aCnfStyleIter );
+                }
 
                 if ( rInfo.pTableStyle )
                 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d4f4b85..9349f7f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2731,7 +2731,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                     break;
                     case FIELD_COMMENTS     :
                     {
-                        OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") );
+                        // OUString sParam = lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") );
                         // A parameter with COMMENTS shouldn't set fixed
                         // ( or at least the binary filter doesn't )
                         // If we set fixed then we wont export a field cmd.
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index d821822..08aab11 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -129,7 +129,6 @@ void FontTable::lcl_sprm(Sprm& rSprm)
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue->getInt();
     (void)nIntValue;
-    OUString sStringValue = pValue->getString();
     switch(nSprmId)
     {
         case NS_ooxml::LN_CT_Font_charset:
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 38daa1d..38edf6f 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -231,7 +231,6 @@ bool FormControlHelper::processField(uno::Reference<text::XFormField> xFormField
             aAny <<= m_pFFData->getCheckboxChecked();
             if ( xPropSet.is() )
                 xPropSet->setPropertyValue("Checked", aAny);
-            OUString sName;
         }
         else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN )
         {
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 7504a79..4e70888 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -87,12 +87,6 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
 #endif
 
     sal_uInt32 nSprmId = rSprm.getId();
-    (void)nSprmId;
-
-    Value::Pointer_t pValue = rSprm.getValue();
-    sal_Int32 nIntValue = pValue->getInt();
-    (void)nIntValue;
-    OUString sStringValue = pValue->getString();
 
     switch(nSprmId)
     {
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 207342a..8d9b244 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -64,7 +64,6 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
     {
         MediaDescriptor aMediaDesc( aDescriptor );
         bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault( "RepairPackage", false );
-        OUString sFilterName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_FILTERNAME(), OUString() );
 
         uno::Reference< io::XInputStream > xInputStream;
         try