diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-18 09:16:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 12:57:32 +0000 |
| commit | 6d12d8cab29ff4d9eb19039a183f90e309fa5d82 (patch) | |
| tree | 637ec963c7a06165561bb3c774fc14913dbc80c0 /sw/source | |
| parent | 5c887ee0e48d85ddd7bb17aac6cb87203a188e7a (diff) | |
reduce UniStrings
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin3.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/dialmgr.hxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index db0fdb55a0e9..d1c65420735c 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2628,7 +2628,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs) const CharSet eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() : RTL_TEXTENCODING_MS_1252; - // allocate UniString data + // allocate unicode string data rtl_uString *pStr = comphelper::string::rtl_uString_alloc(nStrLen); sal_Unicode* pBuffer = pStr->buffer; sal_Unicode* pWork = pBuffer; diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index 3d053e8738e3..834851cfdccb 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -98,10 +98,8 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize) Description: Notify for page number update --------------------------------------------------------------------*/ - - void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, - const String& rPgStr) + const rtl::OUString& rPgStr) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if ( pSfxVwSh && pSfxVwSh->ISA(SwView) && @@ -161,7 +159,7 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect ) ((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect ); } -sal_Bool JumpToSwMark( ViewShell* pVwSh, const String& rMark ) +sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if( pSfxVwSh && pSfxVwSh->ISA( SwView ) ) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index b73c8dbb9810..222fddfff16a 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1167,7 +1167,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) { nSubType = (nFormat == ULONG_MAX) ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR; - if (nFormat == ULONG_MAX && aNumFormatLB.GetSelectEntry() == SW_RESSTR(FMT_USERVAR_CMD)) + if (nFormat == ULONG_MAX && aNumFormatLB.GetSelectEntry().Equals(SW_RESSTR(FMT_USERVAR_CMD))) nSubType |= nsSwExtendedSubType::SUB_CMD; if (aInvisibleCB.IsChecked()) diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx index 8012a874212d..f4533a51ddc6 100644 --- a/sw/source/ui/inc/dialmgr.hxx +++ b/sw/source/ui/inc/dialmgr.hxx @@ -43,7 +43,7 @@ struct SwDialogsResMgr #define SWDIALOG_MGR() SwDialogsResMgr::GetResMgr() #define SW_RES(i) ResId(i,SWDIALOG_MGR()) -#define SW_RESSTR(i) UniString(ResId(i,SWDIALOG_MGR())) +#define SW_RESSTR(i) ResId::toString(SW_RES(i)) #endif |