summaryrefslogtreecommitdiff
path: root/svx/source/table
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 11:39:07 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 10:48:30 +0000
commit39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch)
treeac4b224a66a18429cd4722a61ee3d401f8e9951c /svx/source/table
parent5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff)
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svx/source/table')
-rw-r--r--svx/source/table/accessiblecell.cxx2
-rw-r--r--svx/source/table/cellcursor.cxx4
-rw-r--r--svx/source/table/svdotable.cxx8
-rw-r--r--svx/source/table/tablecontroller.cxx4
-rw-r--r--svx/source/table/tabledesign.cxx4
-rw-r--r--svx/source/table/tablelayouter.cxx4
-rw-r--r--svx/source/table/tablemodel.cxx4
-rw-r--r--svx/source/table/tablertfimporter.cxx2
8 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 3f79ca9bd030..a18f3a9ced5f 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -490,7 +490,7 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw
// ...and add additional names.
aServiceNames.realloc (nCount + 1);
- static const OUString sAdditionalServiceName (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.AccessibleCell"));
+ static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleCell");
aServiceNames[nCount] = sAdditionalServiceName;
return aServiceNames;
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 7d2e5a163f52..42cd6764e59d 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -297,7 +297,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector<
if( nNewCols > 0 )
{
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") );
+ const OUString sWidth("Width");
Reference< XTableColumns > xCols( mxTable->getColumns(), UNO_QUERY_THROW );
Reference< XPropertySet > xRefColumn( xCols->getByIndex( nCol ), UNO_QUERY_THROW );
sal_Int32 nWidth = 0;
@@ -413,7 +413,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In
if( nNewRows > 0 )
{
- const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM("Height") );
+ const OUString sHeight("Height");
Reference< XTableRows > xRows( mxTable->getRows(), UNO_QUERY_THROW );
Reference< XPropertySet > xRefRow( xRows->getByIndex( nRow ), UNO_QUERY_THROW );
sal_Int32 nHeight = 0;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 97396a7f3c7e..d6f68a7f5dd9 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -330,7 +330,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
Reference< XStyleFamiliesSupplier > xSFS( pNewModel->getUnoModel(), UNO_QUERY_THROW );
Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW );
- const rtl::OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
+ const rtl::OUString sFamilyName( "table" );
Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW );
if( xTableFamilyAccess->hasByName( sStyleName ) )
@@ -468,7 +468,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
{
if( (nEdge >= 0) && mxTable.is()) try
{
- const OUString sSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) );
+ const OUString sSize( "Size" );
if( mbHorizontal )
{
if( (nEdge >= 0) && (nEdge <= getRowCount()) )
@@ -2505,7 +2505,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd
// copy row heights
Reference< XTableRows > xNewRows( xNewTable->getRows(), UNO_QUERY_THROW );
- const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "Height" ) );
+ const OUString sHeight( "Height" );
for( sal_Int32 nRow = 0; nRow < nRows; ++nRow )
{
Reference< XPropertySet > xNewSet( xNewRows->getByIndex( nRow ), UNO_QUERY_THROW );
@@ -2514,7 +2514,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd
// copy column widths
Reference< XTableColumns > xNewColumns( xNewTable->getColumns(), UNO_QUERY_THROW );
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "Width" ) );
+ const OUString sWidth( "Width" );
for( sal_Int32 nCol = 0; nCol < nColumns; ++nCol )
{
Reference< XPropertySet > xNewSet( xNewColumns->getByIndex( nCol ), UNO_QUERY_THROW );
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index ff6037ca77e6..1a888ba39423 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -531,7 +531,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
RemoveSelection();
- const OUString sSize( RTL_CONSTASCII_USTRINGPARAM( "Size" ) );
+ const OUString sSize( "Size" );
const bool bUndo = mpModel && mpModel->IsUndoEnabled();
@@ -848,7 +848,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
{
Reference< XStyleFamiliesSupplier > xSFS( pModel->getUnoModel(), UNO_QUERY_THROW );
Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW );
- const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
+ const OUString sFamilyName( "table" );
Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW );
if( xTableFamilyAccess->hasByName( pArg->GetValue() ) )
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index e97b9b661ce3..4702792127a2 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -230,7 +230,7 @@ sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName
Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw(RuntimeException)
{
- OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style") );
+ OUString aServiceName("com.sun.star.style.Style");
Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
@@ -508,7 +508,7 @@ sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceNam
Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() throw(RuntimeException)
{
- OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.StyleFamily") );
+ OUString aServiceName("com.sun.star.style.StyleFamily");
Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 12e108f5cbd1..c00329c0d1d1 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -526,7 +526,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
MergeVector aMergedCells( nColCount );
Int32Vector aOptimalColumns;
- const OUString sOptimalSize( RTL_CONSTASCII_USTRINGPARAM("OptimalSize") );
+ const OUString sOptimalSize("OptimalSize");
if( sal::static_int_cast< sal_Int32 >( maColumns.size() ) != nColCount )
maColumns.resize( nColCount );
@@ -681,7 +681,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
MergeVector aMergedCells( nRowCount );
Int32Vector aOptimalRows;
- const OUString sOptimalSize( RTL_CONSTASCII_USTRINGPARAM("OptimalSize") );
+ const OUString sOptimalSize("OptimalSize");
// first calculate current height and initial minimum size per column,
// merged cells will be counted later
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index e0c9635f6676..7e0b566dc9ca 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1043,7 +1043,7 @@ void TableModel::optimize()
{
if( nCol > 0 ) try
{
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") );
+ const OUString sWidth("Width");
sal_Int32 nWidth1 = 0, nWidth2 = 0;
Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maColumns[nCol].get() ), UNO_QUERY_THROW );
Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maColumns[nCol-1].get() ), UNO_QUERY_THROW );
@@ -1081,7 +1081,7 @@ void TableModel::optimize()
{
if( nRow > 0 ) try
{
- const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM("Height") );
+ const OUString sHeight("Height");
sal_Int32 nHeight1 = 0, nHeight2 = 0;
Reference< XPropertySet > xSet1( static_cast< XCellRange* >( maRows[nRow].get() ), UNO_QUERY_THROW );
Reference< XPropertySet > xSet2( static_cast< XCellRange* >( maRows[nRow-1].get() ), UNO_QUERY_THROW );
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 0d0392eeeb6f..ad82f00837cd 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -241,7 +241,7 @@ void SdrTableRTFParser::FillTable()
nColCount = mxTable->getColumnCount();
}
- const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM("Width") );
+ const OUString sWidth("Width");
sal_Int32 nCol, nLastEdge = 0;
for( nCol = 0; nCol < nColCount; nCol++ )
{