diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 12:28:24 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 12:31:13 +0200 |
commit | 2a777a1014365c3cdf5902fcfd67e9bb77baedd1 (patch) | |
tree | 8e876cc68cd06b9b87c144269a722c5892bfdbf1 /writerfilter/source | |
parent | brain fog: logic error (diff) | |
download | core-2a777a1014365c3cdf5902fcfd67e9bb77baedd1.tar.gz core-2a777a1014365c3cdf5902fcfd67e9bb77baedd1.zip |
writerfilter: fix new clang warnings
Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 22 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/FontTable.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/FormControlHelper.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/ThemeTable.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 1 |
6 files changed, 12 insertions, 21 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index f8786c9ed32e..e6d63f5d69e1 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 d4f4b85b1717..9349f7f8679f 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 d821822396ba..08aab1149b75 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 38daa1d2ea58..38edf6f9f6ba 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 7504a79cc4c3..4e7088809620 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 207342ada465..8d9b244a2c07 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 |