diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /dbaccess | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 6e9774c72acc..c192947b4880 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1142,7 +1142,7 @@ namespace { ::com::sun::star::util::URL aURL; aURL.Complete = "vnd.sun.star.help://" + - _sModuleName + "/" + OUString::fromUtf8(sHelpId); + _sModuleName + "/" + OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); OUString sAnchor; OUString sTempURL = aURL.Complete; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 19abbe0e82bd..5bb7a8d7c443 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -3421,7 +3421,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p OUString sFunctionName = pFunctionName->getTokenValue(); if ( sFunctionName.isEmpty() ) - sFunctionName = OUString::fromUtf8(OSQLParser::TokenIDToStr(pFunctionName->getTokenID())); + sFunctionName = OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); nDataType = OSQLParser::getFunctionReturnType( sFunctionName diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 0c097fdea1ba..1f4c2eaae461 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -191,7 +191,8 @@ void OSelectionBrowseBox::initialize() for (size_t i = 0; i < sizeof (eFunctions) / sizeof (eFunctions[0]); ++i) { m_aFunctionStrings += ";"; - m_aFunctionStrings += OUString::fromUtf8(rContext.getIntlKeywordAscii(eFunctions[i])); + m_aFunctionStrings += OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), + RTL_TEXTENCODING_UTF8); } m_aFunctionStrings += ";"; m_aFunctionStrings += sGroup; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 693406b0d711..3d78dee5f153 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -170,7 +170,7 @@ namespace dbaui { rString += "SQL_KEYWORD:"; OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID()); - rString += OUString::fromUtf8(sT); + rString += OStringToOUString(sT, RTL_TEXTENCODING_UTF8); break;} case SQL_NODE_COMPARISON: |