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

get rid of some XubStrings

Browse Source 
Change-Id: Ie522330aa1470677ddcc8f9e6d76bbf4a63a9712
This commit is contained in:
Caolán McNamara
2013-01-25 23:01:35 +00:00
parent aac5cb1d32
commit 9b5111e7f9
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cui/source/options/optdict.cxx
View File

@@ -590,13 +590,13 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled())
{
SvTreeListEntry* _pEntry = aWordsLB.FirstSelected();
XubString aNewWord(aWordED.GetText());
String sEntry(aNewWord);
XubString aReplaceStr(aReplaceED.GetText());
OUString aNewWord(aWordED.GetText());
OUString sEntry(aNewWord);
OUString aReplaceStr(aReplaceED.GetText());
sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
sal_uInt16 nPos = aAllDictsLB.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && aNewWord.Len() > 0)
if ( nPos != LISTBOX_ENTRY_NOTFOUND && !aNewWord.isEmpty())
{
DBG_ASSERT(nPos < aDics.getLength(), "invalid dictionary index");
Reference< XDictionary > xDic( aDics.getConstArray()[ nPos ], UNO_QUERY );
@@ -625,7 +625,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
if (DIC_ERR_NONE != nAddRes)
SvxDicError( this, nAddRes );
if(DIC_ERR_NONE == nAddRes && sEntry.Len())
if(DIC_ERR_NONE == nAddRes && !sEntry.isEmpty())
{
// insert new entry in list-box etc...
@@ -634,7 +634,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
if(aReplaceFT.IsVisible())
{
sEntry += '\t';
sEntry += "\t";
sEntry += aReplaceStr;
}

2
sw/source/core/text/guess.cxx
View File

@@ -250,7 +250,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
sal_Unicode cFldChr = 0;
#if OSL_DEBUG_LEVEL > 0
XubString aDebugString;
OUString aDebugString;
#endif
// be careful: a field portion can be both: 0x01 (common field)

2
sw/source/core/txtnode/txtedt.cxx
View File

@@ -1049,7 +1049,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
rArgs.aConvText = rtl::OUString();
// modify string according to redline information and hidden text
const XubString aOldTxt( m_Text );
const OUString aOldTxt( m_Text );
const bool bRestoreString =
lcl_MaskRedlinesAndHiddenText( *this, m_Text, 0, m_Text.Len() ) > 0;

2
sw/source/ui/docvw/AnnotationWin.cxx
View File

@@ -208,7 +208,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
MenuButton* SwAnnotationWin::CreateMenuButton()
{
mpButtonPopup = new PopupMenu(SW_RES(MN_ANNOTATION_BUTTON));
XubString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
OUString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1,GetAuthor());
aText = aRewriter.Apply(aText);

2
sw/source/ui/docvw/SidebarTxtControl.cxx
View File

@@ -326,7 +326,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
((PopupMenu*)pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTxtControl, Select) );
{
XubString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
OUString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, mrSidebarWin.GetAuthor());
aText = aRewriter.Apply(aText);