summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-01-02 05:06:31 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2016-01-15 21:42:42 +0100
commita4f0197c2711a9324b6a53b552ea287314bf7c4b (patch)
tree01342f5187f4344b39db3579705ae49b0753a1c3
parent5f98d3bc9b029d05830bb6c4fea3e4d2dcde1da0 (diff)
use Any::has<> instead of Any::isExtractableTo<>()
Change-Id: I4927986485feb665339e6708bb66286a54926ab8
-rw-r--r--sw/source/core/unocore/unostyle.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5b9bcd260b32..070807e798b3 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1096,7 +1096,7 @@ static uno::Reference<beans::XPropertySet> lcl_InitStandardStyle(const SfxStyleF
if(eFamily != SFX_STYLE_FAMILY_PARA && eFamily != SFX_STYLE_FAMILY_PAGE)
return {};
auto aResult(rxStyleFamily->getByName("Standard"));
- if(!aResult.isExtractableTo(cppu::UnoType<return_t>::get()))
+ if(!aResult.has<return_t>())
return {};
return aResult.get<return_t>();
}
@@ -1112,7 +1112,7 @@ static uno::Reference<container::XNameAccess> lcl_InitStyleFamily(SwDoc* pDoc, c
uno::Reference<style::XStyleFamiliesSupplier> xFamilySupplier(xModel, uno::UNO_QUERY);
auto xFamilies = xFamilySupplier->getStyleFamilies();
auto aResult(xFamilies->getByName(rEntry.m_sName));
- if(!aResult.isExtractableTo(cppu::UnoType<return_t>::get()))
+ if(!aResult.has<return_t>())
return {};
return aResult.get<return_t>();
}
@@ -1421,7 +1421,7 @@ sal_uInt8 lcl_TranslateMetric(const SfxItemPropertySimpleEntry& rEntry, SwDoc* p
// exception: If these ItemTypes are used, do not convert when these are negative
// since this means they are intended as percent values
if((XATTR_FILLBMP_SIZEX == rEntry.nWID || XATTR_FILLBMP_SIZEY == rEntry.nWID)
- && o_aValue.isExtractableTo(cppu::UnoType<sal_Int32>::get())
+ && o_aValue.has<sal_Int32>()
&& o_aValue.get<sal_Int32>() < 0)
return rEntry.nMemberId;
if(!pDoc)
@@ -1461,7 +1461,7 @@ void SwXStyle::SetPropertyValue<XATTR_FILLGRADIENT>(const SfxItemPropertySimpleE
{
// add set commands for FillName items
SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- if(!aValue.isExtractableTo(cppu::UnoType<OUString>::get()))
+ if(!aValue.has<OUString>())
throw lang::IllegalArgumentException();
SvxShape::SetFillAttribute(rEntry.nWID, aValue.get<OUString>(), rStyleSet);
}