Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx (original) +++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx Tue Aug 20 10:48:46 2013 @@ -219,9 +219,13 @@ public: */ sal_Int32 getLength() const SAL_THROW(()) { return pData->length; } +private: /** Returns a pointer to the characters of this string. + NOTE: the implicit cast to a char pointer is obsolete + because it is too dangerous #i123068# + <p>The returned pointer is not guaranteed to point to a null-terminated byte string. Note that this string object may contain embedded null characters, which will thus also be embedded in the returned byte @@ -231,6 +235,13 @@ public: representing the characters of this string object. */ operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; } +public: + /** Returns a reference to a character of this string. */ + sal_Char& operator[]( int n ) { return pData->buffer[n]; } + /** Returns a const reference to a character of this string. */ + const sal_Char& operator[]( int n ) const { return pData->buffer[n]; } + /** Returns a bool indicating whether this string is empty. */ + bool isEmpty() const { return (pData->length == 0); } /** Returns a pointer to the characters of this string.
Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/ustring.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/ustring.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sal/inc/rtl/ustring.hxx (original) +++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/ustring.hxx Tue Aug 20 10:48:46 2013 @@ -274,14 +274,26 @@ public: */ sal_Int32 getLength() const SAL_THROW(()) { return pData->length; } +private: /** Returns a pointer to the Unicode character buffer from this string. + NOTE: the implicit cast to a UTF-16 pointer is obsolete + because it is too dangerous #i123068# + It isn't necessarily NULL terminated. @return a pointer to the Unicode characters buffer from this object. */ operator const sal_Unicode *() const SAL_THROW(()) { return pData->buffer; } +public: + /** Returns a reference to a UTF-16 element of this string. */ + sal_Unicode& operator[]( int n ) { return pData->buffer[n]; } + /** Returns a const reference to a UTF-16 element of this string. */ + const sal_Unicode& operator[]( int n ) const { return pData->buffer[n]; } + /** Returns a bool indicating whether this string is empty. */ + bool isEmpty() const { return (pData->length == 0); } + /** Returns a pointer to the Unicode character buffer from this string. Modified: openoffice/branches/rejuvenate01/main/sax/source/tools/fastserializer.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sax/source/tools/fastserializer.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sax/source/tools/fastserializer.cxx (original) +++ openoffice/branches/rejuvenate01/main/sax/source/tools/fastserializer.cxx Tue Aug 20 10:48:46 2013 @@ -78,7 +78,7 @@ namespace sax_fastparser { OUString FastSaxSerializer::escapeXml( const OUString& s ) { ::rtl::OUStringBuffer sBuf( s.getLength() ); - const sal_Unicode* pStr = s; + const sal_Unicode* pStr = s.getStr(); sal_Int32 nLen = s.getLength(); for( sal_Int32 i = 0; i < nLen; ++i) { Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xecontent.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xecontent.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xecontent.cxx (original) +++ openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xecontent.cxx Tue Aug 20 10:48:46 2013 @@ -526,7 +526,7 @@ void XclExpHyperlink::SaveXml( XclExpXml OUString sId = rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(), XclXmlUtils::ToOUString( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"; ), msTarget, - XclXmlUtils::ToOUString( "External" ) ); + true ); rStrm.GetCurrentStream()->singleElement( XML_hyperlink, XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(), FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xestream.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xestream.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xestream.cxx (original) +++ openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xestream.cxx Tue Aug 20 10:48:46 2013 @@ -961,7 +961,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlSt // OOXTODO: XML_theme, index into <clrScheme/> // OOXTODO: XML_tint, double FSEND ); - lcl_WriteValue( rStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ) ); // Twips->Pt + lcl_WriteValue( rStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Points lcl_WriteValue( rStream, XML_u, bHaveUnderline ? pUnderline : NULL ); lcl_WriteValue( rStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : NULL ); Modified: openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysis.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysis.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysis.cxx (original) +++ openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysis.cxx Tue Aug 20 10:48:46 2013 @@ -158,8 +158,7 @@ void AnalysisAddIn::InitData( void ) delete pResMgr; OString aModName( "analysis" ); - pResMgr = ResMgr::CreateResMgr( ( const sal_Char* ) aModName, - aFuncLoc ); + pResMgr = ResMgr::CreateResMgr( aModName.getStr(), aFuncLoc ); if( pFD ) delete pFD; Modified: openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysishelper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysishelper.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysishelper.cxx (original) +++ openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysishelper.cxx Tue Aug 20 10:48:46 2013 @@ -1844,7 +1844,7 @@ sal_Bool Complex::ParseString( const STR { rCompl.c = '\0'; // do not force a symbol, if only real part present - const sal_Unicode* pStr = ( const sal_Unicode * ) rStr; + const sal_Unicode* pStr = rStr.getStr(); if( IsImagUnit( *pStr ) && rStr.getLength() == 1) { Modified: openoffice/branches/rejuvenate01/main/scaddins/source/datefunc/datefunc.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scaddins/source/datefunc/datefunc.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/scaddins/source/datefunc/datefunc.cxx (original) +++ openoffice/branches/rejuvenate01/main/scaddins/source/datefunc/datefunc.cxx Tue Aug 20 10:48:46 2013 @@ -329,8 +329,7 @@ void ScaDateAddIn::InitData() delete pResMgr; OString aModName( "date" ); - pResMgr = ResMgr::CreateResMgr( (const sal_Char*) aModName, - aFuncLoc ); + pResMgr = ResMgr::CreateResMgr( aModName.getStr(), aFuncLoc ); if( pFuncDataList ) delete pFuncDataList; Modified: openoffice/branches/rejuvenate01/main/sd/source/filter/eppt/epptso.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/filter/eppt/epptso.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sd/source/filter/eppt/epptso.cxx (original) +++ openoffice/branches/rejuvenate01/main/sd/source/filter/eppt/epptso.cxx Tue Aug 20 10:48:46 2013 @@ -4938,7 +4938,7 @@ void PPTWriter::ImplWritePage( const PHL mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom ); *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Title; mpPptEscherEx->AddAtom( mnTextSize << 1, EPP_TextCharsAtom ); - const sal_Unicode* pString = aUString; + const sal_Unicode* pString = aUString.getStr(); for ( sal_uInt32 i = 0; i < mnTextSize; i++ ) { nChar = pString[ i ]; // 0xa -> 0xb weicher Zeilenumbruch Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/unosrch.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/unosrch.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/unosrch.cxx (original) +++ openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/unosrch.cxx Tue Aug 20 10:48:46 2013 @@ -489,7 +489,7 @@ uno::Reference< text::XTextRange > SdUn sal_Int32* pConvertPara = new sal_Int32[nTextLen+2]; int ndbg = 0; - const sal_Unicode* pText = aText; + const sal_Unicode* pText = aText.getStr(); sal_Int32* pPos = pConvertPos; sal_Int32* pPara = pConvertPara; Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sfxuno.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sfxuno.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sfxuno.hxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sfxuno.hxx Tue Aug 20 10:48:46 2013 @@ -105,11 +105,6 @@ bool GetEncryptionData_Impl( const SfxIt #define FrameSearchFlags sal_Int32 -// Macros to convert string -> unicode and unicode -> string. -// We use UTF8 everytime. Its the best way to do this! -#define S2U(STRING) ::rtl::OStringToOUString(STRING, RTL_TEXTENCODING_UTF8) -#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) - // Macro to define const unicode a'la "..." // It's better then "OUString::createFromAscii(...)" !!! #define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) Modified: openoffice/branches/rejuvenate01/main/sfx2/source/appl/app.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/app.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/appl/app.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/app.cxx Tue Aug 20 10:48:46 2013 @@ -553,8 +553,7 @@ short SfxApplication::QuerySave_Impl( Sf ResMgr* SfxApplication::CreateResManager( const char *pPrefix ) { - String aMgrName = String::CreateFromAscii( pPrefix ); - return ResMgr::CreateResMgr(U2S(aMgrName)); + return ResMgr::CreateResMgr( pPrefix); } //--------------------------------------------------------------------- Modified: openoffice/branches/rejuvenate01/main/sfx2/source/appl/appdde.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/appdde.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/appl/appdde.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/appdde.cxx Tue Aug 20 10:48:46 2013 @@ -54,14 +54,14 @@ String SfxDdeServiceName_Impl( const String& sIn ) { - ByteString sTemp = U2S( sIn ); + ByteString sTemp( sIn, RTL_TEXTENCODING_UTF8 ); ByteString sReturn; for ( sal_uInt16 n = sTemp.Len(); n; --n ) if ( sTemp.Copy( n-1, 1 ).IsAlphaNumericAscii() ) sReturn += sTemp.GetChar(n-1); - return S2U( sReturn ); + return String( sReturn, RTL_TEXTENCODING_UTF8 ); } @@ -159,7 +159,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEv } aData.EraseAllChars( 0x0022 ); ApplicationAddress aAddr; - rAppEvent = ApplicationEvent( String(), aAddr, U2S(rEvent), aData ); + rAppEvent = ApplicationEvent( String(), aAddr, ByteString( rEvent, RTL_TEXTENCODING_UTF8), aData ); return sal_True; } } Modified: openoffice/branches/rejuvenate01/main/sfx2/source/appl/sfxhelp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/sfxhelp.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/appl/sfxhelp.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/sfxhelp.cxx Tue Aug 20 10:48:46 2013 @@ -274,7 +274,7 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl ::rtl::OUString aCodedList; if ( pValues[nProp] >>= aCodedList ) { - rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 ); + const rtl::OString aTmp( OUStringToOString( aCodedList, RTL_TEXTENCODING_UTF8 )); sal_Int32 nIndex = 0; do { Modified: openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdownicon.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdownicon.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdownicon.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdownicon.cxx Tue Aug 20 10:48:46 2013 @@ -904,10 +904,10 @@ void ShutdownIcon::SetAutostart( bool bA osl_getThreadTextEncoding() ); OString aShortcutUnx = OUStringToOString( aShortcut, osl_getThreadTextEncoding() ); - if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST)) + if ((0 != symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr())) && (errno == EEXIST)) { - unlink(aShortcutUnx); - symlink(aDesktopFileUnx, aShortcutUnx); + unlink( aShortcutUnx.getStr()); + symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr()); } ShutdownIcon *pIcon = ShutdownIcon::createInstance(); Modified: openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/mieclip.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/mieclip.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/mieclip.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/mieclip.cxx Tue Aug 20 10:48:46 2013 @@ -63,7 +63,7 @@ SvStream* MSE40HTMLClipFormatObj::IsVali else if( sTmp == "EndHTML" ) nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32()); else if( sTmp == "SourceURL" ) - sBaseURL = String(S2U(sLine.Erase( 0, nIndex ))); + sBaseURL = String( sLine.Erase( 0, nIndex ), RTL_TEXTENCODING_UTF8); if( nEnd && nStt && ( sBaseURL.Len() || rStream.Tell() >= nStt )) Modified: openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/sfxhtml.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/sfxhtml.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/sfxhtml.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/sfxhtml.cxx Tue Aug 20 10:48:46 2013 @@ -325,7 +325,7 @@ sal_Bool SfxHTMLParser::FinishFileDownlo sal_Char* pBuffer = sBuffer.AllocBuffer(nLen); aStream.Seek( 0 ); aStream.Read((void*)pBuffer, nLen); - rStr = String( S2U(pBuffer) ); + rStr = String( pBuffer, RTL_TEXTENCODING_UTF8); } delete pDLMedium; Modified: openoffice/branches/rejuvenate01/main/sfx2/source/control/macro.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/control/macro.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/control/macro.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/control/macro.cxx Tue Aug 20 10:48:46 2013 @@ -117,7 +117,7 @@ SfxMacroStatement::SfxMacroStatement bDone( bRequestDone ), pDummy( 0 ) { - // Workaround Recording nicht exportierter Slots (#25386#) + // workaround recording of non-exported slots if ( !rSlot.pName ) return; /* @@ -334,7 +334,7 @@ void SfxMacroStatement::GenerateNameAndA aStatement += '.'; // der Name des Slots ist der Name der Methode / des Properties - aStatement += String::CreateFromAscii(rSlot.pName); + aStatement += String( rtl::OStringToOUString( rSlot.pName, RTL_TEXTENCODING_UTF8)); if ( rSlot.IsMode(SFX_SLOT_METHOD) ) aStatement += DEFINE_CONST_UNICODE("( "); else Modified: openoffice/branches/rejuvenate01/main/sfx2/source/control/msg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/control/msg.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/control/msg.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/control/msg.cxx Tue Aug 20 10:48:46 2013 @@ -65,7 +65,6 @@ sal_uInt16 SfxSlot::GetWhich( const SfxI ::rtl::OUString SfxSlot::GetCommandString() const { - rtl::OString aCmd(GetCommand()); - return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ); + return rtl::OStringToOUString( GetCommand(), RTL_TEXTENCODING_UTF8); } Modified: openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx (original) +++ openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx Tue Aug 20 10:48:46 2013 @@ -1115,7 +1115,7 @@ void SfxShell::SetVerbs(const com::sun:: pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec); pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState); pNewSlot->pType = 0; HACK(SFX_TYPE(SfxVoidItem)) - pNewSlot->pName = U2S(aVerbs[n].VerbName); + pNewSlot->pName = OUStringToOString( aVerbs[n].VerbName, RTL_TEXTENCODING_UTF8).getStr(); // TODO: life time of temp is suspicious!!! pNewSlot->pLinkedSlot = 0; pNewSlot->nArgDefCount = 0; pNewSlot->pFirstArgDef = 0; Modified: openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx (original) +++ openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx Tue Aug 20 10:48:46 2013 @@ -2304,9 +2304,9 @@ IntrospectionAccessStatic_Impl* ImplIntr else { OSL_ENSURE( sal_False, - ::rtl::OString( "Introspection: Property \"" ) + + (::rtl::OString( "Introspection: Property \"" ) + ::rtl::OUStringToOString( aPropName, RTL_TEXTENCODING_ASCII_US ) + - ::rtl::OString( "\" found more than once in PropertySet" ) ); + ::rtl::OString( "\" found more than once in PropertySet" )).getStr() ); } // Count pflegen Modified: openoffice/branches/rejuvenate01/main/svtools/source/edit/texteng.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/edit/texteng.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/edit/texteng.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/edit/texteng.cxx Tue Aug 20 10:48:46 2013 @@ -803,7 +803,7 @@ TextPaM TextEngine::ImpInsertText( sal_U ++nChgPos; xub_StrLen nChgLen = static_cast< xub_StrLen >(nNewLen - nChgPos); - String aChgText( aNewText.copy( nChgPos ), nChgLen ); + String aChgText( aNewText.copy( nChgPos ).getStr(), nChgLen ); // select text from first pos to be changed to current pos TextSelection aSel( TextPaM( aPaM.GetPara(), (sal_uInt16) nChgPos ), aPaM ); Modified: openoffice/branches/rejuvenate01/main/svtools/source/table/cellvalueconversion.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/table/cellvalueconversion.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/table/cellvalueconversion.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/table/cellvalueconversion.cxx Tue Aug 20 10:48:46 2013 @@ -426,7 +426,7 @@ namespace svt ::rtl::OStringBuffer message( "lcl_getValueNormalizer: unsupported type '" ); message.append( ::rtl::OUStringToOString( sTypeName, RTL_TEXTENCODING_ASCII_US ) ); message.append( "'!" ); - OSL_ENSURE( false, message.makeStringAndClear() ); + OSL_ENSURE( false, message.getStr() ); #endif } io_data.aNormalizers[ sTypeName ] = o_formatter; Modified: openoffice/branches/rejuvenate01/main/svtools/source/uno/wizard/unowizard.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/uno/wizard/unowizard.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/uno/wizard/unowizard.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/uno/wizard/unowizard.cxx Tue Aug 20 10:48:46 2013 @@ -217,7 +217,7 @@ namespace svt { namespace uno static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + ::rtl::OUString aTmp( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 )); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx Tue Aug 20 10:48:46 2013 @@ -130,8 +130,8 @@ uno::Reference<XAccessible> // Check wether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) throw lang::IndexOutOfBoundsException ( - ::rtl::OUString::createFromAscii( - "no accessible child with index ") + nIndex, + ::rtl::OUString::createFromAscii( "no accessible child with index ") + + ::rtl::OUString::valueOf( nIndex, 10), mxParent); return GetChild (maVisibleChildren[nIndex],nIndex); Modified: openoffice/branches/rejuvenate01/main/svx/source/fmcomp/fmgridcl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/fmcomp/fmgridcl.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/fmcomp/fmgridcl.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/fmcomp/fmgridcl.cxx Tue Aug 20 10:48:46 2013 @@ -1648,7 +1648,7 @@ void FmGridControl::InitColumnsByModels( Reference< ::com::sun::star::beans::XPropertySet > xCol; ::cppu::extractInterface(xCol, xColumns->getByIndex(i)); - aName = (const sal_Unicode*)::comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL)); + aName = ::comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL)).getStr(); aWidth = xCol->getPropertyValue(FM_PROP_WIDTH); sal_Int32 nWidth = 0; Modified: openoffice/branches/rejuvenate01/main/svx/source/fmcomp/gridcell.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/fmcomp/gridcell.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/fmcomp/gridcell.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/fmcomp/gridcell.cxx Tue Aug 20 10:48:46 2013 @@ -1539,7 +1539,7 @@ String DbFormattedField::GetFormatText(c { // Hier kann ich nicht mit einem double arbeiten, da das Feld mir keines liefern kann. // Also einfach den Text vom ::com::sun::star::util::NumberFormatter in die richtige ::com::sun::star::form::component::Form brinden lassen. - aText = (const sal_Unicode*)_rxField->getString(); + aText = _rxField->getString().getStr(); if (_rxField->wasNull()) return aText; ((FormattedField*)m_pPainter)->SetTextFormatted(aText); @@ -2957,7 +2957,7 @@ sal_Bool DbFilterField::commitControl() { sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos(); if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) ) - aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos]; + aText = m_aValueList.getConstArray()[nPos]; } if (m_aText != aText) Modified: openoffice/branches/rejuvenate01/main/svx/source/form/filtnav.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/form/filtnav.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/form/filtnav.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/form/filtnav.cxx Tue Aug 20 10:48:46 2013 @@ -948,7 +948,7 @@ void FmFilterModel::SetTextForItem(FmFil m_pAdapter->setText(nParentPos, pItem, rText); - if (!rText) + if( rText.isEmpty() ) Remove(pItem); else { Modified: openoffice/branches/rejuvenate01/main/svx/source/form/fmsrcimp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/form/fmsrcimp.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/form/fmsrcimp.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/form/fmsrcimp.cxx Tue Aug 20 10:48:46 2013 @@ -254,7 +254,7 @@ sal_Bool FmSearchEngine::MoveCursor() #if OSL_DEBUG_LEVEL > 0 String sDebugMessage; sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched a DatabaseException ("); - sDebugMessage += (const sal_Unicode*)e.SQLState; + sDebugMessage += e.SQLState.getStr(); sDebugMessage.AppendAscii(") !"); DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); #endif @@ -265,7 +265,7 @@ sal_Bool FmSearchEngine::MoveCursor() #if OSL_DEBUG_LEVEL > 0 UniString sDebugMessage; sDebugMessage.AssignAscii("FmSearchEngine::MoveCursor : catched an Exception ("); - sDebugMessage += (const sal_Unicode*)e.Message; + sDebugMessage += e.Message.getStr(); sDebugMessage.AppendAscii(") !"); DBG_ERROR(ByteString(sDebugMessage, RTL_TEXTENCODING_ASCII_US).GetBuffer()); #endif Modified: openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.hxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.hxx Tue Aug 20 10:48:46 2013 @@ -46,6 +46,9 @@ class SwGrfNode; class SwOLENode; class SwSectionNode; class SwNumRuleTbl; +class SvStream; + +inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); } namespace com { namespace sun { namespace star { namespace frame { class XModel; } Modified: openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfsdrexport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfsdrexport.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfsdrexport.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfsdrexport.cxx Tue Aug 20 10:48:46 2013 @@ -469,7 +469,7 @@ sal_Int32 RtfSdrExport::StartShape() m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE); for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++) - lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second ); + lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first.getStr(), (*i).second ); lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding)); lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding)); Modified: openoffice/branches/rejuvenate01/main/sw/source/filter/xml/xmltbli.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/filter/xml/xmltbli.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/filter/xml/xmltbli.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/filter/xml/xmltbli.cxx Tue Aug 20 10:48:46 2013 @@ -2081,7 +2081,7 @@ SwTableBox *SwXMLTableContext::MakeTable { // set style const SfxItemSet *pAutoItemSet = 0; - if( pCell->GetStartNode() && sStyleName && + if( pCell->GetStartNode() && !sStyleName.isEmpty() && GetSwImport().FindAutomaticStyle( XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) ) { Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh1.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh1.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh1.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh1.cxx Tue Aug 20 10:48:46 2013 @@ -446,7 +446,7 @@ void SwWrtShell::InsertObject( const svt aCmd += pSlot->GetUnoName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( GetWin(), rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ), xStor, &aServerList ); + pFact->CreateInsertObjectDialog( GetWin(), rtl::OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList ); if ( pDlg ) { pDlg->Execute(); Modified: openoffice/branches/rejuvenate01/main/testtools/source/bridgetest/multi.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/testtools/source/bridgetest/multi.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/testtools/source/bridgetest/multi.cxx (original) +++ openoffice/branches/rejuvenate01/main/testtools/source/bridgetest/multi.cxx Tue Aug 20 10:48:46 2013 @@ -34,6 +34,8 @@ #include <sstream> +inline std::ostream& operator<<( std::ostream& s, const rtl::OUString r) { return (s << r.getStr()); } + namespace css = com::sun::star; namespace { Modified: openoffice/branches/rejuvenate01/main/toolkit/source/helper/property.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/helper/property.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/toolkit/source/helper/property.cxx (original) +++ openoffice/branches/rejuvenate01/main/toolkit/source/helper/property.cxx Tue Aug 20 10:48:46 2013 @@ -78,9 +78,9 @@ struct ImplPropertyInfo bDependsOnOthers = sal_False; } - ImplPropertyInfo( const sal_Unicode* pName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType, + ImplPropertyInfo( const rtl::OUString& rName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType, sal_Int16 nAttrs, sal_Bool bDepends = sal_False ) - : aName( pName ) + : aName( rName ) { nPropId = nId; aType = rType; Modified: openoffice/branches/rejuvenate01/main/toolkit/source/layout/vcl/wrapper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/layout/vcl/wrapper.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/toolkit/source/layout/vcl/wrapper.cxx (original) +++ openoffice/branches/rejuvenate01/main/toolkit/source/layout/vcl/wrapper.cxx Tue Aug 20 10:48:46 2013 @@ -152,7 +152,7 @@ PeerHandle Context::GetPeerHandle( const if ( nId != 0 ) { rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId ); - xHandle = GetPeerHandle( aStr, 0 ); + xHandle = GetPeerHandle( aStr.getStr(), 0 ); } return xHandle; } @@ -955,7 +955,7 @@ void MessageBox::init (OUString const& m else noButton.Hide (); } - if (help_id) + if( !help_id.isEmpty()) SetHelpId (help_id); else helpButton.Hide (); Modified: openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h (original) +++ openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h Tue Aug 20 10:48:46 2013 @@ -70,7 +70,7 @@ sMessage += pContext; \ } \ sMessage += "\n"; \ - OSL_ENSURE( false, sMessage ) + OSL_ENSURE( false, sMessage.getStr() ) #else // OSL_DEBUG_LEVEL Modified: openoffice/branches/rejuvenate01/main/tools/source/fsys/tempfile.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/tools/source/fsys/tempfile.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/tools/source/fsys/tempfile.cxx (original) +++ openoffice/branches/rejuvenate01/main/tools/source/fsys/tempfile.cxx Tue Aug 20 10:48:46 2013 @@ -80,7 +80,7 @@ String ConstructTempDir_Impl( const Stri if ( aRet[i-1] == '/' ) i--; - if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None ) + if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None ) aName = aRet; } } Modified: openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/DAVProperties.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/DAVProperties.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/DAVProperties.cxx (original) +++ openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/DAVProperties.cxx Tue Aug 20 10:48:46 2013 @@ -66,7 +66,7 @@ void DAVProperties::createSerfPropName( rName.name = strdup( rtl::OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), - RTL_TEXTENCODING_UTF8 ) ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "http://apache.org/dav/props/"; ) ) == 0 ) @@ -77,7 +77,7 @@ void DAVProperties::createSerfPropName( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/"; ) ), - RTL_TEXTENCODING_UTF8 ) ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "http://ucb.openoffice.org/dav/props/"; ) ) == 0 ) @@ -88,7 +88,7 @@ void DAVProperties::createSerfPropName( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/"; ) ), - RTL_TEXTENCODING_UTF8 ) ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "<prop:" ) ) == 0 ) @@ -102,11 +102,11 @@ void DAVProperties::createSerfPropName( sal_Int32 nStart = RTL_CONSTASCII_LENGTH( "<prop:" ); sal_Int32 nLen = aFullName.indexOf( ' ' ) - nStart; - rName.name = strdup( aFullName.copy( nStart, nLen ) ); + rName.name = strdup( aFullName.copy( nStart, nLen ).getStr() ); nStart = aFullName.indexOf( '=', nStart + nLen ) + 2; // after =" nLen = aFullName.getLength() - RTL_CONSTASCII_LENGTH( "\">" ) - nStart; - rName.nspace = strdup( aFullName.copy( nStart, nLen ) ); + rName.nspace = strdup( aFullName.copy( nStart, nLen ).getStr() ); } else { @@ -114,7 +114,7 @@ void DAVProperties::createSerfPropName( rName.nspace = "http://ucb.openoffice.org/dav/props/";; rName.name = strdup( rtl::OUStringToOString( rFullName, - RTL_TEXTENCODING_UTF8 ) ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } } Modified: openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx (original) +++ openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx Tue Aug 20 10:48:46 2013 @@ -55,7 +55,7 @@ SerfRequestProcessor::SerfRequestProcess , mbHandleSerfResponseCalled( false ) { mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); } SerfRequestProcessor::~SerfRequestProcessor() @@ -214,9 +214,9 @@ bool SerfRequestProcessor::processPost( apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -238,9 +238,9 @@ bool SerfRequestProcessor::processPost( apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -279,7 +279,7 @@ bool SerfRequestProcessor::processCopy( apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = createCopyReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -295,7 +295,7 @@ bool SerfRequestProcessor::processMove( apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = createMoveReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, Modified: openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfSession.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfSession.cxx (original) +++ openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfSession.cxx Tue Aug 20 10:48:46 2013 @@ -163,7 +163,7 @@ void SerfSession::Init() { apr_sockaddr_t *proxy_address = NULL; status = apr_sockaddr_info_get( &proxy_address, - rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), + rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), APR_UNSPEC, static_cast<apr_port_t>(m_nProxyPort), 0, getAprPool() ); @@ -339,8 +339,8 @@ apr_status_t SerfSession::provideSerfCre if ( theRetVal == 0 ) { - *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); - *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); + *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); } return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS; Modified: openoffice/branches/rejuvenate01/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx (original) +++ openoffice/branches/rejuvenate01/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx Tue Aug 20 10:48:46 2013 @@ -32,6 +32,8 @@ #include <hash_set> #include <map> +inline std::ostream& operator<<( std::ostream& s, const rtl::OString r) { return (s << r.getStr()); } + namespace skeletonmaker { typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >, Modified: openoffice/branches/rejuvenate01/main/unotools/source/ucbhelper/tempfile.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/unotools/source/ucbhelper/tempfile.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/unotools/source/ucbhelper/tempfile.cxx (original) +++ openoffice/branches/rejuvenate01/main/unotools/source/ucbhelper/tempfile.cxx Tue Aug 20 10:48:46 2013 @@ -156,7 +156,7 @@ String ConstructTempDir_Impl( const Stri if ( aRet[i-1] == '/' ) i--; - if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None ) + if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None ) aName = aRet; } } Modified: openoffice/branches/rejuvenate01/main/unoxml/source/dom/characterdata.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/unoxml/source/dom/characterdata.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/unoxml/source/dom/characterdata.cxx (original) +++ openoffice/branches/rejuvenate01/main/unoxml/source/dom/characterdata.cxx Tue Aug 20 10:48:46 2013 @@ -89,7 +89,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -160,7 +160,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8); if (offset > tmp.getLength() || offset < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -195,7 +195,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8); if (offset > tmp.getLength() || offset < 0 || count < 0){ DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -250,7 +250,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; Modified: openoffice/branches/rejuvenate01/main/vcl/source/control/edit.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/control/edit.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/control/edit.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/control/edit.cxx Tue Aug 20 10:48:46 2013 @@ -954,7 +954,7 @@ void Edit::ImplInsertText( const XubStri ++nChgPos; xub_StrLen nChgLen = static_cast< xub_StrLen >( nTmpLen - nChgPos ); - String aChgText( aTmpText.copy( nChgPos ), nChgLen ); + String aChgText( aTmpText.copy( nChgPos ).getStr(), nChgLen ); // remove text from first pos to be changed to current pos maText.Erase( static_cast< xub_StrLen >( nChgPos ), static_cast< xub_StrLen >( nTmpPos - nChgPos ) ); Modified: openoffice/branches/rejuvenate01/main/vos/source/module.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vos/source/module.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vos/source/module.cxx (original) +++ openoffice/branches/rejuvenate01/main/vos/source/module.cxx Tue Aug 20 10:48:46 2013 @@ -39,7 +39,7 @@ OModule::OModule() OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0) { - if (ustrModuleName) + if( !ustrModuleName.isEmpty()) load(ustrModuleName, nRtldMode); } @@ -51,7 +51,7 @@ OModule::~OModule() sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) { - VOS_ASSERT(ustrModuleName); + VOS_ASSERT( !ustrModuleName.isEmpty()); unload(); @@ -76,7 +76,7 @@ sal_Bool OModule::isLoaded() void *OModule::getSymbol(const rtl::OUString& strSymbolName) { - VOS_ASSERT(strSymbolName); + VOS_ASSERT( !strSymbolName.isEmpty()); VOS_ASSERT(m_Module); return ( osl_getSymbol( m_Module, strSymbolName.pData ) ); } Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx (original) +++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx Tue Aug 20 10:48:46 2013 @@ -363,7 +363,7 @@ void SectionPropertyMap::SetPageStyleNa for( sal_Int32 nStyle = 0; nStyle < rPageStyleNames.getLength(); ++nStyle) { if( pStyleNames[nStyle].getLength() > nDefaultLength && - !rtl_ustr_compare_WithLength( sDefaultStyle, nDefaultLength, pStyleNames[nStyle], nDefaultLength)) + !rtl_ustr_compare_WithLength( sDefaultStyle.getStr(), nDefaultLength, pStyleNames[nStyle].getStr(), nDefaultLength)) { sal_Int32 nIndex = pStyleNames[nStyle].copy( nDefaultLength ).toInt32(); if( nIndex > nMaxIndex) Modified: openoffice/branches/rejuvenate01/main/xmloff/source/core/DocumentSettingsContext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmloff/source/core/DocumentSettingsContext.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmloff/source/core/DocumentSettingsContext.cxx (original) +++ openoffice/branches/rejuvenate01/main/xmloff/source/core/DocumentSettingsContext.cxx Tue Aug 20 10:48:46 2013 @@ -600,7 +600,7 @@ void XMLConfigItemContext::Characters( c if( sTrimmedChars.getLength() ) { rtl::OUString sChars; - if( msValue ) + if( !msValue.isEmpty() ) { sChars = msValue; sChars += sTrimmedChars; Modified: openoffice/branches/rejuvenate01/main/xmloff/source/core/XMLBase64ImportContext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmloff/source/core/XMLBase64ImportContext.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmloff/source/core/XMLBase64ImportContext.cxx (original) +++ openoffice/branches/rejuvenate01/main/xmloff/source/core/XMLBase64ImportContext.cxx Tue Aug 20 10:48:46 2013 @@ -65,7 +65,7 @@ void XMLBase64ImportContext::Characters( if( sTrimmedChars.getLength() ) { OUString sChars; - if( sBase64CharsLeft ) + if( !sBase64CharsLeft.isEmpty() ) { sChars = sBase64CharsLeft; sChars += sTrimmedChars; Modified: openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpstyl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpstyl.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpstyl.cxx (original) +++ openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpstyl.cxx Tue Aug 20 10:48:46 2013 @@ -1306,7 +1306,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 Modified: openoffice/branches/rejuvenate01/main/xmloff/source/text/XMLTextFrameContext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmloff/source/text/XMLTextFrameContext.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmloff/source/text/XMLTextFrameContext.cxx (original) +++ openoffice/branches/rejuvenate01/main/xmloff/source/text/XMLTextFrameContext.cxx Tue Aug 20 10:48:46 2013 @@ -1211,7 +1211,7 @@ void XMLTextFrameContext_Impl::Character if( bOwnBase64Stream && xBase64Stream.is() ) { OUString sChars; - if( sBase64CharsLeft ) + if( !sBase64CharsLeft.isEmpty() ) { sChars = sBase64CharsLeft; sChars += sTrimmedChars;
