diff options
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 6acaa05a4b47..57e996b843f7 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -426,7 +426,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume long nTabs[] = { 3, 10, 216, 266 }; maLbConflicts.SetTabs( nTabs ); - rtl::OUString aTab('\t'); + OUString aTab('\t'); String aHeader( maStrTitleConflict ); aHeader += aTab; aHeader += maStrTitleAuthor; @@ -464,7 +464,7 @@ ScConflictsDlg::~ScConflictsDlg() String ScConflictsDlg::GetConflictString( const ScConflictsListEntry& rConflictEntry ) { - rtl::OUString aString; + OUString aString; if ( mpOwnTrack ) { const ScChangeAction* pAction = mpOwnTrack->GetAction( rConflictEntry.maOwnActions[ 0 ] ); @@ -485,7 +485,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen OSL_ENSURE( pDoc, "ScConflictsDlg::GetActionString(): pDoc is null!" ); if ( pAction && pDoc ) { - rtl::OUString aDesc; + OUString aDesc; pAction->GetDescription(aDesc, pDoc, true, false); aString += String(aDesc); aString += '\t'; |