diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-14 21:07:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-14 21:07:25 +0000 |
commit | fee85b56c07e2999bdfb127f366bdaa5d17eb954 (patch) | |
tree | cf84acf96cc9e859f33500b58146a3a06babe426 /sc/source/ui | |
parent | e0d9d4d4a4f77d0fbb680c2f96b1cc9a912238d2 (diff) |
Misuse of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 067c43c55a7e..3f22ab40772c 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -700,7 +700,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) ESelection aSel(0,0,0,0); aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD ), aSel ); ++aSel.nEndPos; - String aPageEntry(RTL_CONSTASCII_STRINGPARAM(", ")); + String aPageEntry(RTL_CONSTASCII_USTRINGPARAM(", ")); aPageEntry += ScGlobal::GetRscString( STR_PAGE ) ; aPageEntry += ' '; aWndCenter.GetEditEngine()->QuickInsertText(aPageEntry, ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); @@ -733,7 +733,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) aSel.nEndPos = aPageEntry.Len(); aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - String aCommaSpace(RTL_CONSTASCII_STRINGPARAM(", ")); + String aCommaSpace(RTL_CONSTASCII_USTRINGPARAM(", ")); aWndCenter.GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); aSel.nEndPos = sal::static_int_cast<xub_StrLen>( aSel.nEndPos + aCommaSpace.Len() ); aWndCenter.GetEditEngine()->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); @@ -754,7 +754,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) aSel.nEndPos = aPageEntry.Len(); aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - String aCommaSpace(RTL_CONSTASCII_STRINGPARAM(", ")); + String aCommaSpace(RTL_CONSTASCII_USTRINGPARAM(", ")); aWndCenter.GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); aSel.nEndPos = sal::static_int_cast<xub_StrLen>( aSel.nEndPos + aCommaSpace.Len() ); aWndCenter.GetEditEngine()->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 0d629b7f3a02..d921c83b6ce3 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -435,10 +435,10 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) { // Excel-5: detect through contained streams // there are some "excel" formats from 3rd party vendors that need to be distinguished - String aStreamName(RTL_CONSTASCII_STRINGPARAM("Workbook")); + String aStreamName(RTL_CONSTASCII_USTRINGPARAM("Workbook")); BOOL bExcel97Stream = ( aStorage->IsStream( aStreamName ) ); - aStreamName = String(RTL_CONSTASCII_STRINGPARAM("Book")); + aStreamName = String(RTL_CONSTASCII_USTRINGPARAM("Book")); BOOL bExcel5Stream = ( aStorage->IsStream( aStreamName ) ); if ( bExcel97Stream || bExcel5Stream ) { |