summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-01 08:35:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-01 08:35:23 +0200
commita5a5fae1fab59d92e7fe1bcd0486311c3b8b88df (patch)
tree43047d75cb92aa9edd8770104fb0e382fb7ee498
parente360c2a861cc98efab442c58e5c79dab3ac99b8e (diff)
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I24164f5fe3654445190ca26856188a33070e7544
-rw-r--r--basctl/source/basicide/basidectrlr.cxx2
-rw-r--r--basctl/source/dlged/dlged.cxx4
-rw-r--r--basctl/source/dlged/dlgedfac.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index f7bd70e8ebf4..3dea60f64b22 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -48,7 +48,7 @@ Controller::Controller (Shell* pViewShell)
registerProperty(
sPropertyIconId, nPropertyIconId,
PropertyAttribute::READONLY,
- &m_nIconId, getCppuType(&m_nIconId)
+ &m_nIconId, cppu::UnoType<decltype(m_nIconId)>::get()
);
}
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 105b9b54c649..5ce766ffc823 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -213,12 +213,12 @@ DlgEditor::DlgEditor (
// set clipboard data flavors
m_ClipboardDataFlavors[0].MimeType = "application/vnd.sun.xml.dialog" ;
m_ClipboardDataFlavors[0].HumanPresentableName = "Dialog 6.0" ;
- m_ClipboardDataFlavors[0].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+ m_ClipboardDataFlavors[0].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0];
m_ClipboardDataFlavorsResource[1].MimeType = "application/vnd.sun.xml.dialogwithresource" ;
m_ClipboardDataFlavorsResource[1].HumanPresentableName = "Dialog 8.0" ;
- m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+ m_ClipboardDataFlavorsResource[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
aMarkIdle.SetPriority(SchedulerPriority::LOW);
aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) );
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index e5584374d018..cecadc9e2e14 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -117,7 +117,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
if (xPSet.is())
{
sal_Bool bB = true;
- xPSet->setPropertyValue( DLGED_PROP_DROPDOWN, uno::Any(&bB,::getBooleanCppuType()));
+ xPSet->setPropertyValue( DLGED_PROP_DROPDOWN, uno::Any(&bB,cppu::UnoType<bool>::get()));
}
}
catch(...)