diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-08 18:12:01 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-08 18:12:58 +0200 |
| commit | 76e8779787afef2e1e2b04adc8eaffe0b4d1f897 (patch) | |
| tree | 1265fbfab5a4692e7c73d8cc8d3bd9e4e398a39a /svx/source/table | |
| parent | 9e8629c73327474598c4c1f2250937544a1562e7 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part6
Change-Id: Ib523206d67ad13416557be1b37a58ba7a9791ca5
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/cell.cxx | 10 | ||||
| -rw-r--r-- | svx/source/table/tablecolumn.cxx | 4 | ||||
| -rw-r--r-- | svx/source/table/tablerow.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 51d0d656248c..8e904c20f64c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -76,10 +76,10 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ), 0, 0}, { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0), 0, 0}, \ - { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \ { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \ @@ -988,7 +988,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa if( pMap->aType != aAny.getValueType() ) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here - if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() ) { sal_Int32 nValue = 0; aAny >>= nValue; diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index e2ba8467e99c..2909f3e5d936 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -255,7 +255,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() aProperties[0].Name = "Width"; aProperties[0].Handle = Property_Width; - aProperties[0].Type = ::getCppuType((const sal_Int32*)0); + aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[0].Attributes = 0; aProperties[1].Name = "OptimalWidth"; @@ -275,7 +275,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Width; - aProperties[4].Type = ::getCppuType((const sal_Int32*)0); + aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[4].Attributes = 0; aProperties[5].Name = "OptimalSize"; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 7434db61fb0a..c213e495ab40 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -329,7 +329,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() aProperties[0].Name = "Height"; aProperties[0].Handle = Property_Height; - aProperties[0].Type = ::getCppuType((const sal_Int32*)0); + aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[0].Attributes = 0; aProperties[1].Name = "OptimalHeight"; @@ -349,7 +349,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Height; - aProperties[4].Type = ::getCppuType((const sal_Int32*)0); + aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get(); aProperties[4].Attributes = 0; aProperties[5].Name = "OptimalSize"; |