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

remove some annoying XubStrings

Browse Source 
Change-Id: I8c34a344285b6929091788c6b7a5529b48943f94
This commit is contained in:
Caolán McNamara
2012-06-25 10:07:22 +01:00
parent 022b62296c
commit 9928fd7fc6
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/source/standard/vclxaccessiblelist.cxx
View File

@@ -261,7 +261,7 @@ void VCLXAccessibleList::UpdateSelection (::rtl::OUString sTextOfSelectedItem)
if ( pBox != NULL ) if ( pBox != NULL )
{ {
// Find the index of the selected item inside the VCL control... // Find the index of the selected item inside the VCL control...
sal_uInt16 nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem)); sal_uInt16 nIndex = pBox->GetEntryPos(sTextOfSelectedItem);
// ...and then find the associated accessibility object. // ...and then find the associated accessibility object.
if ( nIndex == LISTBOX_ENTRY_NOTFOUND ) if ( nIndex == LISTBOX_ENTRY_NOTFOUND )
nIndex = 0; nIndex = 0;

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

@@ -327,7 +327,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
else else
{ {
m_aED_CrossesAtCategory.SetNoSelection(); m_aED_CrossesAtCategory.SetNoSelection();
m_aED_CrossesAt.SetTextValue(XubString()); m_aED_CrossesAt.SetTextValue(rtl::OUString());
} }
} }
else else

5
sd/source/ui/toolpanel/controls/DocumentHelper.cxx
View File

@@ -523,12 +523,11 @@ SdPage* DocumentHelper::ProvideMasterPage (
SdPage* pMasterPageInDocument = NULL; SdPage* pMasterPageInDocument = NULL;
// Search for a master page with the same name as the given one in // Search for a master page with the same name as the given one in
// the target document. // the target document.
const XubString sMasterPageLayoutName (pMasterPage->GetLayoutName()); const rtl::OUString sMasterPageLayoutName (pMasterPage->GetLayoutName());
for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex)
{ {
SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex)); SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex));
if (pCandidate!=NULL if (pCandidate && sMasterPageLayoutName.equals(pCandidate->GetLayoutName()))
&& sMasterPageLayoutName==pCandidate->GetLayoutName())
{ {
// The requested master page does already exist in the // The requested master page does already exist in the
// target document, return it. // target document, return it.

8
svtools/source/edit/svmedit.cxx
View File

@@ -804,8 +804,8 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
{ {
// Damit die Selektion erhalten bleibt // Damit die Selektion erhalten bleibt
mbActivePopup = sal_True; mbActivePopup = sal_True;
XubString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if ( aChars.Len() ) if (!aChars.isEmpty())
{ {
mpExtTextView->InsertText( aChars ); mpExtTextView->InsertText( aChars );
mpExtTextView->GetTextEngine()->SetModified( sal_True ); mpExtTextView->GetTextEngine()->SetModified( sal_True );
@@ -905,8 +905,8 @@ void TextWindow::Command( const CommandEvent& rCEvt )
break; break;
case SV_MENU_EDIT_INSERTSYMBOL: case SV_MENU_EDIT_INSERTSYMBOL:
{ {
XubString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if ( aChars.Len() ) if (!aChars.isEmpty())
{ {
mpExtTextView->InsertText( aChars ); mpExtTextView->InsertText( aChars );
mpExtTextEngine->SetModified( sal_True ); mpExtTextEngine->SetModified( sal_True );

4
svx/source/unodraw/unoshtxt.cxx
View File

@@ -657,9 +657,9 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if (mpOutliner->GetParagraphCount()==1) if (mpOutliner->GetParagraphCount()==1)
{ {
// if we only have one paragraph we check if it is empty // if we only have one paragraph we check if it is empty
XubString aStr( mpOutliner->GetText( mpOutliner->GetParagraph( 0 ) ) ); rtl::OUString aStr(mpOutliner->GetText(mpOutliner->GetParagraph(0)));
if(!aStr.Len()) if (aStr.isEmpty())
{ {
// its empty, so we have to force the outliner to initialise itself // its empty, so we have to force the outliner to initialise itself
mpOutliner->SetText( String(), mpOutliner->GetParagraph( 0 ) ); mpOutliner->SetText( String(), mpOutliner->GetParagraph( 0 ) );

4
vcl/source/control/fixed.cxx
View File

@@ -231,8 +231,8 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
{ {
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
WinBits nWinStyle = GetStyle(); WinBits nWinStyle = GetStyle();
XubString aText( GetText() ); rtl::OUString aText( GetText() );
sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle ); sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
Point aPos = rPos; Point aPos = rPos;
if ( nWinStyle & WB_EXTRAOFFSET ) if ( nWinStyle & WB_EXTRAOFFSET )