summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-05-11 10:09:04 +0200
committerJulien Nabet <serval2412@yahoo.fr>2014-05-11 10:16:42 +0200
commitbd596286207adf06936939a3ef8018efc1055591 (patch)
treedc8e079155868ffbc5d023f04620c83f402dc6c2 /sd
parentbe44f0e91b6061f6bbe6b4da2f264eed70fb6542 (diff)
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part10
Change-Id: I67acda35fa127547dcea0cd18c9dc16db7c00294
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx6
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 26c3aebc0c61..4b6d092c3f68 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -444,7 +444,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
{ OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("Preview"), 0, ::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
::getCppuType( (Reference<XInterface> *)0 ),
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 99a5220c8923..7318bf2bf65e 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1349,7 +1349,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) );
- if( aValue.getValueType() == ::getCppuType((const sal_Bool*)0) )
+ if( aValue.getValueType() == ::cppu::UnoType<sal_Bool>::get()0) )
{
nPos = 1;
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5a6967c5a439..7e3a2c894767 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1354,7 +1354,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
{
const Any aSoundSource( pResultSet->getPropertyValue( nHandleSoundURL ) );
- if( aSoundSource.getValueType() == ::getCppuType((const sal_Bool*)0) )
+ if( aSoundSource.getValueType() == ::cppu::UnoType<sal_Bool>::get()0) )
{
pEffect->setStopAudio();
bChanged = true;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 68a916125306..a6688696cdda 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -182,7 +182,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet()
// Attention: the first parameter HAS TO BE sorted!!!
const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] =
{
- { OUString("BuildId"), WID_MODEL_BUILDID, ::getCppuType(static_cast< const OUString * >(0)), 0, 0},
+ { OUString("BuildId"), WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(), 0, 0},
{ OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::cppu::UnoType<awt::Rectangle>::get(), 0, 0},
@@ -192,8 +192,8 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet()
{ OUString(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, ::getBooleanCppuType(), 0, 0},
{ OUString("BasicLibraries"), WID_MODEL_BASICLIBS, ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0},
{ OUString("DialogLibraries"), WID_MODEL_DIALOGLIBS, ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0},
- { OUString(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, ::getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0},
- { OUString(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, ::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0},
+ { OUString(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
+ { OUString(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, ::cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString("Fonts"), WID_MODEL_FONTS, ::getCppuType((uno::Sequence<uno::Any>*)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(sUNO_Prop_InteropGrabBag), WID_MODEL_INTEROPGRABBAG, ::getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ac36ad2d3778..1fa1e58ecabb 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -140,7 +140,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("TransitionType"), WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
- { OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0), 0, 0},
+ { OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get()0), 0, 0},
{ OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0},
{ OUString("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0},