diff options
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/global.cxx | 24 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0ceb96f85c4d..d762e099bad5 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1266,18 +1266,18 @@ ScFunctionList::ScFunctionList() : USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions // Auswertung AddIn-Liste - String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value")); - String aDefArgNameString(RTL_CONSTASCII_STRINGPARAM("string")); - String aDefArgNameValues(RTL_CONSTASCII_STRINGPARAM("values")); - String aDefArgNameStrings(RTL_CONSTASCII_STRINGPARAM("strings")); - String aDefArgNameCells(RTL_CONSTASCII_STRINGPARAM("cells")); - String aDefArgNameNone(RTL_CONSTASCII_STRINGPARAM("none")); - String aDefArgDescValue(RTL_CONSTASCII_STRINGPARAM("a value")); - String aDefArgDescString(RTL_CONSTASCII_STRINGPARAM("a string")); - String aDefArgDescValues(RTL_CONSTASCII_STRINGPARAM("array of values")); - String aDefArgDescStrings(RTL_CONSTASCII_STRINGPARAM("array of strings")); - String aDefArgDescCells(RTL_CONSTASCII_STRINGPARAM("range of cells")); - String aDefArgDescNone(RTL_CONSTASCII_STRINGPARAM("none")); + String aDefArgNameValue(RTL_CONSTASCII_USTRINGPARAM("value")); + String aDefArgNameString(RTL_CONSTASCII_USTRINGPARAM("string")); + String aDefArgNameValues(RTL_CONSTASCII_USTRINGPARAM("values")); + String aDefArgNameStrings(RTL_CONSTASCII_USTRINGPARAM("strings")); + String aDefArgNameCells(RTL_CONSTASCII_USTRINGPARAM("cells")); + String aDefArgNameNone(RTL_CONSTASCII_USTRINGPARAM("none")); + String aDefArgDescValue(RTL_CONSTASCII_USTRINGPARAM("a value")); + String aDefArgDescString(RTL_CONSTASCII_USTRINGPARAM("a string")); + String aDefArgDescValues(RTL_CONSTASCII_USTRINGPARAM("array of values")); + String aDefArgDescStrings(RTL_CONSTASCII_USTRINGPARAM("array of strings")); + String aDefArgDescCells(RTL_CONSTASCII_USTRINGPARAM("range of cells")); + String aDefArgDescNone(RTL_CONSTASCII_USTRINGPARAM("none")); String aArgName, aArgDesc; pFuncColl = ScGlobal::GetFuncCollection(); for (i = 0; i < pFuncColl->GetCount(); i++) 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 ) { |