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

XubString->OUString

Browse Source 
Change-Id: I86515dde1c6169531e687701a5ae067de1b6f114
Reviewed-on: https://gerrit.libreoffice.org/5782
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2013-09-03 13:30:35 +01:00
parent 2564c5bbe4
commit f46f23a109
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/svdxcgv.hxx
View File

@@ -104,7 +104,7 @@ public:
// Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
// SDRINSERT_ADDMARK (siehe svdedtv.hxx). // SDRINSERT_ADDMARK (siehe svdedtv.hxx).
virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
sal_Bool Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); sal_Bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );

2
include/svx/xtable.hxx
View File

@@ -222,7 +222,7 @@ public:
XPropertyEntry* Remove(long nIndex); XPropertyEntry* Remove(long nIndex);
XPropertyEntry* Get(long nIndex) const; XPropertyEntry* Get(long nIndex) const;
long GetIndex(const String& rName) const; long GetIndex(const OUString& rName) const;
Bitmap GetUiBitmap(long nIndex) const; Bitmap GetUiBitmap(long nIndex) const;
const String& GetName() const { return maName; } const String& GetName() const { return maName; }

5
svx/source/form/fmpgeimp.cxx
View File

@@ -417,9 +417,8 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
if( pModel->IsUndoEnabled() ) if( pModel->IsUndoEnabled() )
{ {
OUString aStr(SVX_RESSTR(RID_STR_FORM)); OUString aStr(SVX_RESSTR(RID_STR_FORM));
XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT)); OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr.replaceFirst("'#'", aStr));
pModel->BegUndo(aUndoStr);
} }
try try

4
svx/source/form/tbxform.cxx
View File

@@ -407,11 +407,11 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
if (GetSlotId() != SID_FM_RECORD_TOTAL) if (GetSlotId() != SID_FM_RECORD_TOTAL)
return; return;
XubString aText; OUString aText;
if (pState) if (pState)
aText = ((SfxStringItem*)pState)->GetValue(); aText = ((SfxStringItem*)pState)->GetValue();
else else
aText = '?'; aText = "?";
pFixedText->SetText( aText ); pFixedText->SetText( aText );
pFixedText->Update(); pFixedText->Update();

4
svx/source/svdraw/svdxcgv.cxx
View File

@@ -125,9 +125,9 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI
return bRet; return bRet;
} }
sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{ {
if(!rStr.Len()) if (rStr.isEmpty())
return sal_False; return sal_False;
Point aPos(rPos); Point aPos(rPos);

4
svx/source/xoutdev/xtable.cxx
View File

@@ -161,7 +161,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const
return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL; return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL;
} }
long XPropertyList::GetIndex(const XubString& rName) const long XPropertyList::GetIndex(const OUString& rName) const
{ {
if( mbListDirty ) if( mbListDirty )
{ {
@@ -170,7 +170,7 @@ long XPropertyList::GetIndex(const XubString& rName) const
} }
for( long i = 0, n = maList.size(); i < n; ++i ) { for( long i = 0, n = maList.size(); i < n; ++i ) {
if ( maList[ i ]->GetName() == rName ) { if (rName.equals(maList[ i ]->GetName())) {
return i; return i;
} }
} }