summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:43:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:43:33 +0200
commita0c46d2f20989bab56a7bc95409d0043a3f323c7 (patch)
tree3058ac0d31b01b4d4d2fb4ab79649a6490b7cd3a /xmloff
parent2b1d22e1ff6ea5ef7a53783617a45309d7426f07 (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Ic3764caeeb2cdec397071706845bf8517c848917
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx10
-rw-r--r--xmloff/source/core/xmlexp.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx2
-rw-r--r--xmloff/source/forms/elementimport.cxx4
-rw-r--r--xmloff/source/forms/formattributes.cxx2
-rw-r--r--xmloff/source/forms/propertyexport.hxx2
-rw-r--r--xmloff/source/forms/propertyimport.cxx6
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.cxx8
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.cxx6
-rw-r--r--xmloff/source/style/xmlnumi.cxx2
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx16
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx6
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.cxx10
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.cxx6
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.cxx14
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx8
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.cxx6
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx6
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx10
-rw-r--r--xmloff/source/text/XMLTextHeaderFooterContext.cxx10
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx2
-rw-r--r--xmloff/source/text/txtdropi.cxx2
-rw-r--r--xmloff/source/text/txtfldi.cxx34
-rw-r--r--xmloff/source/text/txtparae.cxx2
-rw-r--r--xmloff/source/text/txtprhdl.cxx14
-rw-r--r--xmloff/source/text/txtstyli.cxx2
-rw-r--r--xmloff/source/text/txtvfldi.cxx16
34 files changed, 113 insertions, 113 deletions
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index b36953f5a1b7..7e8a68d6635c 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -130,13 +130,13 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
default:
{
uno::Type aType = aAny.getValueType();
- if (aType.equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ) )
+ if (aType.equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ) )
{
uno::Sequence< beans::PropertyValue> aProps;
aAny >>= aProps;
exportSequencePropertyValue(aProps, rName);
}
- else if( aType.equals(getCppuType( (uno::Sequence<sal_Int8> *)0 ) ) )
+ else if( aType.equals(cppu::UnoType<uno::Sequence<sal_Int8>>::get() ) )
{
uno::Sequence< sal_Int8 > aProps;
aAny >>= aProps;
@@ -166,7 +166,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
{
exportForbiddenCharacters( aAny, rName );
}
- else if( aType.equals(getCppuType( (uno::Sequence<formula::SymbolDescriptor> *)0 ) ) )
+ else if( aType.equals(cppu::UnoType<uno::Sequence<formula::SymbolDescriptor>>::get() ) )
{
uno::Sequence< formula::SymbolDescriptor > aProps;
aAny >>= aProps;
@@ -382,7 +382,7 @@ void XMLSettingsExportHelper::exportNameAccess(
const OUString& rName) const
{
DBG_ASSERT(!rName.isEmpty(), "no name");
- DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
+ DBG_ASSERT(aNamed->getElementType().equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ),
"wrong NameAccess" );
if(aNamed->hasElements())
{
@@ -400,7 +400,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
const OUString& rName) const
{
DBG_ASSERT(!rName.isEmpty(), "no name");
- DBG_ASSERT(rIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
+ DBG_ASSERT(rIndexed->getElementType().equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ),
"wrong IndexAccess" );
OUString sEmpty;
if (rIndexed->hasElements())
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index e6ef5df90a6b..89cee1006824 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2074,7 +2074,7 @@ ProgressBarHelper* SvXMLExport::GetProgressBarHelper()
if (xPropertySetInfo->hasPropertyByName(sRepeat))
{
uno::Any aAny = mxExportInfo->getPropertyValue(sRepeat);
- if (aAny.getValueType() == getBooleanCppuType())
+ if (aAny.getValueType() == cppu::UnoType<bool>::get())
mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
else {
SAL_WARN("xmloff.core", "why is it no boolean?" );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index a30ad8f466d7..48b54c43c271 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1503,7 +1503,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper()
if (xPropertySetInfo->hasPropertyByName(sRepeat))
{
uno::Any aAny = mxImportInfo->getPropertyValue(sRepeat);
- if (aAny.getValueType() == getBooleanCppuType())
+ if (aAny.getValueType() == cppu::UnoType<bool>::get())
mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
else {
SAL_WARN( "xmloff.core", "why is it no boolean?" );
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index aafd03e5937c..c41c0d76a8d6 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1135,7 +1135,7 @@ namespace xmloff
if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) )
{
OSL_VERIFY( PropertyConversion::convertString(
- ::getCppuType( &m_nImagePosition ),
+ cppu::UnoType<decltype(m_nImagePosition)>::get(),
_rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition )
) >>= m_nImagePosition );
m_bHaveImagePosition = true;
@@ -1145,7 +1145,7 @@ namespace xmloff
if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) )
{
OSL_VERIFY( PropertyConversion::convertString(
- ::getCppuType( &m_nImageAlign ),
+ cppu::UnoType<decltype(m_nImageAlign)>::get(),
_rValue, OEnumMapper::getEnumMap( OEnumMapper::epImageAlign )
) >>= m_nImageAlign );
return true;
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 1973c23adf29..e63d89c6d2dc 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -234,7 +234,7 @@ namespace xmloff
{
OUStringBuffer aDefault;
::sax::Converter::convertBool(aDefault, _bAttributeDefault);
- AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, ::getBooleanCppuType(), aDefault.makeStringAndClear());
+ AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, cppu::UnoType<bool>::get(), aDefault.makeStringAndClear());
aAssignment.bInverseSemantics = _bInverseSemantics;
}
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 9f2cdd8b8d60..2c38bc3862a1 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -391,7 +391,7 @@ namespace xmloff
//= helper
#ifdef DBG_UTIL
#define DBG_CHECK_PROPERTY(name, type) \
- dbg_implCheckProperty(name, &::getCppuType(static_cast< type* >(NULL)))
+ dbg_implCheckProperty(name, &cppu::UnoType<type>::get())
#define DBG_CHECK_PROPERTY_NO_TYPE(name) \
dbg_implCheckProperty(name, NULL)
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 939574608756..ceda8bde9e4a 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -234,12 +234,12 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe
Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
{
- Type aUnoType( ::getVoidCppuType() );
+ Type aUnoType( cppu::UnoType<cppu::UnoVoidType>::get() );
static std::map< OUString, css::uno::Type > s_aTypeNameMap;
if ( s_aTypeNameMap.empty() )
{
- s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType();
+ s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = cppu::UnoType<bool>::get();
// Not a copy paste error, quotation from:
// http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071p4109116.html
// all numeric types (including the UNO double)
@@ -247,7 +247,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
// C++ type "float" to "double" makes absolute sense
s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::cppu::UnoType<double>::get();
s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::cppu::UnoType<OUString>::get();
- s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = ::getVoidCppuType();
+ s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = cppu::UnoType<cppu::UnoVoidType>::get();
}
const std::map< OUString, css::uno::Type >::iterator aTypePos = s_aTypeNameMap.find( _rType );
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 7073ab64153b..de381ceaff65 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -315,28 +315,28 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
{
sal_Bool bValue(sal_False);
uno::Any aAny;
- aAny.setValue( &bValue, ::getBooleanCppuType() );
+ aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
xHeaderDynamic.reset(new XMLPropertyState(pHeaderHeight->mnIndex + 2, aAny));
}
if (pHeaderMinHeight)
{
sal_Bool bValue(sal_True);
uno::Any aAny;
- aAny.setValue( &bValue, ::getBooleanCppuType() );
+ aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
xHeaderDynamic.reset(new XMLPropertyState(pHeaderMinHeight->mnIndex + 1, aAny));
}
if (pFooterHeight)
{
sal_Bool bValue(sal_False);
uno::Any aAny;
- aAny.setValue( &bValue, ::getBooleanCppuType() );
+ aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
xFooterDynamic.reset(new XMLPropertyState(pFooterHeight->mnIndex + 2, aAny));
}
if (pFooterMinHeight)
{
sal_Bool bValue(sal_True);
uno::Any aAny;
- aAny.setValue( &bValue, ::getBooleanCppuType() );
+ aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
xFooterDynamic.reset(new XMLPropertyState(pFooterMinHeight->mnIndex + 1, aAny));
}
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 67ce53228a43..44165455add0 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -138,7 +138,7 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
//UUUU
case XML_SW_TYPE_FILLSTYLE:
- pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const FillStyle*)0) );
+ pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<FillStyle>::get() );
break;
case XML_SW_TYPE_FILLBITMAPSIZE:
pHdl = new XMLFillBitmapSizePropertyHandler();
@@ -147,10 +147,10 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
pHdl = new XMLBitmapLogicalSizePropertyHandler();
break;
case XML_SW_TYPE_BITMAP_REFPOINT:
- pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const RectanglePoint*)0) );
+ pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<RectanglePoint>::get() );
break;
case XML_SW_TYPE_BITMAP_MODE:
- pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const BitmapMode*)0) );
+ pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<BitmapMode>::get() );
break;
case XML_SW_TYPE_BITMAPREPOFFSETX:
case XML_SW_TYPE_BITMAPREPOFFSETY:
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index bea31bfc5574..4fbd4f495556 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1115,7 +1115,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
{
Any aAny;
sal_Bool bTmp = bConsecutive;
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsContinuousNumbering, aAny );
}
}
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index ef326bb22282..8d010e54a8ee 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -414,7 +414,7 @@ void XMLFootnoteConfigurationImportContext::ProcessSettings(
if (!bIsEndnote)
{
- aAny.setValue(&bPosition, ::getBooleanCppuType());
+ aAny.setValue(&bPosition, cppu::UnoType<bool>::get());
rConfig->setPropertyValue(sPropertyPositionEndOfDoc, aAny);
aAny <<= nNumbering;
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 0fba2c187898..8568eb097ea8 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -203,28 +203,28 @@ void XMLIndexAlphabeticalSourceContext::EndElement()
rIndexPropertySet->setPropertyValue(sMainEntryCharacterStyleName,aAny);
}
- aAny.setValue(&bSeparators, ::getBooleanCppuType());
+ aAny.setValue(&bSeparators, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseAlphabeticalSeparators, aAny);
- aAny.setValue(&bCombineEntries, ::getBooleanCppuType());
+ aAny.setValue(&bCombineEntries, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseCombinedEntries, aAny);
- aAny.setValue(&bCaseSensitive, ::getBooleanCppuType());
+ aAny.setValue(&bCaseSensitive, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sIsCaseSensitive, aAny);
- aAny.setValue(&bEntry, ::getBooleanCppuType());
+ aAny.setValue(&bEntry, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseKeyAsEntry, aAny);
- aAny.setValue(&bUpperCase, ::getBooleanCppuType());
+ aAny.setValue(&bUpperCase, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseUpperCase, aAny);
- aAny.setValue(&bCombineDash, ::getBooleanCppuType());
+ aAny.setValue(&bCombineDash, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseDash, aAny);
- aAny.setValue(&bCombinePP, ::getBooleanCppuType());
+ aAny.setValue(&bCombinePP, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUsePP, aAny);
- aAny.setValue(&bCommaSeparated, ::getBooleanCppuType());
+ aAny.setValue(&bCommaSeparated, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sIsCommaSeparated, aAny);
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cc816b594746..9129b62d28cf 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -209,7 +209,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
PropertyValue aSortValue;
aSortValue.Name = sIsSortAscending;
- aAny.setValue(&bSort, ::getBooleanCppuType());
+ aAny.setValue(&bSort, cppu::UnoType<bool>::get());
aSortValue.Value = aAny;
aKey[1] = aSortValue;
@@ -260,10 +260,10 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool)
aAny <<= sPrefix;
xPropSet->setPropertyValue(sBracketBefore, aAny);
- aAny.setValue(&bNumberedEntries, ::getBooleanCppuType());
+ aAny.setValue(&bNumberedEntries, cppu::UnoType<bool>::get());
xPropSet->setPropertyValue(sIsNumberEntries, aAny);
- aAny.setValue(&bSortByPosition, ::getBooleanCppuType());
+ aAny.setValue(&bSortByPosition, cppu::UnoType<bool>::get());
xPropSet->setPropertyValue(sIsSortByPosition, aAny);
if( !maLanguageTagODF.isEmpty() )
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 98451c681294..8b8eb5032f13 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -132,19 +132,19 @@ void XMLIndexObjectSourceContext::EndElement()
{
Any aAny;
- aAny.setValue(&bUseCalc, ::getBooleanCppuType());
+ aAny.setValue(&bUseCalc, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromStarCalc, aAny);
- aAny.setValue(&bUseChart, ::getBooleanCppuType());
+ aAny.setValue(&bUseChart, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromStarChart, aAny);
- aAny.setValue(&bUseDraw, ::getBooleanCppuType());
+ aAny.setValue(&bUseDraw, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromStarDraw, aAny);
- aAny.setValue(&bUseMath, ::getBooleanCppuType());
+ aAny.setValue(&bUseMath, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromStarMath, aAny);
- aAny.setValue(&bUseOtherObjects, ::getBooleanCppuType());
+ aAny.setValue(&bUseOtherObjects, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromOtherEmbeddedObjects, aAny);
XMLIndexSourceBaseContext::EndElement();
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index f3019851d32d..f7d29f44304e 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -221,10 +221,10 @@ void XMLIndexSourceBaseContext::EndElement()
{
Any aAny;
- aAny.setValue(&bRelativeTabs, ::getBooleanCppuType());
+ aAny.setValue(&bRelativeTabs, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sIsRelativeTabstops, aAny);
- aAny.setValue(&bChapterIndex, ::getBooleanCppuType());
+ aAny.setValue(&bChapterIndex, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromChapter, aAny);
}
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 341765d8e187..899252078adb 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -244,7 +244,7 @@ void XMLIndexTOCContext::StartElement(
}
Any aAny;
- aAny.setValue( &bProtected, ::getBooleanCppuType() );
+ aAny.setValue( &bProtected, cppu::UnoType<bool>::get() );
xTOCPropertySet->setPropertyValue( sIsProtected, aAny );
if (!sIndexName.isEmpty())
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index d1ec00d983a1..4ee9095a4969 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -140,13 +140,13 @@ void XMLIndexTOCSourceContext::EndElement()
{
Any aAny;
- aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+ aAny.setValue(&bUseMarks, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
- aAny.setValue(&bUseOutline, ::getBooleanCppuType());
+ aAny.setValue(&bUseOutline, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromOutline, aAny);
- aAny.setValue(&bUseParagraphStyles, ::getBooleanCppuType());
+ aAny.setValue(&bUseParagraphStyles, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
aAny <<= (sal_Int16)nOutlineLevel;
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 9fe6947dd14b..f1ad3f007fba 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -133,7 +133,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues(
// right aligned?
pValues[nNextEntry].Name = rTemplateContext.sTabStopRightAligned;
pValues[nNextEntry].Value.setValue( &bTabRightAligned,
- ::getBooleanCppuType());
+ cppu::UnoType<bool>::get());
nNextEntry++;
// position
@@ -155,7 +155,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues(
// tab character #i21237#
pValues[nNextEntry].Name = "WithTab";
pValues[nNextEntry].Value.setValue( &bWithTab,
- ::getBooleanCppuType());
+ cppu::UnoType<bool>::get());
nNextEntry++;
// check whether we really filled all elements of the sequence
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index f1fa32e23abe..ba66fd5705c2 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexTableSourceContext::EndElement()
{
Any aAny;
- aAny.setValue(&bUseCaption, ::getBooleanCppuType());
+ aAny.setValue(&bUseCaption, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromLabels, aAny);
if (bSequenceOK)
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index f5772dcf5839..214c2d9ad337 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -156,25 +156,25 @@ void XMLIndexUserSourceContext::EndElement()
{
Any aAny;
- aAny.setValue(&bUseObjects, ::getBooleanCppuType());
+ aAny.setValue(&bUseObjects, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromEmbeddedObjects, aAny);
- aAny.setValue(&bUseGraphic, ::getBooleanCppuType());
+ aAny.setValue(&bUseGraphic, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromGraphicObjects, aAny);
- aAny.setValue(&bUseLevelFromSource, ::getBooleanCppuType());
+ aAny.setValue(&bUseLevelFromSource, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sUseLevelFromSource, aAny);
- aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+ aAny.setValue(&bUseMarks, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
- aAny.setValue(&bUseTables, ::getBooleanCppuType());
+ aAny.setValue(&bUseTables, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromTables, aAny);
- aAny.setValue(&bUseFrames, ::getBooleanCppuType());
+ aAny.setValue(&bUseFrames, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromTextFrames, aAny);
- aAny.setValue(&bUseLevelParagraphStyles, ::getBooleanCppuType());
+ aAny.setValue(&bUseLevelParagraphStyles, cppu::UnoType<bool>::get());
rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
if( !sIndexName.isEmpty() )
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 0a0244993d2a..125e6606c5c5 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -256,16 +256,16 @@ void XMLLineNumberingImportContext::CreateAndInsert(bool)
xLineNumbering->setPropertyValue(sSeparatorInterval, aAny);
}
- aAny.setValue(&bNumberLines, ::getBooleanCppuType());
+ aAny.setValue(&bNumberLines, cppu::UnoType<bool>::get());
xLineNumbering->setPropertyValue(sIsOn, aAny);
- aAny.setValue(&bCountEmptyLines, ::getBooleanCppuType());
+ aAny.setValue(&bCountEmptyLines, cppu::UnoType<bool>::get());
xLineNumbering->setPropertyValue(sCountEmptyLines, aAny);
- aAny.setValue(&bCountInFloatingFrames, ::getBooleanCppuType());
+ aAny.setValue(&bCountInFloatingFrames, cppu::UnoType<bool>::get());
xLineNumbering->setPropertyValue(sCountLinesInFrames, aAny);
- aAny.setValue(&bRestartNumbering, ::getBooleanCppuType());
+ aAny.setValue(&bRestartNumbering, cppu::UnoType<bool>::get());
xLineNumbering->setPropertyValue(sRestartAtEachPage, aAny);
sal_Int16 nNumType = NumberingType::ARABIC;
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 1ddce2b57cfe..3a705e68f079 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -133,13 +133,13 @@ void XMLSectionFootnoteConfigImport::StartElement(
// OK, now we have all values and can fill the XMLPropertyState vector
Any aAny;
- aAny.setValue( &bNumOwn, ::getBooleanCppuType() );
+ aAny.setValue( &bNumOwn, cppu::UnoType<bool>::get() );
sal_Int32 nIndex = rMapper->FindEntryIndex( bEndnote ?
CTF_SECTION_ENDNOTE_NUM_OWN : CTF_SECTION_FOOTNOTE_NUM_OWN );
XMLPropertyState aNumOwn( nIndex, aAny );
rProperties.push_back( aNumOwn );
- aAny.setValue( &bNumRestart, ::getBooleanCppuType() );
+ aAny.setValue( &bNumRestart, cppu::UnoType<bool>::get() );
nIndex = rMapper->FindEntryIndex( bEndnote ?
CTF_SECTION_ENDNOTE_NUM_RESTART : CTF_SECTION_FOOTNOTE_NUM_RESTART );
XMLPropertyState aNumRestart( nIndex, aAny );
@@ -174,7 +174,7 @@ void XMLSectionFootnoteConfigImport::StartElement(
XMLPropertyState aSuffixState( nIndex, aAny );
rProperties.push_back( aSuffixState );
- aAny.setValue( &bEnd, ::getBooleanCppuType() );
+ aAny.setValue( &bEnd, cppu::UnoType<bool>::get() );
nIndex = rMapper->FindEntryIndex( bEndnote ?
CTF_SECTION_ENDNOTE_END : CTF_SECTION_FOOTNOTE_END );
XMLPropertyState aEndState( nIndex, aAny );
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index ea8ed959435a..2574fce93dc5 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -170,7 +170,7 @@ void XMLSectionImportContext::StartElement(
if (! bIsIndexHeader)
{
Any aAny;
- aAny.setValue( &bIsVisible, ::getBooleanCppuType() );
+ aAny.setValue( &bIsVisible, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsVisible, aAny );
// #97450# hidden sections must be hidden on reload
@@ -179,7 +179,7 @@ void XMLSectionImportContext::StartElement(
if( bIsCurrentlyVisibleOK )
{
aAny.setValue( &bIsCurrentlyVisible,
- ::getBooleanCppuType() );
+ cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsCurrentlyVisible, aAny);
}
@@ -201,7 +201,7 @@ void XMLSectionImportContext::StartElement(
// protection
Any aAny;
- aAny.setValue( &bProtect, ::getBooleanCppuType() );
+ aAny.setValue( &bProtect, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsProtected, aAny );
// insert marker, <paragraph>, marker; then insert
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index fc8aa979bf3f..cd68fae5ed20 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -148,7 +148,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
aValues[2] <<= sItem;
aNames[2] = sDdeCommandElement;
- aValues[3].setValue(&bAutomaticUpdate, ::getBooleanCppuType());
+ aValues[3].setValue(&bAutomaticUpdate, cppu::UnoType<bool>::get());
aNames[3] = sIsAutomaticUpdate;
Reference<XMultiPropertySet> rMultiPropSet(rSectionPropertySet,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index a000fc663cc9..e07aee0e70b0 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -450,7 +450,7 @@ void XMLTextColumnsContext::EndElement( )
Any aAny;
sal_Bool bOn = pColumnSep != 0;
- aAny.setValue( &bOn, ::getBooleanCppuType() );
+ aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sSeparatorLineIsOn, aAny );
if( pColumnSep )
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 58ed9b39f827..52fc140639da 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -334,7 +334,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
if( xPropSetInfo->hasPropertyByName( sIsPixelContour ) )
{
- aAny.setValue( &bPixelWidth, ::getBooleanCppuType() );
+ aAny.setValue( &bPixelWidth, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsPixelContour, aAny );
}
@@ -342,7 +342,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
if( xPropSetInfo->hasPropertyByName( sIsAutomaticContour ) )
{
- aAny.setValue( &bAuto, ::getBooleanCppuType() );
+ aAny.setValue( &bAuto, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsAutomaticContour, aAny );
}
}
@@ -673,7 +673,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
if( bSyncWidth || nWidth > 0 )
{
sal_Bool bTmp = bSyncWidth;
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsSyncWidthToHeight, aAny );
}
if( xPropSetInfo->hasPropertyByName( sWidthType ) &&
@@ -699,7 +699,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
if( bSyncHeight || nHeight > 0 )
{
sal_Bool bTmp = bSyncHeight;
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsSyncHeightToWidth, aAny );
}
if( xPropSetInfo->hasPropertyByName( sSizeType ) &&
@@ -1305,7 +1305,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
if (xPropSetInfo->hasPropertyByName(s_ServerMap))
{
- aAny.setValue( &bMap, ::getBooleanCppuType() );
+ aAny.setValue( &bMap, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue(s_ServerMap, aAny);
}
}
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index f752e33b1a0c..673c8fff433a 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -75,7 +75,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
{
// Don't share headers any longer
bShared = false;
- aAny.setValue( &bShared, ::getBooleanCppuType() );
+ aAny.setValue( &bShared, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sShareContent, aAny );
}
}
@@ -89,7 +89,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
{
// Don't share first/right headers any longer
bSharedFirst = false;
- aAny.setValue( &bSharedFirst, ::getBooleanCppuType() );
+ aAny.setValue( &bSharedFirst, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sShareContentFirst, aAny );
}
}
@@ -137,7 +137,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
{
// Switch header on
bOn = sal_True;
- aAny.setValue( &bOn, ::getBooleanCppuType() );
+ aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sOn, aAny );
// The content has not to be removed, because the header
@@ -151,7 +151,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
if( !bShared )
{
bShared = sal_True;
- aAny.setValue( &bShared, ::getBooleanCppuType() );
+ aAny.setValue( &bShared, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sShareContent, aAny );
}
@@ -206,7 +206,7 @@ void XMLTextHeaderFooterContext::EndElement()
// switch it off.
sal_Bool bOn = sal_False;
Any aAny;
- aAny.setValue( &bOn, ::getBooleanCppuType() );
+ aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sOn, aAny );
}
}
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index a59f200c2d68..59351c5b8b36 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -215,7 +215,7 @@ void XMLTextShapeStyleContext::CreateAndInsert( bool bOverwrite )
{
Any aAny;
sal_Bool bTmp = bAutoUpdate;
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsAutoUpdate, aAny );
}
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 690b789fb0e6..53edb1bc0dd8 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -116,7 +116,7 @@ void XMLTextDropCapImportContext::ProcessAttrs(
aProp.maValue <<= aFormat;
- aWholeWordProp.maValue.setValue( &bWholeWord, ::getBooleanCppuType() );
+ aWholeWordProp.maValue.setValue( &bWholeWord, cppu::UnoType<bool>::get() );
}
XMLTextDropCapImportContext::XMLTextDropCapImportContext(
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index bdba18f55858..2a226997e6cc 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -714,7 +714,7 @@ void XMLSenderFieldImportContext::PrepareField(
rPropSet->setPropertyValue(sPropertyFieldSubType, aAny);
// set fixed
- aAny.setValue( &bFixed, ::getBooleanCppuType() );
+ aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
rPropSet->setPropertyValue(sPropertyFixed, aAny);
// set content if fixed
@@ -772,10 +772,10 @@ void XMLAuthorFieldImportContext::PrepareField(
{
// set members
Any aAny;
- aAny.setValue( &bAuthorFullName, ::getBooleanCppuType() );
+ aAny.setValue( &bAuthorFullName, cppu::UnoType<bool>::get() );
rPropSet->setPropertyValue(sPropertyAuthorFullName, aAny);
- aAny.setValue( &bFixed, ::getBooleanCppuType() );
+ aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
rPropSet->setPropertyValue(sPropertyFixed, aAny);
// set content if fixed
@@ -1148,11 +1148,11 @@ void XMLTimeFieldImportContext::PrepareField(
if (xPropertySetInfo->hasPropertyByName(sPropertyFixed))
{
- aAny.setValue( &bFixed, ::getBooleanCppuType() );
+ aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
rPropertySet->setPropertyValue(sPropertyFixed, aAny);
}
- aAny.setValue( &bIsDate, ::getBooleanCppuType() );
+ aAny.setValue( &bIsDate, cppu::UnoType<bool>::get() );
rPropertySet->setPropertyValue(sPropertyIsDate, aAny);
if (xPropertySetInfo->hasPropertyByName(sPropertyAdjust))
@@ -1198,7 +1198,7 @@ void XMLTimeFieldImportContext::PrepareField(
if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) )
{
sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
- aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+ aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
rPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
}
}
@@ -1392,7 +1392,7 @@ void XMLDatabaseFieldImportContext::PrepareField(
if( bUseDisplay && bDisplayOK )
{
- aAny.setValue( &bDisplay, ::getBooleanCppuType() );
+ aAny.setValue( &bDisplay, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue( sPropertyIsVisible, aAny );
}
}
@@ -1661,7 +1661,7 @@ void XMLSimpleDocInfoImportContext::PrepareField(
if (xPropertySetInfo->hasPropertyByName(sPropertyFixed))
{
Any aAny;
- aAny.setValue(&bFixed, ::getBooleanCppuType() );
+ aAny.setValue(&bFixed, cppu::UnoType<bool>::get() );
rPropertySet->setPropertyValue(sPropertyFixed, aAny);
// set Content and CurrentPresentation (if fixed)
@@ -1893,7 +1893,7 @@ void XMLDateTimeDocInfoImportContext::PrepareField(
if (bHasDateTime)
{
- aAny.setValue( &bIsDate, ::getBooleanCppuType());
+ aAny.setValue( &bIsDate, cppu::UnoType<bool>::get());
xPropertySet->setPropertyValue(sPropertyIsDate, aAny);
}
@@ -1906,7 +1906,7 @@ void XMLDateTimeDocInfoImportContext::PrepareField(
hasPropertyByName( sPropertyIsFixedLanguage ) )
{
sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
- aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+ aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
}
}
@@ -1993,7 +1993,7 @@ void XMLUserDocInfoImportContext::PrepareField(
if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) )
{
sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
- aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+ aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
}
}
@@ -2055,7 +2055,7 @@ void XMLHiddenParagraphImportContext::PrepareField(
aAny <<= sCondition;
xPropertySet->setPropertyValue(sPropertyCondition, aAny);
- aAny.setValue( &bIsHidden, ::getBooleanCppuType() );
+ aAny.setValue( &bIsHidden, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue(sPropertyIsHidden, aAny);
}
@@ -2140,7 +2140,7 @@ void XMLConditionalTextImportContext::PrepareField(
aAny <<= sTrueContent;
xPropertySet->setPropertyValue(sPropertyTrueContent, aAny);
- aAny.setValue( &bCurrentValue, ::getBooleanCppuType() );
+ aAny.setValue( &bCurrentValue, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue(sPropertyIsConditionTrue, aAny);
aAny <<= GetContent();
@@ -2218,7 +2218,7 @@ void XMLHiddenTextImportContext::PrepareField(
aAny <<= sString;
xPropertySet->setPropertyValue(sPropertyContent, aAny);
- aAny.setValue( &bIsHidden, ::getBooleanCppuType() );
+ aAny.setValue( &bIsHidden, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue(sPropertyIsHidden, aAny);
}
@@ -2670,7 +2670,7 @@ void XMLPageVarSetFieldImportContext::PrepareField(
{
Any aAny;
- aAny.setValue(&bActive, ::getBooleanCppuType());
+ aAny.setValue(&bActive, cppu::UnoType<bool>::get());
xPropertySet->setPropertyValue(sPropertyOn, aAny);
aAny <<= nAdjust;
@@ -3132,7 +3132,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
xPropSet->setPropertyValue(sPropertyDDECommandElement,
aAny);
- aAny.setValue(&bUpdate, ::getBooleanCppuType());
+ aAny.setValue(&bUpdate, cppu::UnoType<bool>::get());
xPropSet->setPropertyValue(sPropertyIsAutomaticUpdate,
aAny);
}
@@ -3876,7 +3876,7 @@ void XMLScriptImportContext::PrepareField(
xPropertySet->setPropertyValue(sPropertyContent, aAny);
// URL or script text? We use URL if we have an href-attribute
- aAny.setValue(&bContentOK, ::getBooleanCppuType());
+ aAny.setValue(&bContentOK, cppu::UnoType<bool>::get());
xPropertySet->setPropertyValue(sPropertyURLContent, aAny);
aAny <<= sScriptType;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 025bb0b5baa1..a3be7157c52d 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -374,7 +374,7 @@ void FieldParamExporter::Export()
{
const Type aStringType = ::cppu::UnoType<OUString>::get();
const Type aBoolType = cppu::UnoType<sal_Bool>::get();
- const Type aSeqType = ::getCppuType((Sequence<OUString>*)0);
+ const Type aSeqType = cppu::UnoType<Sequence<OUString>>::get();
const Type aIntType = ::cppu::UnoType<sal_Int32>::get();
Sequence<OUString> vParameters(m_xFieldParams->getElementNames());
for(const OUString* pCurrent = vParameters.begin(); pCurrent != vParameters.end(); ++pCurrent)
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 35db4681e692..34d51f374133 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -341,7 +341,7 @@ bool XMLOpaquePropHdl_Impl::importXML(
bRet = false;
if( bRet )
- rValue.setValue( &bVal, ::getBooleanCppuType() );
+ rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
return bRet;
}
@@ -391,7 +391,7 @@ bool XMLContourModePropHdl_Impl::importXML(
bRet = false;
if( bRet )
- rValue.setValue( &bVal, ::getBooleanCppuType() );
+ rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
return bRet;
}
@@ -444,7 +444,7 @@ bool XMLParagraphOnlyPropHdl_Impl::importXML(
}
if( bRet )
- rValue.setValue( &bVal, ::getBooleanCppuType() );
+ rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
return bRet;
}
@@ -570,7 +570,7 @@ bool XMLFrameProtectPropHdl_Impl::importXML(
}
if( bRet )
- rValue.setValue( &bVal, ::getBooleanCppuType() );
+ rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
return bRet;
}
@@ -747,7 +747,7 @@ bool XMLHoriMirrorPropHdl_Impl::importXML(
if( bRet )
{
sal_Bool bTmp = nHoriMirror != 0;
- rValue.setValue( &bTmp, ::getBooleanCppuType() );
+ rValue.setValue( &bTmp, cppu::UnoType<bool>::get() );
}
return bRet;
@@ -813,7 +813,7 @@ bool XMLGrfMirrorPropHdl_Impl::importXML(
}
if( bRet )
- rValue.setValue( &bVal, ::getBooleanCppuType() );
+ rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
return bRet;
}
@@ -1088,7 +1088,7 @@ bool XMLTextSyncWidthHeightPropHdl_Impl::importXML(
const SvXMLUnitConverter& ) const
{
sal_Bool bValue = (rStrImpValue == sValue );
- rValue.setValue( &bValue, ::getBooleanCppuType() );
+ rValue.setValue( &bValue, cppu::UnoType<bool>::get() );
return true;
}
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 2d25f61b4571..9779fe61700a 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -218,7 +218,7 @@ void XMLTextStyleContext::CreateAndInsert( bool bOverwrite )
{
Any aAny;
sal_Bool bTmp = bAutoUpdate;
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xPropSet->setPropertyValue( sIsAutoUpdate, aAny );
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 89f4047433a6..adc415f25c4c 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -248,7 +248,7 @@ void XMLVarFieldImportContext::PrepareField(
{
Any aAny;
sal_Bool bTmp = ! (bDisplayNone && bDisplayOK);
- aAny.setValue( &bTmp, ::getBooleanCppuType());
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get());
xPropertySet->setPropertyValue(sPropertyIsVisible, aAny);
}
@@ -266,7 +266,7 @@ void XMLVarFieldImportContext::PrepareField(
{
Any aAny;
sal_Bool bTmp = bDisplayFormula && bDisplayOK;
- aAny.setValue( &bTmp, ::getBooleanCppuType());
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get());
xPropertySet->setPropertyValue(sPropertyIsDisplayFormula, aAny);
}
@@ -513,7 +513,7 @@ void XMLVariableInputFieldImportContext::PrepareField(
// set type (input field)
Any aAny;
sal_Bool bTrue = sal_True;
- aAny.setValue( &bTrue, ::getBooleanCppuType() );
+ aAny.setValue( &bTrue, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue(sPropertyIsInput, aAny);
// set type
@@ -743,7 +743,7 @@ void XMLTableFormulaImportContext::PrepareField(
Any aAny;
// set 'show formula' and presentation
- aAny.setValue( &bIsShowFormula, ::getBooleanCppuType() );
+ aAny.setValue( &bIsShowFormula, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue( sPropertyIsShowFormula, aAny );
aAny <<= GetContent();
@@ -924,7 +924,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
case VarTypeUserField:
{
sal_Bool bTmp = !aValueHelper.IsStringValue();
- aAny.setValue(&bTmp, ::getBooleanCppuType());
+ aAny.setValue(&bTmp, cppu::UnoType<bool>::get());
xFieldMaster->setPropertyValue(sPropertyIsExpression, aAny);
aValueHelper.PrepareField(xFieldMaster);
break;
@@ -1185,7 +1185,7 @@ void XMLDatabaseDisplayImportContext::EndElement()
// prepare field: format from database?
sal_Bool bTmp = !aValueHelper.IsFormatOK();
- aAny.setValue( &bTmp, ::getBooleanCppuType() );
+ aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
xField->setPropertyValue(sPropertyDatabaseFormat,aAny);
// value, value-type and format done by value helper
@@ -1194,7 +1194,7 @@ void XMLDatabaseDisplayImportContext::EndElement()
// visibility
if( bDisplayOK )
{
- aAny.setValue( &bDisplay, ::getBooleanCppuType() );
+ aAny.setValue( &bDisplay, cppu::UnoType<bool>::get() );
xField->setPropertyValue(sPropertyIsVisible, aAny);
}
@@ -1435,7 +1435,7 @@ void XMLValueImportHelper::PrepareField(
hasPropertyByName( sPropertyIsFixedLanguage ) )
{
sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
- aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+ aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
}
}