Skip to content

C
core
Kaydet (Commit) 299248d8 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert sc/source/ui/navipi/*.cxx from String to OUString 

Change-Id: I74a8006353a0645e9dc994209a3e90084683e15a
üst f09bd2e1
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 45 deletions
sc/source/ui/navipi/content.cxx
Dosyayı görüntüle @ 299248d8
......@@ -152,7 +152,7 @@ void ScContentTree::InitRoot( sal_uInt16 nType )
}
const Image& rImage = aEntryImages.GetImage( nType );
String aName( ScResId( SCSTR_CONTENT_ROOT + nType ) );
OUString aName( ScResId( SCSTR_CONTENT_ROOT + nType ) );
// wieder an die richtige Position:
sal_uInt16 nPos = nRootType ? 0 : pPosList[nType]-1;
SvTreeListEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, false, nPos );
......@@ -278,7 +278,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
if ( bHiddenDoc )
return 0; //! spaeter...
String aText( GetEntryText( pEntry ) );
OUString aText( GetEntryText( pEntry ) );
if ( !aManualDoc.isEmpty() )
pParentWindow->SetCurrentDoc( aManualDoc );
......@@ -299,8 +299,8 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
// bei SID_CURRENTCELL der Bereichsname genommen.
// DB-Bereiche darum direkt ueber die Adresse anspringen.
String aRangeStr = lcl_GetDBAreaRange( GetSourceDocument(), aText );
if (aRangeStr.Len())
OUString aRangeStr = lcl_GetDBAreaRange( GetSourceDocument(), aText );
if (!aRangeStr.isEmpty())
pParentWindow->SetCurrentCellStr( aRangeStr );
}
break;
......@@ -448,8 +448,8 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
{
if ( pSh->ISA(ScDocShell) )
{
String aName = pSh->GetTitle();
String aEntry = aName;
OUString aName = pSh->GetTitle();
OUString aEntry = aName;
if ( pSh == pCurrentSh )
aEntry += pParentWindow->aStrActive;
else
......@@ -467,7 +467,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
// verstecktes Dokument
if ( !aHiddenTitle.isEmpty() )
{
String aEntry = aHiddenTitle;
OUString aEntry = aHiddenTitle;
aEntry += pParentWindow->aStrHidden;
aDocMenu.InsertItem( ++i, aEntry );
if (bHiddenDoc)
......@@ -490,7 +490,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
else if ( aDocMenu.WasHit() ) // angezeigtes Dokument
{
sal_uInt16 nId = aDocMenu.GetSelected();
String aName = aDocMenu.GetItemText(nId);
OUString aName = aDocMenu.GetItemText(nId);
SelectDoc( aName );
}
}
......@@ -763,8 +763,8 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType )
{
if ( IsPartOfType( nType, pObject->GetObjIdentifier() ) )
{
String aName = ScDrawLayer::GetVisibleName( pObject );
if (aName.Len())
OUString aName = ScDrawLayer::GetVisibleName( pObject );
if (!aName.isEmpty())
InsertContent( nType, aName );
}
......@@ -839,12 +839,12 @@ const ScAreaLink* ScContentTree::GetLink( sal_uLong nIndex )
return NULL;
}
static String lcl_NoteString( const ScPostIt& rNote )
static OUString lcl_NoteString( const ScPostIt& rNote )
{
String aText = rNote.GetText();
xub_StrLen nAt;
while ( (nAt = aText.Search( '\n' )) != STRING_NOTFOUND )
aText.SetChar( nAt, ' ' );
OUString aText = rNote.GetText();
sal_Int32 nAt;
while ( (nAt = aText.indexOf( '\n' )) != -1 )
aText = aText.replaceAt( nAt, 1, " " );
return aText;
}
......@@ -993,7 +993,7 @@ sal_Bool ScContentTree::DrawNamesChanged( sal_uInt16 nType )
return !bEqual;
}
static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRange& rRange )
static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const OUString& rName, ScRange& rRange )
{
bool bFound = false;
......@@ -1028,7 +1028,7 @@ static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rNam
return bFound;
}
static void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uInt16 nType, Window* pWin )
static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_uInt16 nType, Window* pWin )
{
ScDocument* pSrcDoc = pSrcShell->GetDocument();
ScDrawLayer* pModel = pSrcDoc->GetDrawLayer();
......@@ -1117,10 +1117,10 @@ void ScContentTree::DoDrag()
(nType != SC_CONTENT_NOTE) &&
(nType != SC_CONTENT_AREALINK) )
{
String aText( GetEntryText( pEntry ) );
OUString aText( GetEntryText( pEntry ) );
ScDocument* pLocalDoc = NULL; // fuer URL-Drop
String aDocName;
OUString aDocName;
if (bHiddenDoc)
aDocName = aHiddenName;
else
......@@ -1136,21 +1136,19 @@ void ScContentTree::DoDrag()
}
bool bDoLinkTrans = false; // use ScLinkTransferObj
String aLinkURL; // for ScLinkTransferObj
String aLinkText;
OUString aLinkURL; // for ScLinkTransferObj
OUString aLinkText;
sal_uInt16 nDropMode = pParentWindow->GetDropMode();
switch ( nDropMode )
{
case SC_DROPMODE_URL:
{
String aUrl = aDocName;
aUrl += '#';
aUrl += aText;
OUString aUrl = aDocName + "#" + aText;
pScMod->SetDragJump( pLocalDoc, aUrl, aText );
if (aDocName.Len())
if (!aDocName.isEmpty())
{
// provide URL to outside only if the document has a name
// (without name, only internal D&D via SetDragJump)
......@@ -1163,7 +1161,7 @@ void ScContentTree::DoDrag()
break;
case SC_DROPMODE_LINK:
{
if ( aDocName.Len() ) // link only to named documents
if ( !aDocName.isEmpty() ) // link only to named documents
{
// for internal D&D, set flag to insert a link
......@@ -1236,7 +1234,7 @@ void ScContentTree::DoDrag()
ScLinkTransferObj* pTransferObj = new ScLinkTransferObj;
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
if ( aLinkURL.Len() )
if ( !aLinkURL.isEmpty() )
pTransferObj->SetLinkURL( aLinkURL, aLinkText );
// SetDragJump / SetDragLink has been done above
......@@ -1262,10 +1260,10 @@ IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG)
sal_Bool ScContentTree::LoadFile( const OUString& rUrl )
{
String aDocName = rUrl;
xub_StrLen nPos = aDocName.Search('#');
if ( nPos != STRING_NOTFOUND )
aDocName.Erase(nPos); // nur der Name, ohne #...
OUString aDocName = rUrl;
sal_Int32 nPos = aDocName.indexOf('#');
if ( nPos != -1 )
aDocName = aDocName.copy(0, nPos); // nur der Name, ohne #...
sal_Bool bReturn = false;
OUString aURL = aDocName;
......@@ -1387,7 +1385,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName wie im Menue/
// "aktiv" oder "inaktiv" weglassen
String aRealName = rName;
OUString aRealName = rName;
xub_StrLen nLen = rName.getLength();
xub_StrLen nActiveStart = nLen - pParentWindow->aStrActive.getLength();
if ( rName.copy( nActiveStart ) == pParentWindow->aStrActive )
......
sc/source/ui/navipi/navcitem.cxx
Dosyayı görüntüle @ 299248d8
......@@ -54,7 +54,7 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat
if ( pCellPosItem )
{
String aAddress( pCellPosItem->GetValue() );
OUString aAddress( pCellPosItem->GetValue() );
ScAddress aScAddress;
aScAddress.Parse( aAddress );
......
sc/source/ui/navipi/navipi.cxx
Dosyayı görüntüle @ 299248d8
......@@ -358,7 +358,7 @@ void ScDocListBox::Select()
{
ScNavigatorDlg::ReleaseFocus();
String aDocName = GetSelectEntry();
OUString aDocName = GetSelectEntry();
rDlg.aLbEntries.SelectDoc( aDocName );
}
......@@ -653,13 +653,13 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
aLbDocuments.SetDropDownLineCount(9);
OUString aOpen(" (");
aStrActive = aOpen;
aStrActive += String( ScResId( STR_ACTIVE ) );
aStrActive += OUString( ScResId( STR_ACTIVE ) );
aStrActive += ")"; // " (aktiv)"
aStrNotActive = aOpen;
aStrNotActive += String( ScResId( STR_NOTACTIVE ) );
aStrNotActive += OUString( ScResId( STR_NOTACTIVE ) );
aStrNotActive += ")"; // " (inaktiv)"
aStrHidden = aOpen;
aStrHidden += String( ScResId( STR_HIDDEN ) );
aStrHidden += OUString( ScResId( STR_HIDDEN ) );
aStrHidden += ")"; // " (versteckt)"
aTitleBase = GetText();
......@@ -1315,14 +1315,14 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
String aSelEntry;
OUString aSelEntry;
SfxObjectShell* pSh = SfxObjectShell::GetFirst();
while ( pSh )
{
if ( pSh->ISA(ScDocShell) )
{
String aName = pSh->GetTitle();
String aEntry = aName;
OUString aName = pSh->GetTitle();
OUString aEntry = aName;
if (pSh == pCurrentSh)
aEntry += aStrActive;
else
......@@ -1339,10 +1339,10 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
aLbDocuments.InsertEntry( aStrActiveWin );
String aHidden = aLbEntries.GetHiddenTitle();
if (aHidden.Len())
OUString aHidden = aLbEntries.GetHiddenTitle();
if (!aHidden.isEmpty())
{
String aEntry = aHidden;
OUString aEntry = aHidden;
aEntry += aStrHidden;
aLbDocuments.InsertEntry( aEntry );
......
sc/source/ui/navipi/scenwnd.cxx
Dosyayı görüntüle @ 299248d8
......@@ -253,9 +253,9 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState )
if ( pState->ISA(SfxStringItem) )
{
String aNewEntry( ((const SfxStringItem*)pState)->GetValue() );
OUString aNewEntry( ((const SfxStringItem*)pState)->GetValue() );
if ( aNewEntry.Len() > 0 )
if ( !aNewEntry.isEmpty() )
aLbScenario.SelectEntry( aNewEntry );
else
aLbScenario.SetNoSelection();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment