diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-03 09:34:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-03 09:58:36 +0100 |
| commit | 4b5837d7a1f7c6e5e0e9981c0e5fb8eb7b50f586 (patch) | |
| tree | 22c1c456c50448746e45ccbb040da640ecfd8a57 /svx | |
| parent | cad78399e403e3635de06775c0c50bf24f74ecd8 (diff) | |
XubString->OUString
Change-Id: I40a4efb5ffed5f8592651ef70eb99d4285a7cddd
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index da67a6146b36..c0a151706e28 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -457,9 +457,8 @@ namespace svxform { case SID_FM_NEW_FORM: { - XubString aStr(SVX_RES(RID_STR_FORM)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_FORM)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // der Slot war nur verfuegbar, wenn es genau einen selektierten Eintrag gibt und dieser die Root @@ -470,9 +469,8 @@ namespace svxform } break; case SID_FM_NEW_HIDDEN: { - XubString aStr(SVX_RES(RID_STR_CONTROL)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular @@ -1002,9 +1000,8 @@ namespace svxform // innerhalb eines Undo ... if (pFormModel) { - XubString aStr(SVX_RES(RID_STR_CONTROL)); - XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + OUString aStr(SVX_RESSTR(RID_STR_CONTROL)); + OUString aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT).replaceAll(OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); } @@ -1078,7 +1075,7 @@ namespace svxform if( bUndo ) { - XubString strUndoDescription(SVX_RES(RID_STR_UNDO_CONTAINER_REPLACE)); + OUString strUndoDescription(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REPLACE)); pFormModel->BegUndo(strUndoDescription); } @@ -1482,7 +1479,7 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // BasisNamen erzeugen - rtl::OUString aBaseName; + OUString aBaseName; if( pEntryData->ISA(FmFormData) ) aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME ); else if( pEntryData->ISA(FmControlData) ) |