Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3142
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3142/1
fdo#38838 : Replacement of String with OUString in core/chart2
Change-Id: I7abf9649a0c5997cebfe3463ce9b633ab59bf3b0
---
M chart2/source/controller/dialogs/DataBrowser.cxx
M chart2/source/controller/dialogs/DataBrowser.hxx
M chart2/source/controller/dialogs/res_ErrorBar.cxx
M chart2/source/controller/dialogs/tp_DataSource.cxx
M chart2/source/controller/main/ChartController_Insert.cxx
M chart2/source/controller/main/ChartController_Tools.cxx
6 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index a291c55..ca424c8 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -160,7 +160,7 @@
void SetWidth( sal_Int32 nWidth );
void SetChartType( const Reference< chart2::XChartType > & xChartType,
bool bSwapXAndYAxis );
- void SetSeriesName( const String & rName );
+ void SetSeriesName( const OUString & rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
void SetPixelPosX( sal_Int32 nPos );
@@ -309,7 +309,7 @@
m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) );
}
-void SeriesHeader::SetSeriesName( const String & rName )
+void SeriesHeader::SetSeriesName( const OUString & rName )
{
m_spSeriesName->SetText( rName );
}
@@ -616,7 +616,7 @@
spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
- String( DataSeriesHelper::getDataSeriesLabel(
+ OUString( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
(aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
@@ -635,22 +635,22 @@
Invalidate();
}
-String DataBrowser::GetColString( sal_Int32 nColumnId ) const
+OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
{
OSL_ASSERT( m_apDataBrowserModel.get());
if( nColumnId > 0 )
- return String( m_apDataBrowserModel->getRoleOfColumn( static_cast< sal_Int32 >( nColumnId
) - 1 ));
- return String();
+ return OUString( m_apDataBrowserModel->getRoleOfColumn( static_cast< sal_Int32 >(
nColumnId ) - 1 ));
+ return OUString();
}
-String DataBrowser::GetRowString( sal_Int32 nRow ) const
+OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
{
return OUString::valueOf(nRow + 1);
}
String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
{
- String aResult;
+ OUString aResult;
if( nColumnId == 0 )
{
@@ -669,7 +669,7 @@
if( ! ::rtl::math::isNan( fData ) &&
m_spNumberFormatterWrapper.get() )
- aResult = String( m_spNumberFormatterWrapper->getFormattedString(
+ aResult = OUString( m_spNumberFormatterWrapper->getFormattedString(
GetNumberFormatKey( nRow, nColumnId ),
fData, nLabelColor, bColorChanged ));
}
@@ -686,14 +686,14 @@
bool bColorChanged = false;
sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference<
util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) );
if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
- aResult = String( m_spNumberFormatterWrapper->getFormattedString(
+ aResult = OUString( m_spNumberFormatterWrapper->getFormattedString(
nDateNumberFormat, fDouble, nLabelColor, bColorChanged ));
}
}
else
{
OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex, nRow ) ==
DataBrowserModel::TEXT );
- aResult = m_apDataBrowserModel->getCellText( nColIndex, nRow );
+ aResult = (OUString)m_apDataBrowserModel->getCellText( nColIndex, nRow );
}
}
@@ -800,9 +800,9 @@
{
sal_uInt32 nDummy = 0;
double fDummy = 0.0;
- String aText( m_aNumberEditField.GetText());
+ OUString aText( m_aNumberEditField.GetText());
- if( aText.Len() > 0 &&
+ if( aText.getLength() > 0 &&
m_spNumberFormatterWrapper.get() &&
m_spNumberFormatterWrapper->getSvNumberFormatter() &&
! m_spNumberFormatterWrapper->getSvNumberFormatter()->IsNumberFormat(
@@ -1082,9 +1082,9 @@
{
if( rController == m_rTextEditController )
{
- String aText( GetCellText( nRow, nCol ) );
+ OUString aText( GetCellText( nRow, nCol ) );
m_aTextEditField.SetText( aText );
- m_aTextEditField.SetSelection( Selection( 0, aText.Len() ));
+ m_aTextEditField.SetSelection( Selection( 0, aText.getLength() ));
}
else if( rController == m_rNumberEditController )
{
@@ -1094,8 +1094,8 @@
m_aNumberEditField.SetTextValue( String());
else
m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) );
- String aText( m_aNumberEditField.GetText());
- m_aNumberEditField.SetSelection( Selection( 0, aText.Len()));
+ OUString aText( m_aNumberEditField.GetText());
+ m_aNumberEditField.SetSelection( Selection( 0, aText.getLength()));
}
else
{
@@ -1153,10 +1153,10 @@
{
sal_uInt32 nDummy = 0;
double fDummy = 0.0;
- String aText( m_aNumberEditField.GetText());
+ OUString aText( m_aNumberEditField.GetText());
// an empty string is valid, if no numberformatter exists, all
// values are treated as valid
- if( aText.Len() > 0 && pSvNumberFormatter &&
+ if( aText.getLength() > 0 && pSvNumberFormatter &&
! pSvNumberFormatter->IsNumberFormat( aText, nDummy, fDummy ) )
{
bChangeValid = sal_False;
@@ -1262,7 +1262,7 @@
spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
- String( DataSeriesHelper::getDataSeriesLabel(
+ OUString( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
(aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx
b/chart2/source/controller/dialogs/DataBrowser.hxx
index f155ab3..3d5a5b8 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -181,8 +181,8 @@
void RenewTable();
void ImplAdjustHeaderControls();
- String GetColString( sal_Int32 nColumnId ) const;
- String GetRowString( sal_Int32 nRow ) const;
+ OUString GetColString( sal_Int32 nColumnId ) const;
+ OUString GetRowString( sal_Int32 nRow ) const;
DECL_LINK( SeriesHeaderGotFocus, impl::SeriesHeaderEdit* );
DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit* );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 31f945a..8c1b2f4 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -268,7 +268,7 @@
( m_aRbFunction.IsChecked()) &&
( m_aLbFunction.GetSelectEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN ));
bool bIsPercentage( m_aRbPercent.IsChecked() || bIsErrorMargin );
- String aCustomUnit;
+ OUString aCustomUnit;
if( bIsPercentage )
{
@@ -458,12 +458,12 @@
if( pButton == &m_aIbRangePositive )
{
m_pCurrentRangeChoosingField = &m_aEdRangePositive;
- aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ));
+ aUIString = OUString( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ));
}
else
{
m_pCurrentRangeChoosingField = &m_aEdRangeNegative;
- aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ));
+ aUIString = OUString( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ));
}
assert( m_pParentDialog );
@@ -602,7 +602,7 @@
m_bRangePosUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
- String sRangePositive = (static_cast< const SfxStringItem * >( pPoolItem ))->GetValue();
+ OUString sRangePositive = (static_cast< const SfxStringItem * >( pPoolItem ))->GetValue();
m_aEdRangePositive.SetText( sRangePositive );
}
@@ -610,11 +610,11 @@
m_bRangeNegUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
- String sRangeNegative = (static_cast< const SfxStringItem * >( pPoolItem ))->GetValue();
+ OUString sRangeNegative = (static_cast< const SfxStringItem * >( pPoolItem ))->GetValue();
m_aEdRangeNegative.SetText( sRangeNegative );
if( m_eErrorKind == CHERROR_RANGE &&
- sRangeNegative.Len() > 0 &&
- sRangeNegative.Equals( m_aEdRangePositive.GetText()))
+ sRangeNegative.getLength() > 0 &&
+ sRangeNegative == m_aEdRangePositive.GetText() )
m_aCbSyncPosNeg.Check();
}
@@ -632,13 +632,13 @@
{
if( m_eErrorKind == CHERROR_RANGE )
{
- String aPosRange;
- String aNegRange;
+ OUString aPosRange;
+ OUString aNegRange;
if( m_bHasInternalDataProvider )
{
// the strings aPosRange/aNegRange have to be set to a non-empty
// arbitrary string to generate error-bar sequences
- aPosRange.Assign( sal_Unicode('x'));
+ aPosRange = OUString("x");
aNegRange = aPosRange;
}
else
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 35fe350..11f1d7a 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -60,15 +60,15 @@
const OUString lcl_aLabelRole( "label" );
-String lcl_GetRoleLBEntry(
+OUString lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
{
- String aEntry( rRole );
- aEntry += '\t';
- aEntry += String(
+ OUString aEntry( rRole );
+ aEntry += "\t";
+ aEntry += OUString(
::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
- aEntry += '\t';
- aEntry += String( rRange );
+ aEntry += "\t";
+ aEntry += OUString( rRange );
return aEntry;
}
@@ -91,10 +91,10 @@
pEntry->m_xDataSeries.is() &&
pEntry->m_xChartType.is())
{
- String aLabel( ::chart::DataSeriesHelper::getDataSeriesLabel(
+ OUString aLabel( ::chart::DataSeriesHelper::getDataSeriesLabel(
pEntry->m_xDataSeries,
pEntry->m_xChartType->getRoleOfSequenceForSeriesLabel()));
- if( aLabel.Len())
+ if( aLabel.getLength())
{
rOutListBox.SetEntryText( pEntry, aLabel );
bResult = true;
@@ -469,23 +469,23 @@
for( ::std::vector< DialogModel::tSeriesWithChartTypeByName >::const_iterator aIt =
aSeries.begin();
aIt != aSeries.end(); ++aIt )
{
- String aLabel( (*aIt).first );
- if( !aLabel.Len())
+ OUString aLabel( (*aIt).first );
+ if( aLabel.isEmpty())
{
if( nUnnamedSeriesIndex > 1 )
{
- OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX
)));
+ OUString aResString( OUString( ::chart::SchResId(
STR_DATA_UNNAMED_SERIES_WITH_INDEX )));
// replace index of unnamed series
const OUString aReplacementStr( "%NUMBER" );
sal_Int32 nIndex = aResString.indexOf( aReplacementStr );
if( nIndex != -1 )
- aLabel = String( aResString.replaceAt(
+ aLabel = OUString( aResString.replaceAt(
nIndex, aReplacementStr.getLength(),
OUString::valueOf(nUnnamedSeriesIndex)));
}
- if( aLabel.Len() == 0 )
- aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ));
+ if( aLabel.isEmpty() )
+ aLabel = OUString( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ));
++nUnnamedSeriesIndex;
}
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index 8c7c733..329d2ff 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -111,7 +111,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXES ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_AXES ))),
m_xUndoManager );
try
@@ -149,7 +149,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRIDS ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_GRIDS ))),
m_xUndoManager );
try
@@ -186,7 +186,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLES ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_TITLES ))),
m_xUndoManager );
try
@@ -217,7 +217,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_LEGEND ))),
m_xUndoManager );
LegendHelper::hideLegend( getModel() );
@@ -228,7 +228,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_LEGEND ))),
m_xUndoManager );
Reference< chart2::XLegend > xLegend = LegendHelper::showLegend( getModel(), m_xCC );
@@ -239,7 +239,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_LEGEND ))),
m_xUndoManager );
try
@@ -270,7 +270,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_DATALABELS ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_DATALABELS ))),
m_xUndoManager );
//if a series is selected insert labels for that series only:
@@ -332,7 +332,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_AVERAGE_LINE ))),
m_xUndoManager );
lcl_InsertMeanValueLine( m_xCC ).operator()(
ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ));
@@ -343,7 +343,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_AVERAGE_LINE ))),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries(
@@ -416,7 +416,7 @@
{
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_CURVE ))),
m_xUndoManager );
// add a linear curve
@@ -475,7 +475,7 @@
UndoLiveUpdateGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT,
- String( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X ))),
+ OUString( SchResId( bYError ? STR_OBJECT_ERROR_BARS_Y : STR_OBJECT_ERROR_BARS_X
))),
m_xUndoManager );
// add error bars with standard deviation
@@ -582,7 +582,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION
))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId(
STR_OBJECT_CURVE_EQUATION ))),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true ));
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 ));
@@ -599,7 +599,7 @@
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_CURVE_EQUATION
))),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true ));
aUndoGuard.commit();
@@ -614,7 +614,7 @@
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_CURVE_EQUATION
))),
m_xUndoManager );
xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
aUndoGuard.commit();
@@ -629,7 +629,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_AVERAGE_LINE ))),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -644,7 +644,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_CURVE ))),
m_xUndoManager );
RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
aUndoGuard.commit();
@@ -659,7 +659,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_CURVE_EQUATION
))),
m_xUndoManager );
RegressionCurveHelper::removeEquations( xRegCurveCnt );
aUndoGuard.commit();
@@ -674,7 +674,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_CURVE ))),
m_xUndoManager );
StatisticsHelper::removeErrorBars( xDataSeries, bYError );
aUndoGuard.commit();
@@ -688,7 +688,7 @@
if( xSeries.is() )
{
UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT,
- String( SchResId( STR_OBJECT_DATALABELS ))),
+ OUString( SchResId( STR_OBJECT_DATALABELS ))),
m_xUndoManager );
DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -698,7 +698,7 @@
void ChartController::executeDispatch_InsertDataLabel()
{
UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT,
- String( SchResId( STR_OBJECT_LABEL ))),
+ OUString( SchResId( STR_OBJECT_LABEL ))),
m_xUndoManager );
DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet(
m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -711,7 +711,7 @@
if( xSeries.is() )
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE,
- String( SchResId( STR_OBJECT_DATALABELS ))),
+ OUString( SchResId( STR_OBJECT_DATALABELS ))),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries );
aUndoGuard.commit();
@@ -721,7 +721,7 @@
void ChartController::executeDispatch_DeleteDataLabel()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE,
- String( SchResId( STR_OBJECT_LABEL ))),
+ OUString( SchResId( STR_OBJECT_LABEL ))),
m_xUndoManager );
DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet(
m_aSelection.getSelectedCID(), getModel() ) );
aUndoGuard.commit();
@@ -730,7 +730,7 @@
void ChartController::executeDispatch_ResetAllDataPoints()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::FORMAT,
- String( SchResId( STR_OBJECT_DATAPOINTS ))),
+ OUString( SchResId( STR_OBJECT_DATAPOINTS ))),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID(
m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -740,7 +740,7 @@
void ChartController::executeDispatch_ResetDataPoint()
{
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::FORMAT,
- String( SchResId( STR_OBJECT_DATAPOINT ))),
+ OUString( SchResId( STR_OBJECT_DATAPOINT ))),
m_xUndoManager );
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID(
m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
if( xSeries.is() )
@@ -759,7 +759,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLE ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_TITLE ))),
m_xUndoManager );
Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID(
m_aSelection.getSelectedCID(), getModel() );
@@ -791,7 +791,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXIS ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_AXIS ))),
m_xUndoManager );
try
@@ -813,7 +813,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AXIS ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_AXIS ))),
m_xUndoManager );
try
@@ -835,7 +835,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_GRID ))),
m_xUndoManager );
try
@@ -857,7 +857,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_GRID ))),
m_xUndoManager );
try
@@ -879,7 +879,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::INSERT, OUString( SchResId( STR_OBJECT_GRID ))),
m_xUndoManager );
try
@@ -903,7 +903,7 @@
{
UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_GRID ))),
m_xUndoManager );
try
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 17581e3..bc16fc4 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -105,7 +105,7 @@
{
::chart::UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( ::chart::SchResId(
STR_OBJECT_DATASERIES ))),
+ ActionDescriptionProvider::DELETE, OUString( ::chart::SchResId(
STR_OBJECT_DATASERIES ))),
xUndoManager );
Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel
) );
@@ -135,7 +135,7 @@
{
::chart::UndoGuard aUndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( ::chart::SchResId( STR_OBJECT_CURVE ))),
+ ActionDescriptionProvider::DELETE, OUString( ::chart::SchResId( STR_OBJECT_CURVE
))),
xUndoManager );
::chart::RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
bResult = true;
@@ -184,7 +184,7 @@
{
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_REARRANGE_CHART )),
+ OUString( SchResId( STR_ACTION_REARRANGE_CHART )),
m_xUndoManager );
ControllerLockGuard aCtlLockGuard( xModel );
@@ -238,7 +238,7 @@
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_SCALE_TEXT )),
+ OUString( SchResId( STR_ACTION_SCALE_TEXT )),
m_xUndoManager );
ControllerLockGuard aCtlLockGuard( getModel() );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -620,7 +620,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_TITLE ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( STR_OBJECT_TITLE
))),
m_xUndoManager );
TitleHelper::removeTitle(
ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() );
@@ -639,7 +639,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId(
STR_OBJECT_LEGEND ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId(
STR_OBJECT_LEGEND ))),
m_xUndoManager );
xLegendProp->setPropertyValue( "Show", uno::makeAny( false ));
bReturn = true;
@@ -679,7 +679,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId(
STR_OBJECT_AVERAGE_LINE ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId(
STR_OBJECT_AVERAGE_LINE ))),
m_xUndoManager );
RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
bReturn = true;
@@ -702,7 +702,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId(
STR_OBJECT_CURVE_EQUATION ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId(
STR_OBJECT_CURVE_EQUATION ))),
m_xUndoManager );
{
ControllerLockGuard aCtlLockGuard( xModel );
@@ -736,7 +736,7 @@
// using assignment for broken gcc 3.3
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, String( SchResId( nId ))),
+ ActionDescriptionProvider::DELETE, OUString( SchResId( nId ))),
m_xUndoManager );
{
ControllerLockGuard aCtlLockGuard( xModel );
@@ -759,7 +759,7 @@
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, ::rtl::OUString( String(
+ ActionDescriptionProvider::DELETE, ::rtl::OUString( OUString(
SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL :
STR_OBJECT_DATALABELS )))),
m_xUndoManager );
chart2::DataPointLabel aLabel;
@@ -825,7 +825,7 @@
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager );
+ OUString( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager );
Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend( xModel ),
uno::UNO_QUERY );
bool bChanged = false;
if( xLegendProp.is())
@@ -859,7 +859,7 @@
{
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard = UndoGuard(
- String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager );
+ OUString( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager );
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() ));
if( xDiagram.is())
{
--
To view, visit https://gerrit.libreoffice.org/3142
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7abf9649a0c5997cebfe3463ce9b633ab59bf3b0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Prashant Pandey <prashant3.yishu@gmail.com>
Context
- [PATCH] fdo#38838 : Replacement of String with OUString in core/char... · Prashant Pandey (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.