diff options
| author | gt <gt@openoffice.org> | 2001-05-30 10:27:47 +0000 |
|---|---|---|
| committer | gt <gt@openoffice.org> | 2001-05-30 10:27:47 +0000 |
| commit | 4ff871636017d3459dfc89568579dae8aa4bada3 (patch) | |
| tree | 9660c23b76bef63b8b75aee4a551d90b1e06b6bf /scaddins/source/analysis | |
| parent | 9e9489118a76c8cf52f634541e8936a112b56c26 (diff) | |
#87600# non-ASCII-handling for names, descriptions, etc.
Diffstat (limited to 'scaddins/source/analysis')
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 17 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysisdefs.hxx | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index c5dcfca9ebdc..c334a621c728 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: analysis.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: gt $ $Date: 2001-05-28 10:17:18 $ + * last change: $Author: gt $ $Date: 2001-05-30 11:27:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <tools/solmath.hxx> +#include <string.h> #define ADDIN_SERVICE "com.sun.star.sheet.AddIn" @@ -341,7 +342,7 @@ const sal_Char* pFuncDatas[] = "pnumber", "pstep", "Pnumber", "Pstep", EOE, - "igetFactdouble", "1Zweifakultaet", "2Factdouble", + "igetFactdouble", "1Zweifakultt", "2Factdouble", "dReturns the double factorial of a number", "pnumber", "Pnumber", @@ -351,7 +352,7 @@ const sal_Char* pFuncDatas[] = "pinumber", "Pinumber", EOE, - "igetImaginary", "1Imaginaerteil", "2Imaginary", + "igetImaginary", "1Imaginrteil", "2Imaginary", "dReturns the imaginary coefficient of a complex number", "pinumber", "Pinumber", @@ -779,7 +780,7 @@ STRING SAL_CALL AnalysisAddIn::getDisplayFunctionName( const STRING& aProgrammat const FuncData* p = pFD->Get( aProgrammaticName ); if( p ) - aRet = STRFROMASCII( bGerman ? p->pGerman : p->pEnglish ); + aRet = STRFROMANSI( bGerman ? p->pGerman : p->pEnglish ); return aRet; } @@ -793,7 +794,7 @@ STRING SAL_CALL AnalysisAddIn::getFunctionDescription( const STRING& aProgrammat const FuncData* p = pFD->Get( aProgrammaticName ); if( p ) - aRet = STRFROMASCII( p->pDescr ); + aRet = STRFROMANSI( p->pDescr ); return aRet; } @@ -806,7 +807,7 @@ STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_ const FuncData* p = pFD->Get( aName ); if( p ) - aRet = STRFROMASCII( p->GetParam( nArg ) ); + aRet = STRFROMANSI( p->GetParam( nArg ) ); return aRet; } @@ -818,7 +819,7 @@ STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_ STRING aRet; const FuncData* p = pFD->Get( aName ); if( p ) - aRet = STRFROMASCII( p->GetParamDescr( nArg ) ); + aRet = STRFROMANSI( p->GetParamDescr( nArg ) ); return aRet; } diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx index a0bbb19a125f..522667ca5dbb 100644 --- a/scaddins/source/analysis/analysisdefs.hxx +++ b/scaddins/source/analysis/analysisdefs.hxx @@ -2,9 +2,9 @@ * * $RCSfile: analysisdefs.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: gt $ $Date: 2001-05-07 06:56:53 $ + * last change: $Author: gt $ $Date: 2001-05-30 11:27:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,7 @@ #define SEQ_ANY SEQ(ANY) #define STRING ::rtl::OUString #define STRFROMASCII(s) STRING::createFromAscii( s ) +#define STRFROMANSI(s) STRING( s, strlen( s ), RTL_TEXTENCODING_MS_1252 ) #define THROWDEF_RTE throw(CSS::uno::RuntimeException) #define THROWDEF_RTE_IAE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException) #define THROW_IAE throw CSS::lang::IllegalArgumentException() |