diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:41:23 +0200 |
commit | e81a7fd0ee95c2afbc373b26ec34d6084ee07cff (patch) | |
tree | f46c60e5c1ab3f5e71e8e7ffa678b55571d5e40e /svtools | |
parent | a55166cc25351f43d502f6b23d75df824c05f01a (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I1693826962a0551396fd5691dc4a98f0646bade3
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/apearcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/colorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/fontsubstconfig.cxx | 4 | ||||
-rw-r--r-- | svtools/source/config/htmlcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/addrtempuno.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/unoevent.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/unoimap.cxx | 8 |
11 files changed, 18 insertions, 18 deletions
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 5872dc15679d..ebd55fe4db14 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -117,7 +117,7 @@ void SvtTabAppearanceCfg::ImplCommit() Sequence<Any> aValues(rNames.getLength()); Any* pValues = aValues.getArray(); - const Type& rType = ::getBooleanCppuType(); + const Type& rType = cppu::UnoType<bool>::get(); for(int nProp = 0; nProp < rNames.getLength(); nProp++) { switch(nProp) diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 08524865c7ae..c1323cf9fe8b 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -270,7 +270,7 @@ void ColorConfig_Impl::ImplCommit() beans::PropertyValue* pPropValues = aPropValues.getArray(); const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; - const uno::Type& rBoolType = ::getBooleanCppuType(); + const uno::Type& rBoolType = cppu::UnoType<bool>::get(); for(int i = 0; i < 2 * ColorConfigEntryCount && aColorNames.getLength() > nIndex; i+= 2) { pPropValues[nIndex].Name = pColorNames[nIndex]; diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 1bc0ea56815f..6d7e3373376d 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -103,7 +103,7 @@ void SvtFontSubstConfig::ImplCommit() Sequence<OUString> aNames(1); aNames.getArray()[0] = cReplacement; Sequence<Any> aValues(1); - aValues.getArray()[0].setValue(&bIsEnabled, ::getBooleanCppuType()); + aValues.getArray()[0].setValue(&bIsEnabled, cppu::UnoType<bool>::get()); PutProperties(aNames, aValues); OUString sNode(cFontPairs); @@ -120,7 +120,7 @@ void SvtFontSubstConfig::ImplCommit() const OUString sAlways(cAlways); const OUString sOnScreenOnly(cOnScreenOnly); - const uno::Type& rBoolType = ::getBooleanCppuType(); + const uno::Type& rBoolType = cppu::UnoType<bool>::get(); for(size_t i = 0; i < pImpl->aSubstArr.size(); i++) { OUString sPrefix = sNode + "/_" + OUString::number(i) + "/"; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index f810b1d40f1b..1ba6ba2c775f 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -237,7 +237,7 @@ void SvxHtmlOptions::ImplCommit() case 15: bSet = 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US);break;//"Import/NumbersEnglishUS" } if(nProp < 2 || ( nProp > 9 && nProp < 14 ) || nProp == 15) - pValues[nProp].setValue(&bSet, ::getCppuBooleanType()); + pValues[nProp].setValue(&bSet, cppu::UnoType<bool>::get()); } PutProperties(aNames, aValues); } diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index f1a0760bb292..1a9a8645ba50 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -83,7 +83,7 @@ namespace { :OGenericUnoDialog(_rxORB) { registerProperty(OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, - &m_aAliases, getCppuType(&m_aAliases)); + &m_aAliases, cppu::UnoType<decltype(m_aAliases)>::get()); } diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index b78dc191e79f..b0186d2c8dc0 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -57,9 +57,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo ,m_aContext(_rxContext) { registerProperty(OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, - &m_sTitle, getCppuType(&m_sTitle)); + &m_sTitle, cppu::UnoType<decltype(m_sTitle)>::get()); registerProperty(OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, - &m_xParent, getCppuType(&m_xParent)); + &m_xParent, cppu::UnoType<decltype(m_xParent)>::get()); } diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index f3596782ae17..0e89ae17b6c5 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -259,7 +259,7 @@ throw( ::com::sun::star::uno::RuntimeException, std::exception ) aLock.clear(); bool bStatusUpdate( false ); - rBHelper.addListener( ::getCppuType( &xControl ), xControl ); + rBHelper.addListener( cppu::UnoType<decltype(xControl)>::get(), xControl ); aLock.reset(); if ( aURL.Complete.startsWith( m_aBaseURL ) ) @@ -283,7 +283,7 @@ void SAL_CALL PopupMenuControllerBase::removeStatusListener( const URL& /*aURL*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { - rBHelper.removeListener( ::getCppuType( &xControl ), xControl ); + rBHelper.removeListener( cppu::UnoType<decltype(xControl)>::get(), xControl ); } OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL ) diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 16abb72f8879..5b21c44bb48d 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -67,7 +67,7 @@ ToolboxController::ToolboxController( registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, - &m_bSupportVisible, getCppuType(&m_bSupportVisible)); + &m_bSupportVisible, cppu::UnoType<decltype(m_bSupportVisible)>::get()); try { @@ -89,7 +89,7 @@ ToolboxController::ToolboxController() : registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, - &m_bSupportVisible, getCppuType(&m_bSupportVisible)); + &m_bSupportVisible, cppu::UnoType<decltype(m_bSupportVisible)>::get()); } ToolboxController::~ToolboxController() diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index f059f005b7e7..cc32eb4851dd 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -481,7 +481,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, } case TypeClass_SEQUENCE: { - if( rSelection.getValueType() == ::getCppuType( (const Sequence< Reference< XTreeNode > > *) 0 ) ) + if( rSelection.getValueType() == cppu::UnoType<Sequence< Reference< XTreeNode > >>::get() ) { const Sequence< Reference< XTreeNode > >& rSeq( *static_cast<const Sequence< Reference< XTreeNode > > *>(rSelection.getValue()) ); nCount = rSeq.getLength(); diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 40cda94f3538..4a604dad69f2 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -136,7 +136,7 @@ sal_Bool SvBaseEventDescriptor::hasByName( Type SvBaseEventDescriptor::getElementType() throw(RuntimeException, std::exception) { - return ::getCppuType((Sequence<PropertyValue> *)0); + return cppu::UnoType<Sequence<PropertyValue>>::get(); } sal_Bool SvBaseEventDescriptor::hasElements() diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 74f4ce948d36..a368c9c0046e 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -136,8 +136,8 @@ PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, - { OUString("Polygon"), HANDLE_POLYGON, ::getCppuType((const PointSequence*)0), 0, 0 }, + { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, + { OUString("Polygon"), HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -152,7 +152,7 @@ PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, + { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Center"), HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 }, { OUString("Radius"), HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -170,7 +170,7 @@ PropertySetInfo * SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("IsActive"), HANDLE_ISACTIVE, ::getBooleanCppuType(), 0, 0 }, + { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Boundary"), HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; |