diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:05:15 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:05:15 +0000 |
| commit | 3177f87445a8b0ffe7213907054e8e7d009ab6ce (patch) | |
| tree | 0c6115ea05c031a1f9931bbc4b8a4f40d2e97e90 /dbaccess/source/ui/querydesign/QueryDesignView.cxx | |
| parent | a5cac0c3bd8d918aab4545439072c9598b685eac (diff) | |
INTEGRATION: CWS geordi2q01 (1.61.40); FILE MERGED
2003/08/18 14:15:02 hr 1.61.40.1: #111861#: join changes from CWS oj01parser
Diffstat (limited to 'dbaccess/source/ui/querydesign/QueryDesignView.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index bc0e86fb7..8f6d75876 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: vg $ $Date: 2003-06-12 10:19:45 $ + * last change: $Author: hjs $ $Date: 2003-08-18 15:05:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -739,7 +739,7 @@ namespace if ( pEntryField->isAggreateFunction() ) { DBG_ASSERT(pEntryField->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-("); - ::rtl::OUString aTmpStr2(pEntryField->GetFunction()); + ::rtl::OUString aTmpStr2( pEntryField->GetFunction()); aTmpStr2 += ::rtl::OUString('('); aTmpStr2 += aTmpStr; aTmpStr2 += ::rtl::OUString(')'); @@ -2071,7 +2071,7 @@ namespace ::rtl::OUString sFunctionName = pFunctionName->getTokenValue(); if ( !sFunctionName.getLength() ) - sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_MS_1252); + sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); nDataType = OSQLParser::getFunctionReturnType( sFunctionName |