[Libreoffice-commits] core.git: writerfilter/source
Michael Stahl
mstahl at redhat.com
Thu Jul 31 08:50:22 PDT 2014
writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/dmapper/NumberingManager.cxx | 1 -
writerfilter/source/dmapper/PropertyMap.cxx | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 3bc61ac26f00e5bc3c7ae4ab8a44d0d7e519e2c1
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jul 31 17:34:50 2014 +0200
writerfilter: fix some -Werror=unused in previous patch
Change-Id: Iba7db7f9375807e97a4cdddc0c873fa3c9f6cfb6
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5507934..bd0b370 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -428,7 +428,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
// ooxml::CT_Spacing_line, then it should get the rule
// after lineRule as well.
TablePropertyMapPtr pTblCellWithDirectFormatting(new TablePropertyMap);
- pTblCellWithDirectFormatting->insert(std::pair< PropertyIds, PropValue >(PROP_PARA_LINE_SPACING, uno::makeAny( aSpacing )));
+ pTblCellWithDirectFormatting->Insert(PROP_PARA_LINE_SPACING, uno::makeAny(aSpacing), false);
m_pImpl->getTableManager().cellProps(pTblCellWithDirectFormatting);
}
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index d5cf412..abd78b7 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -220,7 +220,6 @@ static bool IgnoreForCharStyle(const OUString& aStr)
uno::Sequence< beans::PropertyValue > ListLevel::GetCharStyleProperties( )
{
PropertyValueVector_t rProperties;
- PropertyNameSupplier& aPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
uno::Sequence< beans::PropertyValue > vPropVals = PropertyMap::GetPropertyValues();
beans::PropertyValue* aValIter = vPropVals.begin();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 18e68e7..b1d5c5b 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1182,7 +1182,6 @@ public:
void SectionPropertyMap::_ApplyProperties(
uno::Reference< beans::XPropertySet > const& xStyle)
{
- PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
uno::Reference<beans::XMultiPropertySet> const xMultiSet(xStyle,
uno::UNO_QUERY);
More information about the Libreoffice-commits
mailing list