diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-06 07:45:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-06 13:51:10 +0200 |
| commit | 05050cdb23de586870bf479a9df5ced06828d498 (patch) | |
| tree | a34c3bba9a921a5e9abf23d5757c15dfaea0ceac /dbaccess | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
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, 4 insertions, 5 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index c192947b4880..6e9774c72acc 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 + "/" + OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); + _sModuleName + "/" + OUString::fromUtf8(sHelpId); OUString sAnchor; OUString sTempURL = aURL.Complete; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 5bb7a8d7c443..19abbe0e82bd 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 = OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); + sFunctionName = OUString::fromUtf8(OSQLParser::TokenIDToStr(pFunctionName->getTokenID())); nDataType = OSQLParser::getFunctionReturnType( sFunctionName diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 1f4c2eaae461..0c097fdea1ba 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -191,8 +191,7 @@ void OSelectionBrowseBox::initialize() for (size_t i = 0; i < sizeof (eFunctions) / sizeof (eFunctions[0]); ++i) { m_aFunctionStrings += ";"; - m_aFunctionStrings += OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), - RTL_TEXTENCODING_UTF8); + m_aFunctionStrings += OUString::fromUtf8(rContext.getIntlKeywordAscii(eFunctions[i])); } m_aFunctionStrings += ";"; m_aFunctionStrings += sGroup; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 3d78dee5f153..693406b0d711 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 += OStringToOUString(sT, RTL_TEXTENCODING_UTF8); + rString += OUString::fromUtf8(sT); break;} case SQL_NODE_COMPARISON: |