diff options
| -rw-r--r-- | connectivity/source/commontools/CommonTools.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/core/DocumentSettingsContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/XMLBase64ImportContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index ce1c6d1589f9..43c89fb56cfd 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -285,7 +285,7 @@ namespace connectivity { ::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); sClassName = sClassName.replace('.','/'); - jobject out = pEnv->FindClass(sClassName); + jobject out = pEnv->FindClass(sClassName.getStr()); bRet = out != NULL; pEnv->DeleteLocalRef( out ); } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 1c524d8c23d9..9ccad33c6c4a 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1582,7 +1582,7 @@ OSQLParseNode::OSQLParseNode(const ::rtl::OString &_rNewValue, SQLNodeType eNewNodeType, sal_uInt32 nNewNodeID) :m_pParent(NULL) - ,m_aNodeValue(_rNewValue,_rNewValue.getLength(),RTL_TEXTENCODING_UTF8) + ,m_aNodeValue(rtl::OStringToOUString(_rNewValue,RTL_TEXTENCODING_UTF8)) ,m_eNodeType(eNewNodeType) ,m_nNodeID(nNewNodeID) { @@ -2471,7 +2471,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode rString.appendAscii(" "); const ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, &rParam.m_rContext); - rString.append(::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8)); + rString.append(::rtl::OStringToOUString(sT,RTL_TEXTENCODING_UTF8)); } break; case SQL_NODE_STRING: if (rString.getLength()) @@ -2556,7 +2556,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode sal_Int32 OSQLParser::getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext) { sal_Int32 nType = DataType::VARCHAR; - ::rtl::OString sFunctionName(_sFunctionName,_sFunctionName.getLength(),RTL_TEXTENCODING_UTF8); + ::rtl::OString sFunctionName(::rtl::OUStringToOString(_sFunctionName,RTL_TEXTENCODING_UTF8)); if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ASCII,pContext))) nType = DataType::INTEGER; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_BIT_LENGTH,pContext))) nType = DataType::INTEGER; diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index d901958a834b..6d0af79da2fc 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -599,7 +599,7 @@ void XMLConfigItemContext::Characters( const ::rtl::OUString& rChars ) if( sTrimmedChars.getLength() ) { rtl::OUString sChars; - if( msValue ) + if( msValue.getLength() ) { sChars = msValue; sChars += sTrimmedChars; diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index 2db267ab205c..132a8cc24077 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -70,7 +70,7 @@ void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars ) if( sTrimmedChars.getLength() ) { OUString sChars; - if( sBase64CharsLeft ) + if( sBase64CharsLeft.getLength() ) { sChars = sBase64CharsLeft; sChars += sTrimmedChars; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index b848f721a862..e9bd91d34529 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1276,7 +1276,7 @@ void SdXMLStylesContext::EndElement() // void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const { - UniString sPrefix(rMaster.GetDisplayName(), (sal_uInt16)rMaster.GetDisplayName().getLength()); + UniString sPrefix(rMaster.GetDisplayName()); sPrefix += sal_Unicode('-'); if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName())) try diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index f86d2b791d00..81e10c3567c6 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -1207,7 +1207,7 @@ void XMLTextFrameContext_Impl::Characters( const OUString& rChars ) if( bOwnBase64Stream && xBase64Stream.is() ) { OUString sChars; - if( sBase64CharsLeft ) + if( sBase64CharsLeft.getLength() ) { sChars = sBase64CharsLeft; sChars += sTrimmedChars; |