mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chart2: String to OUString

Browse Source 
Change-Id: I8abc6a31a46bea404e9d8b0c8777e3400dbf928c
Reviewed-on: https://gerrit.libreoffice.org/5865
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
This commit is contained in:
Jelle van der Waa
2013-09-07 22:31:57 +02:00
committed by Thomas Arnhold
parent 9349f5cd7f
commit 7be7824bbb
16 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
View File

@@ -419,7 +419,7 @@ ColumnChartDialogController::ColumnChartDialogController()
ColumnChartDialogController::~ColumnChartDialogController() ColumnChartDialogController::~ColumnChartDialogController()
{ {
} }
String ColumnChartDialogController::getName() OUString ColumnChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_COLUMN ); return SCH_RESSTR( STR_TYPE_COLUMN );
} }
@@ -494,7 +494,7 @@ BarChartDialogController::BarChartDialogController()
BarChartDialogController::~BarChartDialogController() BarChartDialogController::~BarChartDialogController()
{ {
} }
String BarChartDialogController::getName() OUString BarChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_BAR ); return SCH_RESSTR( STR_TYPE_BAR );
} }
@@ -568,7 +568,7 @@ PieChartDialogController::PieChartDialogController()
PieChartDialogController::~PieChartDialogController() PieChartDialogController::~PieChartDialogController()
{ {
} }
String PieChartDialogController::getName() OUString PieChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_PIE ); return SCH_RESSTR( STR_TYPE_PIE );
} }
@@ -630,7 +630,7 @@ LineChartDialogController::LineChartDialogController()
LineChartDialogController::~LineChartDialogController() LineChartDialogController::~LineChartDialogController()
{ {
} }
String LineChartDialogController::getName() OUString LineChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_LINE ); return SCH_RESSTR( STR_TYPE_LINE );
} }
@@ -778,7 +778,7 @@ XYChartDialogController::XYChartDialogController()
XYChartDialogController::~XYChartDialogController() XYChartDialogController::~XYChartDialogController()
{ {
} }
String XYChartDialogController::getName() OUString XYChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_XY ); return SCH_RESSTR( STR_TYPE_XY );
} }
@@ -876,7 +876,7 @@ AreaChartDialogController::AreaChartDialogController()
AreaChartDialogController::~AreaChartDialogController() AreaChartDialogController::~AreaChartDialogController()
{ {
} }
String AreaChartDialogController::getName() OUString AreaChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_AREA); return SCH_RESSTR(STR_TYPE_AREA);
} }
@@ -958,7 +958,7 @@ NetChartDialogController::NetChartDialogController()
NetChartDialogController::~NetChartDialogController() NetChartDialogController::~NetChartDialogController()
{ {
} }
String NetChartDialogController::getName() OUString NetChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_NET); return SCH_RESSTR(STR_TYPE_NET);
} }
@@ -1052,7 +1052,7 @@ StockChartDialogController::~StockChartDialogController()
{ {
} }
String StockChartDialogController::getName() OUString StockChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_STOCK); return SCH_RESSTR(STR_TYPE_STOCK);
} }
@@ -1105,7 +1105,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
delete m_pMF_NumberOfLines; delete m_pMF_NumberOfLines;
} }
String CombiColumnLineChartDialogController::getName() OUString CombiColumnLineChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE); return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE);
} }
@@ -1250,7 +1250,7 @@ BubbleChartDialogController::BubbleChartDialogController()
BubbleChartDialogController::~BubbleChartDialogController() BubbleChartDialogController::~BubbleChartDialogController()
{ {
} }
String BubbleChartDialogController::getName() OUString BubbleChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_BUBBLE); return SCH_RESSTR(STR_TYPE_BUBBLE);
} }

22
chart2/source/controller/dialogs/ChartTypeDialogController.hxx
View File

@@ -91,7 +91,7 @@ public:
ChartTypeDialogController(); ChartTypeDialogController();
virtual ~ChartTypeDialogController(); virtual ~ChartTypeDialogController();
virtual String getName()=0; virtual OUString getName()=0;
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -147,7 +147,7 @@ public:
ColumnChartDialogController(); ColumnChartDialogController();
virtual ~ColumnChartDialogController(); virtual ~ColumnChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -159,7 +159,7 @@ public:
BarChartDialogController(); BarChartDialogController();
virtual ~BarChartDialogController(); virtual ~BarChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -171,7 +171,7 @@ public:
PieChartDialogController(); PieChartDialogController();
virtual ~PieChartDialogController(); virtual ~PieChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -186,7 +186,7 @@ public:
LineChartDialogController(); LineChartDialogController();
virtual ~LineChartDialogController(); virtual ~LineChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -204,7 +204,7 @@ public:
XYChartDialogController(); XYChartDialogController();
virtual ~XYChartDialogController(); virtual ~XYChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -220,7 +220,7 @@ public:
AreaChartDialogController(); AreaChartDialogController();
virtual ~AreaChartDialogController(); virtual ~AreaChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -236,7 +236,7 @@ public:
NetChartDialogController(); NetChartDialogController();
virtual ~NetChartDialogController(); virtual ~NetChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -251,7 +251,7 @@ public:
StockChartDialogController(); StockChartDialogController();
virtual ~StockChartDialogController(); virtual ~StockChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -264,7 +264,7 @@ public:
CombiColumnLineChartDialogController(); CombiColumnLineChartDialogController();
virtual ~CombiColumnLineChartDialogController(); virtual ~CombiColumnLineChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
@@ -292,7 +292,7 @@ public:
BubbleChartDialogController(); BubbleChartDialogController();
virtual ~BubbleChartDialogController(); virtual ~BubbleChartDialogController();
virtual String getName(); virtual OUString getName();
virtual Image getImage(); virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );

16
chart2/source/controller/dialogs/DataBrowser.cxx
View File

@@ -664,9 +664,9 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
if( ! ::rtl::math::isNan( fData ) && if( ! ::rtl::math::isNan( fData ) &&
m_spNumberFormatterWrapper.get() ) m_spNumberFormatterWrapper.get() )
aResult = String( m_spNumberFormatterWrapper->getFormattedString( aResult = m_spNumberFormatterWrapper->getFormattedString(
GetNumberFormatKey( nRow, nColumnId ), GetNumberFormatKey( nRow, nColumnId ),
fData, nLabelColor, bColorChanged )); fData, nLabelColor, bColorChanged );
} }
else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE ) else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE )
{ {
@@ -681,8 +681,8 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
bool bColorChanged = false; bool bColorChanged = false;
sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) ); sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) );
if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() ) if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
aResult = String( m_spNumberFormatterWrapper->getFormattedString( aResult = m_spNumberFormatterWrapper->getFormattedString(
nDateNumberFormat, fDouble, nLabelColor, bColorChanged )); nDateNumberFormat, fDouble, nLabelColor, bColorChanged );
} }
} }
else else
@@ -995,7 +995,7 @@ void DataBrowser::PaintCell(
Point aPos( rRect.TopLeft()); Point aPos( rRect.TopLeft());
aPos.X() += 1; aPos.X() += 1;
String aText = GetCellText( m_nSeekRow, nColumnId ); OUString aText = GetCellText( m_nSeekRow, nColumnId );
Size TxtSize( GetDataWindow().GetTextWidth( aText ), GetDataWindow().GetTextHeight()); Size TxtSize( GetDataWindow().GetTextWidth( aText ), GetDataWindow().GetTextHeight());
// clipping // clipping
@@ -1085,7 +1085,7 @@ void DataBrowser::InitController(
// treat invalid and empty text as Nan // treat invalid and empty text as Nan
m_aNumberEditField.EnableNotANumber( true ); m_aNumberEditField.EnableNotANumber( true );
if( ::rtl::math::isNan( GetCellNumber( nRow, nCol ))) if( ::rtl::math::isNan( GetCellNumber( nRow, nCol )))
m_aNumberEditField.SetTextValue( String()); m_aNumberEditField.SetTextValue( OUString());
else else
m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) ); m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) );
OUString aText( m_aNumberEditField.GetText()); OUString aText( m_aNumberEditField.GetText());
@@ -1256,11 +1256,11 @@ void DataBrowser::RenewSeriesHeaders()
spHeader->SetColor( Color( nColor )); spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis ); spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName( spHeader->SetSeriesName(
String( DataSeriesHelper::getDataSeriesLabel( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries, aIt->m_xDataSeries,
(aIt->m_xChartType.is() ? (aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() : aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
OUString( "values-y"))))); OUString( "values-y"))));
spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 ); spHeader->SetRange( aIt->m_nStartColumn + 1, aIt->m_nEndColumn + 1 );
spHeader->SetGetFocusHdl( aFocusLink ); spHeader->SetGetFocusHdl( aFocusLink );
spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink ); spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink );

2
chart2/source/controller/dialogs/res_ErrorBar.cxx
View File

@@ -706,7 +706,7 @@ void ErrorBarResources::listeningFinished(
if( m_pCurrentRangeChoosingField ) if( m_pCurrentRangeChoosingField )
{ {
m_pCurrentRangeChoosingField->SetText( String( aRange )); m_pCurrentRangeChoosingField->SetText( aRange );
m_pCurrentRangeChoosingField->GrabFocus(); m_pCurrentRangeChoosingField->GrabFocus();
PosValueChanged( 0 ); PosValueChanged( 0 );
} }

4
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
View File

@@ -51,7 +51,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
{ {
SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
String aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) ); OUString aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) );
OUString aTipHelp( aTipHelpStr ); OUString aTipHelp( aTipHelpStr );
const OUString aReplacementStr( "%LIGHTNUMBER" ); const OUString aReplacementStr( "%LIGHTNUMBER" );
sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr ); sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr );
@@ -60,7 +60,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(), aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
OUString::number( nLightNumber ) ); OUString::number( nLightNumber ) );
} }
this->SetQuickHelpText( String( aTipHelp ) ); this->SetQuickHelpText( aTipHelp );
} }
LightButton::~LightButton() LightButton::~LightButton()

14
chart2/source/controller/dialogs/tp_DataSource.cxx
View File

@@ -437,7 +437,7 @@ void DataSourceTabPage::updateControlsFromDialogModel()
SeriesSelectionChangedHdl( 0 ); SeriesSelectionChangedHdl( 0 );
// categories // categories
m_aEDT_CATEGORIES.SetText( String( m_rDialogModel.getCategoriesRange() )); m_aEDT_CATEGORIES.SetText( m_rDialogModel.getCategoriesRange() );
updateControlState(); updateControlState();
} }
@@ -606,11 +606,11 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
if( nIndex != -1 ) if( nIndex != -1 )
{ {
m_aFT_RANGE.SetText( m_aFT_RANGE.SetText(
String( m_aFixedTextRange.replaceAt( m_aFixedTextRange.replaceAt(
nIndex, aReplacementStr.getLength(), aSelectedRoleUI ))); nIndex, aReplacementStr.getLength(), aSelectedRoleUI ));
} }
m_aEDT_RANGE.SetText( String( aSelectedRange )); m_aEDT_RANGE.SetText( aSelectedRange );
isValid(); isValid();
} }
@@ -840,18 +840,18 @@ void DataSourceTabPage::listeningFinished(
GrabFocus(); GrabFocus();
if( m_pCurrentRangeChoosingField ) if( m_pCurrentRangeChoosingField )
{ {
m_pCurrentRangeChoosingField->SetText( String( aRange )); m_pCurrentRangeChoosingField->SetText( aRange );
m_pCurrentRangeChoosingField->GrabFocus(); m_pCurrentRangeChoosingField->GrabFocus();
} }
if( m_pCurrentRangeChoosingField == & m_aEDT_RANGE ) if( m_pCurrentRangeChoosingField == & m_aEDT_RANGE )
{ {
m_aEDT_RANGE.SetText( String( aRange )); m_aEDT_RANGE.SetText( aRange );
setDirty(); setDirty();
} }
else if( m_pCurrentRangeChoosingField == & m_aEDT_CATEGORIES ) else if( m_pCurrentRangeChoosingField == & m_aEDT_CATEGORIES )
{ {
m_aEDT_CATEGORIES.SetText( String( aRange )); m_aEDT_CATEGORIES.SetText( aRange );
setDirty(); setDirty();
} }

4
chart2/source/controller/dialogs/tp_RangeChooser.cxx
View File

@@ -182,7 +182,7 @@ void RangeChooserTabPage::initControlsFromModel()
m_rDialogModel.detectArguments( m_rDialogModel.detectArguments(
m_aLastValidRangeString, bUseColumns, bFirstCellAsLabel, bHasCategories ); m_aLastValidRangeString, bUseColumns, bFirstCellAsLabel, bHasCategories );
else else
m_aLastValidRangeString = String::EmptyString(); m_aLastValidRangeString = "";
m_aED_Range.SetText( m_aLastValidRangeString ); m_aED_Range.SetText( m_aLastValidRangeString );
@@ -372,7 +372,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
//update dialog state //update dialog state
ToTop(); ToTop();
GrabFocus(); GrabFocus();
m_aED_Range.SetText( String( aRange ) ); m_aED_Range.SetText( aRange );
m_aED_Range.GrabFocus(); m_aED_Range.GrabFocus();
setDirty(); setDirty();

2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
View File

@@ -262,7 +262,7 @@ void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
if( m_bUseSpecialFillColor ) if( m_bUseSpecialFillColor )
{ {
Color aColor(m_nSpecialFillColor); Color aColor(m_nSpecialFillColor);
rOutItemSet.Put( XFillColorItem( String(), aColor ) ); rOutItemSet.Put( XFillColorItem( OUString(), aColor ) );
} }
} }

2
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
View File

@@ -437,7 +437,7 @@ void ErrorBarItemConverter::FillSpecialItem(
StatisticsHelper::getErrorDataSequenceFromDataSource( StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError )); xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError ));
if( xSeq.is()) if( xSeq.is())
rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation()))); rOutItemSet.Put( SfxStringItem( nWhichId, xSeq->getSourceRangeRepresentation()));
} }
} }
break; break;

2
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
View File

@@ -923,7 +923,7 @@ void StatisticsItemConverter::FillSpecialItem(
StatisticsHelper::getErrorDataSequenceFromDataSource( StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError )); xErrorBarSource, (nWhichId == SCHATTR_STAT_RANGE_POS), bYError ));
if( xSeq.is()) if( xSeq.is())
rOutItemSet.Put( SfxStringItem( nWhichId, String( xSeq->getSourceRangeRepresentation()))); rOutItemSet.Put( SfxStringItem( nWhichId, xSeq->getSourceRangeRepresentation()));
} }
} }
break; break;

4
chart2/source/controller/main/ChartController_TextEdit.cxx
View File

@@ -123,7 +123,7 @@ bool ChartController::EndTextEdit()
{ {
pOutliner->SetText( *pParaObj ); pOutliner->SetText( *pParaObj );
String aString = pOutliner->GetText( OUString aString = pOutliner->GetText(
pOutliner->GetParagraph( 0 ), pOutliner->GetParagraph( 0 ),
pOutliner->GetParagraphCount() ); pOutliner->GetParagraphCount() );
@@ -173,7 +173,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
{ {
const SfxItemSet* pSet = pDlg->GetOutputItemSet(); const SfxItemSet* pSet = pDlg->GetOutputItemSet();
const SfxPoolItem* pItem=0; const SfxPoolItem* pItem=0;
String aString; OUString aString;
if ( pSet && pSet->GetItemState( SID_CHARMAP, sal_True, &pItem) == SFX_ITEM_SET && if ( pSet && pSet->GetItemState( SID_CHARMAP, sal_True, &pItem) == SFX_ITEM_SET &&
pItem->ISA(SfxStringItem) ) pItem->ISA(SfxStringItem) )
aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue(); aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue();

4
chart2/source/controller/main/ChartWindow.cxx
View File

@@ -209,10 +209,10 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
{ {
if( bIsBalloonHelp ) if( bIsBalloonHelp )
Help::ShowBalloon( Help::ShowBalloon(
this, rHEvt.GetMousePosPixel(), lcl_AWTRectToVCLRect( aHelpRect ), String( aQuickHelpText )); this, rHEvt.GetMousePosPixel(), lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
else else
Help::ShowQuickHelp( Help::ShowQuickHelp(
this, lcl_AWTRectToVCLRect( aHelpRect ), String( aQuickHelpText )); this, lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
} }
} }

2
chart2/source/controller/main/DrawCommandDispatch.cxx
View File

@@ -102,7 +102,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
XLineEndListRef pLineEndList = rModel.GetLineEndList(); XLineEndListRef pLineEndList = rModel.GetLineEndList();
if ( pLineEndList.is() ) if ( pLineEndList.is() )
{ {
String aName( SVX_RESSTR( nResId ) ); OUString aName( SVX_RESSTR( nResId ) );
long nCount = pLineEndList->Count(); long nCount = pLineEndList->Count();
for ( long nIndex = 0; nIndex < nCount; ++nIndex ) for ( long nIndex = 0; nIndex < nCount; ++nIndex )
{ {

2
chart2/source/controller/main/ShapeToolbarController.cxx
View File

@@ -116,7 +116,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos ) for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
{ {
const sal_uInt16 nItemId = pToolBox->GetItemId( nPos ); const sal_uInt16 nItemId = pToolBox->GetItemId( nPos );
if ( pToolBox->GetItemCommand( nItemId ) == String( m_aCommandURL ) ) if ( pToolBox->GetItemCommand( nItemId ) == m_aCommandURL )
{ {
m_nToolBoxId = nItemId; m_nToolBoxId = nItemId;
break; break;

2
chart2/source/inc/chartview/DrawModelWrapper.hxx
View File

@@ -93,7 +93,7 @@ public:
XBitmapListRef GetBitmapList() const; XBitmapListRef GetBitmapList() const;
SdrObject* getNamedSdrObject( const OUString& rName ); SdrObject* getNamedSdrObject( const OUString& rName );
static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList ); static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList* pObjList );
static bool removeShape( const ::com::sun::star::uno::Reference< static bool removeShape( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape ); ::com::sun::star::drawing::XShape >& xShape );

4
chart2/source/view/main/DrawModelWrapper.cxx
View File

@@ -351,9 +351,9 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
return getNamedSdrObject( rName, GetPage(0) ); return getNamedSdrObject( rName, GetPage(0) );
} }
SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObjList* pSearchList ) SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rObjectCID, SdrObjList* pSearchList )
{ {
if(!pSearchList || rObjectCID.Len()==0) if(!pSearchList || rObjectCID.isEmpty())
return 0; return 0;
sal_uLong nCount = pSearchList->GetObjCount(); sal_uLong nCount = pSearchList->GetObjCount();
for( sal_uLong nN=0; nN<nCount; nN++ ) for( sal_uLong nN=0; nN<nCount; nN++ )