diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-25 13:59:56 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-25 14:18:54 +0200 |
commit | 535aa95014b4f30ba5f06a563c35db6c98cca9d9 (patch) | |
tree | ed5373234b317b750ab766965e43ab8bbb39a28f /xmloff/source/style | |
parent | d375cafef68e8be9d0d35cbb535b8481a3913ace (diff) |
loplugin:unuseddefaultparams in xmloff/
Change-Id: Ia504a4e96a4ebc8404fe6881e0f77fba29cd00ae
Diffstat (limited to 'xmloff/source/style')
-rw-r--r-- | xmloff/source/style/XMLPageExport.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/style/xmlexppr.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlprmap.cxx | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 7713b664cefa..5463fc18d17f 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -162,8 +162,8 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) : xPageMasterExportPropMapper = new XMLPageMasterExportPropMapper( xPageMasterPropSetMapper, rExp); - rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, OUString( XML_STYLE_FAMILY_PAGE_MASTER_NAME ), - xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), false ); + rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, XML_STYLE_FAMILY_PAGE_MASTER_NAME, + xPageMasterExportPropMapper, XML_STYLE_FAMILY_PAGE_MASTER_PREFIX, false ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetExport().GetModel(), UNO_QUERY ); diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 4e7d1adeda26..fecc47acdce1 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -280,11 +280,10 @@ void SvXMLAutoStylePoolP::AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, - const OUString& aStrPrefix, - bool bAsFamily ) + const OUString& aStrPrefix ) { rtl::Reference <SvXMLExportPropertyMapper> xTmp = pMapper; - AddFamily( nFamily, rStrName, xTmp, aStrPrefix, bAsFamily ); + AddFamily( nFamily, rStrName, xTmp, aStrPrefix ); } void SvXMLAutoStylePoolP::AddFamily( diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index a204b3e17d1b..870e19cbdcfc 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -576,9 +576,9 @@ std::vector<XMLPropertyState> SvXMLExportPropertyMapper::Filter( } std::vector<XMLPropertyState> SvXMLExportPropertyMapper::FilterDefaults( - const uno::Reference<beans::XPropertySet>& rPropSet, bool bEnableFoFontFamily ) const + const uno::Reference<beans::XPropertySet>& rPropSet ) const { - return _Filter(rPropSet, true, bEnableFoFontFamily); + return _Filter(rPropSet, true, false/*bEnableFoFontFamily*/); } vector<XMLPropertyState> SvXMLExportPropertyMapper::_Filter( diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 7c3cdaf3c4a3..94208eb47dce 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -184,12 +184,10 @@ sal_uInt32 XMLPropertySetMapper::GetEntryFlags( sal_Int32 nIndex ) const return mpImpl->maMapEntries[nIndex].nType & ~MID_FLAG_MASK; } -sal_uInt32 XMLPropertySetMapper::GetEntryType( sal_Int32 nIndex, bool bWithFlags ) const +sal_uInt32 XMLPropertySetMapper::GetEntryType( sal_Int32 nIndex ) const { assert((0 <= nIndex) && (nIndex < static_cast<sal_Int32>(mpImpl->maMapEntries.size()))); sal_uInt32 nType = mpImpl->maMapEntries[nIndex].nType; - if( !bWithFlags ) - nType = nType & MID_FLAG_MASK; return nType; } |