diff options
Diffstat (limited to 'svx/source/table')
-rw-r--r-- | svx/source/table/accessiblecell.cxx | 4 | ||||
-rw-r--r-- | svx/source/table/accessibletableshape.cxx | 4 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 6 | ||||
-rw-r--r-- | svx/source/table/tablecolumn.cxx | 12 | ||||
-rw-r--r-- | svx/source/table/tabledesign.cxx | 28 | ||||
-rw-r--r-- | svx/source/table/tablerow.cxx | 12 |
6 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 43249d90492c..3f79ca9bd030 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -296,7 +296,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell has no valid view forwarder")),static_cast<uno::XWeak*>(this)); + throw uno::RuntimeException (::rtl::OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() )); @@ -475,7 +475,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell")); + return OUString("AccessibleCell"); } // -------------------------------------------------------------------- diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 0cb973192fb6..66ff42170751 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -315,14 +315,14 @@ Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleCont //----------------------------------------------------------------------------- OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleTableShape" ) ); + return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } //----------------------------------------------------------------------------- OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) { - return OUString (RTL_CONSTASCII_USTRINGPARAM("TableShape")); + return OUString("TableShape"); } //-------------------------------------------------------------------- diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 93cf2f45eea7..e46b4865fb50 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -812,7 +812,7 @@ Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeExcept OUString SAL_CALL Cell::getImplementationName( ) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.table.Cell" ) ); + return OUString( "com.sun.star.comp.svx.table.Cell" ); } // ----------------------------------------------------------------------------- @@ -835,8 +835,8 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE Sequence< OUString > aSeq( SvxUnoTextBase::getSupportedServiceNames() ); sal_Int32 nIndex = aSeq.getLength(); aSeq.realloc( nIndex + 2 ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.cell" ) ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.cell" ) ); + aSeq[nIndex++] = OUString( "com.sun.star.table.cell" ); + aSeq[nIndex++] = OUString( "com.sun.star.drawing.cell" ); return aSeq; } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index b454b08502cc..6a68466f2dbc 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -255,32 +255,32 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ); + aProperties[0].Name = OUString( "Width" ); aProperties[0].Handle = Property_Width; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalWidth" ) ); + aProperties[1].Name = OUString( "OptimalWidth" ); aProperties[1].Handle = Property_OptimalWidth; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Width; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalWidth; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index f719d363b25e..e97b9b661ce3 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -194,16 +194,16 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() if( aMap.empty() ) { CellStyleNameMap aNewMap; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-row" ) ) ] = first_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-row" ) ) ] = last_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-column" ) ) ] = first_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-column" ) ) ] = last_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "body" ) ) ] = body_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-rows" ) ) ] = even_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-rows" ) ) ] = odd_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-columns" ) ) ] = even_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-columns" ) ) ] = odd_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "background" ) ) ] = background_style; + aNewMap[ OUString( "first-row" ) ] = first_row_style; + aNewMap[ OUString( "last-row" ) ] = last_row_style; + aNewMap[ OUString( "first-column" ) ] = first_column_style; + aNewMap[ OUString( "last-column" ) ] = last_column_style; + aNewMap[ OUString( "body" ) ] = body_style; + aNewMap[ OUString( "even-rows" ) ] = even_rows_style; + aNewMap[ OUString( "odd-rows" ) ] = odd_rows_style; + aNewMap[ OUString( "even-columns" ) ] = even_columns_style; + aNewMap[ OUString( "odd-columns" ) ] = odd_columns_style; + aNewMap[ OUString( "background" ) ] = background_style; aMap.swap( aNewMap ); } @@ -216,7 +216,7 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignStyle") ); + return OUString("TableDesignStyle"); } // ---------------------------------------------------------- @@ -494,7 +494,7 @@ void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventOb OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignFamily") ); + return OUString("TableDesignFamily"); } // ---------------------------------------------------------- @@ -519,7 +519,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() thro OUString SAL_CALL TableDesignFamily::getName() throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); + return OUString( "table" ); } // ---------------------------------------------------------- @@ -753,7 +753,7 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } else { - throw UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + PropertyName, static_cast<OWeakObject *>(this) ); + throw UnknownPropertyException( OUString("unknown property: ") + PropertyName, static_cast<OWeakObject *>(this) ); } } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 07a84c00193a..03208ab10889 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -329,32 +329,32 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ); + aProperties[0].Name = OUString( "Height" ); aProperties[0].Handle = Property_Height; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalHeight" ) ); + aProperties[1].Name = OUString( "OptimalHeight" ); aProperties[1].Handle = Property_OptimalHeight; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Height; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalHeight; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; |