diff options
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/accessibletableshape.cxx | 2 | ||||
| -rw-r--r-- | svx/source/table/cell.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 5b09a69a920d..e95685093b05 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -360,7 +360,7 @@ SvxTableController* AccessibleTableShape::getTableController() Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { - if ( aType == ::getCppuType((Reference<XAccessibleTableSelection> *)0) ) + if ( aType == cppu::UnoType<XAccessibleTableSelection>::get()) { Reference<XAccessibleTableSelection> xThis( this ); Any aRet; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index ad69f65cb16d..3ab9b683006f 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -74,20 +74,20 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() FILL_PROPERTIES // { "HasLevels", OWN_ATTR_HASLEVELS, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { 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_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType<com::sun::star::text::WritingMode>::get(), 0, 0}, + { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get(), 0, 0}, \ { 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_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get(), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \ - { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, ::getCppuType((const TableBorder*)0), 0, 0 }, \ - { OUString("TopBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, TOP_BORDER }, \ - { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, BOTTOM_BORDER }, \ - { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, LEFT_BORDER }, \ - { OUString("RightBorder"), SDRATTR_TABLE_BORDER, ::getCppuType((const BorderLine*)0), 0, RIGHT_BORDER }, \ + { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, \ + { OUString("TopBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, \ + { OUString("BottomBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, \ + { OUString("LeftBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, \ + { OUString("RightBorder"), SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, \ SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_CHAR_PROPERTIES, @@ -1037,7 +1037,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& } case OWN_ATTR_TABLEBORDER: { - if(rValue.getValueType() != ::getCppuType((const TableBorder*)0) ) + if(rValue.getValueType() != cppu::UnoType<TableBorder>::get()) break; const TableBorder* pBorder = (const TableBorder* )rValue.getValue(); |