openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1515767 [1/2] - in /openoffice/branches/rejuvenate01/main: basegfx/source/tools/ comphelper/source/misc/ connectivity/inc/connectivity/ connectivity/source/commontools/ connectivity/source/drivers/adabas/ connectivity/source/drivers/jdbc/ ...
Date Tue, 20 Aug 2013 10:48:48 GMT
Author: hdu
Date: Tue Aug 20 10:48:46 2013
New Revision: 1515767

URL: http://svn.apache.org/r1515767
Log:
#i123068# remove implicit conversions from rtl strings to their elements

Modified:
    openoffice/branches/rejuvenate01/main/basegfx/source/tools/debugplotter.cxx
    openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
    openoffice/branches/rejuvenate01/main/comphelper/source/misc/namedvaluecollection.cxx
    openoffice/branches/rejuvenate01/main/connectivity/inc/connectivity/CommonTools.hxx
    openoffice/branches/rejuvenate01/main/connectivity/source/commontools/CommonTools.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BConnection.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BDriver.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/drivers/jdbc/Class.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
    openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlflex.l
    openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlnode.cxx
    openoffice/branches/rejuvenate01/main/cui/source/dialogs/showcols.cxx
    openoffice/branches/rejuvenate01/main/cui/source/factory/dlgfact.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/core/recovery/dbdocrecovery.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/brwctrlr.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/exsrcbrw.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/TokenWriter.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/UITools.cxx
    openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/querycontroller.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/app/appfirststart.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
    openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
    openoffice/branches/rejuvenate01/main/dtrans/source/cnttype/mcnttype.cxx
    openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/bibliography/general.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/logging/filehandler.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/pcrcommon.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx
    openoffice/branches/rejuvenate01/main/extensions/source/update/check/updatecheckconfig.cxx
    openoffice/branches/rejuvenate01/main/filter/source/msfilter/eschesdo.hxx
    openoffice/branches/rejuvenate01/main/forms/source/misc/services.cxx
    openoffice/branches/rejuvenate01/main/fpicker/source/aqua/FilterHelper.cxx
    openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/assertion.hxx
    openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/logmechanism.hxx
    openoffice/branches/rejuvenate01/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
    openoffice/branches/rejuvenate01/main/framework/source/services/license.cxx
    openoffice/branches/rejuvenate01/main/framework/source/uielement/controlmenucontroller.cxx
    openoffice/branches/rejuvenate01/main/i18npool/source/indexentry/indexentrysupplier_default.cxx
    openoffice/branches/rejuvenate01/main/i18npool/source/localedata/saxparser.cxx
    openoffice/branches/rejuvenate01/main/idlc/source/idlccompile.cxx
    openoffice/branches/rejuvenate01/main/package/source/xstor/owriteablestream.cxx
    openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx
    openoffice/branches/rejuvenate01/main/rdbmaker/source/codemaker/global.cxx
    openoffice/branches/rejuvenate01/main/registry/source/regimpl.cxx
    openoffice/branches/rejuvenate01/main/registry/tools/checksingleton.cxx
    openoffice/branches/rejuvenate01/main/reportdesign/source/core/resource/core_resource.cxx
    openoffice/branches/rejuvenate01/main/reportdesign/source/core/sdr/ModuleHelper.cxx
    openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
    openoffice/branches/rejuvenate01/main/reportdesign/source/ui/inspection/DefaultInspection.cxx
    openoffice/branches/rejuvenate01/main/rsc/inc/rscerror.h
    openoffice/branches/rejuvenate01/main/rsc/source/parser/rscdb.cxx
    openoffice/branches/rejuvenate01/main/sal/inc/osl/profile.hxx
    openoffice/branches/rejuvenate01/main/sal/inc/rtl/locale.hxx
    openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
    openoffice/branches/rejuvenate01/main/sal/inc/rtl/ustring.hxx
    openoffice/branches/rejuvenate01/main/sax/source/tools/fastserializer.cxx
    openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xecontent.cxx
    openoffice/branches/rejuvenate01/main/sc/source/filter/excel/xestream.cxx
    openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysis.cxx
    openoffice/branches/rejuvenate01/main/scaddins/source/analysis/analysishelper.cxx
    openoffice/branches/rejuvenate01/main/scaddins/source/datefunc/datefunc.cxx
    openoffice/branches/rejuvenate01/main/sd/source/filter/eppt/epptso.cxx
    openoffice/branches/rejuvenate01/main/sd/source/ui/unoidl/unosrch.cxx
    openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sfxuno.hxx
    openoffice/branches/rejuvenate01/main/sfx2/source/appl/app.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/appl/appdde.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/appl/sfxhelp.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdownicon.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/mieclip.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/bastyp/sfxhtml.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/control/macro.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/control/msg.cxx
    openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx
    openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/edit/texteng.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/table/cellvalueconversion.cxx
    openoffice/branches/rejuvenate01/main/svtools/source/uno/wizard/unowizard.cxx
    openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx
    openoffice/branches/rejuvenate01/main/svx/source/fmcomp/fmgridcl.cxx
    openoffice/branches/rejuvenate01/main/svx/source/fmcomp/gridcell.cxx
    openoffice/branches/rejuvenate01/main/svx/source/form/filtnav.cxx
    openoffice/branches/rejuvenate01/main/svx/source/form/fmsrcimp.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfexport.hxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/ww8/rtfsdrexport.cxx
    openoffice/branches/rejuvenate01/main/sw/source/filter/xml/xmltbli.cxx
    openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh1.cxx
    openoffice/branches/rejuvenate01/main/testtools/source/bridgetest/multi.cxx
    openoffice/branches/rejuvenate01/main/toolkit/source/helper/property.cxx
    openoffice/branches/rejuvenate01/main/toolkit/source/layout/vcl/wrapper.cxx
    openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h
    openoffice/branches/rejuvenate01/main/tools/source/fsys/tempfile.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/DAVProperties.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
    openoffice/branches/rejuvenate01/main/ucb/source/ucp/webdav/SerfSession.cxx
    openoffice/branches/rejuvenate01/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx
    openoffice/branches/rejuvenate01/main/unotools/source/ucbhelper/tempfile.cxx
    openoffice/branches/rejuvenate01/main/unoxml/source/dom/characterdata.cxx
    openoffice/branches/rejuvenate01/main/vcl/source/control/edit.cxx
    openoffice/branches/rejuvenate01/main/vos/source/module.cxx
    openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/PropertyMap.cxx
    openoffice/branches/rejuvenate01/main/xmloff/source/core/DocumentSettingsContext.cxx
    openoffice/branches/rejuvenate01/main/xmloff/source/core/XMLBase64ImportContext.cxx
    openoffice/branches/rejuvenate01/main/xmloff/source/draw/ximpstyl.cxx
    openoffice/branches/rejuvenate01/main/xmloff/source/text/XMLTextFrameContext.cxx

Modified: openoffice/branches/rejuvenate01/main/basegfx/source/tools/debugplotter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/basegfx/source/tools/debugplotter.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/basegfx/source/tools/debugplotter.cxx (original)
+++ openoffice/branches/rejuvenate01/main/basegfx/source/tools/debugplotter.cxx Tue Aug 20 10:48:46 2013
@@ -45,7 +45,7 @@ namespace basegfx
                     "#" << ::std::endl <<
                     "# automatically generated by basegfx, don't change!" << ::std::endl <<
                     "#" << ::std::endl <<
-                    "#   --- " << (const sal_Char*)rTitle << " ---" << ::std::endl <<
+                    "#   --- " << rTitle.getStr() << " ---" << ::std::endl <<
                     "#" << ::std::endl <<
                     "set parametric" << ::std::endl <<
                     "# set terminal postscript eps enhanced color " << ::std::endl <<
@@ -106,7 +106,7 @@ namespace basegfx
                            "pointmarkx(c,t) = c-0.03*t\n",										 // hack for displaying single points in parametric form
                            "pointmarky(c,t) = c+0.03*t\n",										 // hack for displaying single points in parametric form
                            "# end of setup\n",
-                           (const sal_Char*)rTitle );
+                           rTitle.getStr() );
             }
         }
 
@@ -276,10 +276,10 @@ namespace basegfx
                         
                         if( mpOutputStream )
                             *mpOutputStream << " '-' using ($1):($2) title \"Polygon "
-                                            << (const sal_Char*)maPolygons.at(i).second << "\" with lp";
+                                            << maPolygons.at(i).second.getStr() << "\" with lp";
                         else
                             OSL_TRACE( " '-' using ($1):($2) title \"Polygon %s\" with lp",
-                                       (const sal_Char*)maPolygons.at(i).second );
+                                       maPolygons.at(i).second.getStr() );
 
                         bNeedColon = true;
                     }

Modified: openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx (original)
+++ openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx Tue Aug 20 10:48:46 2013
@@ -182,7 +182,7 @@ namespace comphelper {
             sMessage += "\nin function:\n";
             sMessage += BOOST_CURRENT_FUNCTION;
             sMessage += "\n";
-	        OSL_ENSURE( false, sMessage );
+	        OSL_ENSURE( false, sMessage.getStr() );
 	    }
 
         return sTitle;

Modified: openoffice/branches/rejuvenate01/main/comphelper/source/misc/namedvaluecollection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/comphelper/source/misc/namedvaluecollection.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/comphelper/source/misc/namedvaluecollection.cxx (original)
+++ openoffice/branches/rejuvenate01/main/comphelper/source/misc/namedvaluecollection.cxx Tue Aug 20 10:48:46 2013
@@ -222,7 +222,7 @@ namespace comphelper
                 ::rtl::OStringBuffer message;
                 message.append( "NamedValueCollection::impl_assign: encountered a value type which I cannot handle:\n" );
                 message.append( ::rtl::OUStringToOString( pArgument->getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) );
-                OSL_ENSURE( false, message.makeStringAndClear() );
+                OSL_ENSURE( false, message.getStr() );
             }
 #endif
         }

Modified: openoffice/branches/rejuvenate01/main/connectivity/inc/connectivity/CommonTools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/inc/connectivity/CommonTools.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/inc/connectivity/CommonTools.hxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/inc/connectivity/CommonTools.hxx Tue Aug 20 10:48:46 2013
@@ -49,6 +49,10 @@ namespace connectivity
 {
 	//------------------------------------------------------------------------------
 	OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape);
+	inline sal_Bool match( const rtl::OUString& rWild, const sal_Unicode* pStr, sal_Unicode cEscape)
+		{ return match( rWild.getStr(), pStr, cEscape); }
+	inline sal_Bool match( const rtl::OUString& rWild, const rtl::OUString& rStr, sal_Unicode cEscape)
+		{ return match( rWild, rStr.getStr(), cEscape); }
 	//------------------------------------------------------------------------------
 	OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const ::com::sun::star::uno::Any& rValue);
 	OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate);

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/commontools/CommonTools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/commontools/CommonTools.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/commontools/CommonTools.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/commontools/CommonTools.cxx Tue Aug 20 10:48:46 2013
@@ -280,7 +280,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 );
 			}

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx Tue Aug 20 10:48:46 2013
@@ -617,9 +617,9 @@ namespace dbtools
 					catch( const Exception& )
 					{
 						OSL_ENSURE( sal_False,
-								    ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+								    (::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
 								+=	::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
-                                +=  ::rtl::OString( " could not be filled!" ) );
+                                +=  ::rtl::OString( " could not be filled!" )).getStr() );
 					}
                 }
 			}

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BConnection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BConnection.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BConnection.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BConnection.cxx Tue Aug 20 10:48:46 2013
@@ -108,8 +108,8 @@ SQLRETURN OAdabasConnection::Construct( 
 	}
 	m_sUser = aUID;
 
-	if ( sHostName.getLength() )
-		aDSN = sHostName + ':' + aDSN;
+	if( !sHostName.isEmpty() )
+		aDSN = sHostName + ::rtl::OUString::createFromAscii(":") + aDSN;
 	SQLRETURN nSQLRETURN = openConnectionWithAuth(aDSN,nTimeout, aUID,aPWD);
 
 	return nSQLRETURN;

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BDriver.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BDriver.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BDriver.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/drivers/adabas/BDriver.cxx Tue Aug 20 10:48:46 2013
@@ -44,6 +44,9 @@
 #include <memory>
 #include <sys/stat.h>
 
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+inline SvStream& operator<<( SvStream& s, const rtl::OUString r) { return (s << ::rtl::OUStringToOString(r,gsl_getSystemTextEncoding())); }
+
 #if defined(UNX)
 const char sNewLine = '\012';
 #else
@@ -959,7 +962,7 @@ void ODriver::createDb( const TDatabaseS
 		{
 			::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(aInitFile.GetURL(),STREAM_WRITE) );
 			(*pFileStream)	<< "ALTER USER \""
-							<< ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+							<< _aInfo.sSysUser
 							<< "\" NOT EXCLUSIVE "
 							<< sNewLine;
 			pFileStream->Flush();
@@ -989,13 +992,13 @@ int ODriver::X_PARAM(const ::rtl::OUStri
 						<< ".exe"
 #endif
 						<< " -d "
-						<< ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _DBNAME
 						<< " -u "
-						<< ::rtl::OString(_USR,_USR.getLength(),gsl_getSystemTextEncoding())
+						<< _USR
 						<< ","
-						<< ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
+						<< _PWD
 						<< " "
-						<< ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
+						<< _CMD
 #if defined(WNT)
 #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
 						<< " >> %DBWORK%\\create.log 2>&1"
@@ -1197,15 +1200,15 @@ void ODriver::XUTIL(const ::rtl::OUStrin
 							"utility"
 #endif
 						<< " -u "
-						<< ::rtl::OString(_USRNAME,_USRNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _USRNAME
 						<< ","
-						<< ::rtl::OString(_USRPWD,_USRPWD.getLength(),gsl_getSystemTextEncoding())
+						<< _USRPWD
 						<< " -d "
-						<< ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _DBNAME
 						<< " "
-						<< ::rtl::OString(_rParam,_rParam.getLength(),gsl_getSystemTextEncoding())
+						<< _rParam
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< " 2>&1"
 						<< sNewLine;
 		pFileStream->Flush();
@@ -1248,20 +1251,20 @@ void ODriver::LoadBatch(const ::rtl::OUS
 						<< ".exe"
 #endif
 						<< " -d "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " -u "
-						<< ::rtl::OString(_rUSR,_rUSR.getLength(),gsl_getSystemTextEncoding())
+						<< _rUSR
 						<< ","
-						<< ::rtl::OString(_rPWD,_rPWD.getLength(),gsl_getSystemTextEncoding());
+						<< _rPWD;
 						
 		if ( !isKernelVersion(CURRENT_DB_VERSION) )
 			(*pFileStream) << " -S adabas -b ";
 		else
 			(*pFileStream) << " -S NATIVE -b ";
 
-		(*pFileStream)	<< ::rtl::OString(_rBatch,_rBatch.getLength(),gsl_getSystemTextEncoding())
+		(*pFileStream)	<< _rBatch
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< " 2>&1"
 						<< sNewLine;
 
@@ -1378,7 +1381,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sSysDevSpace,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 		(*pFileStream) << "\n* log devspace size:\n";
 		(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nLogSize);
@@ -1386,7 +1389,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sTransLogName,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 		(*pFileStream) << "\n* data devspace size:\n";
 		(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nDataSize);
@@ -1394,7 +1397,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sDataDevName,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 
 		(*pFileStream) << "\n* END INIT CONFIG\n";
@@ -1405,7 +1408,7 @@ void ODriver::fillEnvironmentVariables()
 			{
 				String sTemp;
 				LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sBackupFile,sTemp);
-				(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+				(*pFileStream) << sTemp;
 			}
 			(*pFileStream) << "' BLOCKSIZE 8\n";
 			(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1415,9 +1418,9 @@ void ODriver::fillEnvironmentVariables()
 		else
 		{
 			(*pFileStream) << "ACTIVATE SERVERDB SYSDBA \"";
-			(*pFileStream) << ::rtl::OString(_aDBInfo.sSysUser,_aDBInfo.sSysUser.getLength(),gsl_getSystemTextEncoding());
+			(*pFileStream) << _aDBInfo.sSysUser;
 			(*pFileStream) << "\" PASSWORD \"";
-			(*pFileStream) << ::rtl::OString(_aDBInfo.sSysPassword,_aDBInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding());
+			(*pFileStream) << _aDBInfo.sSysPassword;
 			(*pFileStream) << "\"\n";
 		}
 		(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1441,11 +1444,11 @@ void ODriver::X_CONS(const ::rtl::OUStri
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " SHOW "
 						<< _ACTION
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 		pFileStream->Flush();
 	}
@@ -1524,9 +1527,9 @@ sal_Bool ODriver::isVersion(const ::rtl:
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " KERNELVERSION > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1574,9 +1577,9 @@ void ODriver::checkAndInsertNewDevSpace(
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " DATA_CACHE_PAGES > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1621,7 +1624,7 @@ sal_Bool ODriver::isKernelVersion(const 
 
 		(*pFileStream)	<< "dbversion"
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1731,13 +1734,13 @@ void ODriver::installSystemTables(	const
 		pFileStream->Seek(STREAM_SEEK_TO_END);
 		(*pFileStream)	<< "x_dbinst"
 						<< " -d "
-						<< ::rtl::OString(_aInfo.sDBName,_aInfo.sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sDBName
 						<< " -u "
-						<< ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sSysUser
 						<< ","
-						<< ::rtl::OString(_aInfo.sSysPassword,_aInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sSysPassword
 						<< " -w "
-						<< ::rtl::OString(_aInfo.sDomainPassword,_aInfo.sDomainPassword.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sDomainPassword
 						<< " -b ";
 
 		if ( isKernelVersion(ADABAS_KERNEL_11) )

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/drivers/jdbc/Class.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/jdbc/Class.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/drivers/jdbc/Class.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/drivers/jdbc/Class.cxx Tue Aug 20 10:48:46 2013
@@ -53,7 +53,7 @@ java_lang_Class * java_lang_Class::forNa
 	{
 		::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
 		sClassName = sClassName.replace('.','/');
-		out = t.pEnv->FindClass(sClassName);
+		out = t.pEnv->FindClass( sClassName.getStr());
 		ThrowSQLException(t.pEnv,0);
 	} //t.pEnv
 	// ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx Tue Aug 20 10:48:46 2013
@@ -79,7 +79,7 @@ namespace
 
             if ( !_rFunction )
             {   // did not find the symbol
-                OSL_ENSURE( false, ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
+                OSL_ENSURE( false, (::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName )).getStr() );
                 osl_unloadModule( _rModule );
                 _rModule = NULL;
             }

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx Tue Aug 20 10:48:46 2013
@@ -879,7 +879,7 @@ void ODatabaseMetaDataResultSet::openTab
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr();
 
 
 	const char	*pCOL = NULL;
@@ -981,8 +981,8 @@ void ODatabaseMetaDataResultSet::openCol
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLColumnPrivileges(m_aStatementHandle,
@@ -1014,8 +1014,8 @@ void ODatabaseMetaDataResultSet::openCol
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLColumns(m_aStatementHandle,
@@ -1081,8 +1081,8 @@ void ODatabaseMetaDataResultSet::openPro
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLProcedureColumns(m_aStatementHandle,
@@ -1115,7 +1115,7 @@ void ODatabaseMetaDataResultSet::openPro
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLProcedures(m_aStatementHandle,
@@ -1145,7 +1145,7 @@ void ODatabaseMetaDataResultSet::openSpe
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLSpecialColumns(m_aStatementHandle,_bRowVer ? SQL_ROWVER : SQL_BEST_ROWID,

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlflex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlflex.l?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlflex.l (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlflex.l Tue Aug 20 10:48:46 2013
@@ -784,7 +784,7 @@ void OSQLScanner::prepareScan(const ::rt
 	BEGIN(m_nRule);
 
 	m_sErrorMessage = ::rtl::OUString();	
-	m_sStatement	= ::rtl::OString(rNewStatement,rNewStatement.getLength(), RTL_TEXTENCODING_UTF8);
+	m_sStatement	= ::rtl::OUStringToOString( rNewStatement, RTL_TEXTENCODING_UTF8);
 	m_nCurrentPos	= 0;
 	m_bInternational = bInternational;
 	m_pContext		= pContext;

Modified: openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlnode.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlnode.cxx (original)
+++ openoffice/branches/rejuvenate01/main/connectivity/source/parse/sqlnode.cxx Tue Aug 20 10:48:46 2013
@@ -1576,7 +1576,7 @@ OSQLParseNode::OSQLParseNode(const ::rtl
                              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)
 {
@@ -2465,7 +2465,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
                 rString.appendAscii(" ");
 
             const ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext :  NULL);
-            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())
@@ -2550,7 +2550,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
 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;

Modified: openoffice/branches/rejuvenate01/main/cui/source/dialogs/showcols.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/dialogs/showcols.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/dialogs/showcols.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/dialogs/showcols.cxx Tue Aug 20 10:48:46 2013
@@ -119,7 +119,7 @@ void FmShowColsDialog::SetColumns(const 
 			//CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName;
 			
 			xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName;
-			sCurName = (const sal_Unicode*)sName;
+			sCurName = sName.getStr();
 		}
 		catch(...)
 		{

Modified: openoffice/branches/rejuvenate01/main/cui/source/factory/dlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cui/source/factory/dlgfact.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/cui/source/factory/dlgfact.cxx (original)
+++ openoffice/branches/rejuvenate01/main/cui/source/factory/dlgfact.cxx Tue Aug 20 10:48:46 2013
@@ -1900,7 +1900,7 @@ SfxAbstractInsertObjectDialog* AbstractD
 
     if ( pDlg )
     {
-        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
         return new AbstractInsertObjectDialog_Impl( pDlg );
     }
     return 0;
@@ -1913,7 +1913,7 @@ VclAbstractDialog* AbstractDialogFactory
     if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
     {
         pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
-        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
         return new VclAbstractDialog_Impl( pDlg );
     }
     return 0;

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/core/recovery/dbdocrecovery.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/core/recovery/dbdocrecovery.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/core/recovery/dbdocrecovery.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/core/recovery/dbdocrecovery.cxx Tue Aug 20 10:48:46 2013
@@ -394,7 +394,7 @@ namespace dbaccess
                     message.append( "' not found in '" );
                     message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
                     message.append( "', but required per map file!" );
-                    OSL_ENSURE( false, message.makeStringAndClear() );
+                    OSL_ENSURE( false, message.getStr() );
                 #endif
                     continue;
                 }

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx Tue Aug 20 10:48:46 2013
@@ -209,9 +209,9 @@ Any OXMLDataSourceSetting::convertString
 		#endif
 			rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters);
 			OSL_ENSURE(bSuccess,
-					::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+					(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
 				+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-				+=	::rtl::OString("\" into a boolean!"));
+				+=	::rtl::OString("\" into a boolean!")).getStr());
 			aReturn <<= bValue;
 		}
 		break;
@@ -224,9 +224,9 @@ Any OXMLDataSourceSetting::convertString
 		#endif
 				rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
 				OSL_ENSURE(bSuccess,
-						::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+						(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
 					+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-					+=	::rtl::OString("\" into an integer!"));
+					+=	::rtl::OString("\" into an integer!")).getStr());
 				if (TypeClass_SHORT == _rExpectedType.getTypeClass())
 					aReturn <<= (sal_Int16)nValue;
 				else
@@ -246,9 +246,9 @@ Any OXMLDataSourceSetting::convertString
 		#endif
 			rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
 			OSL_ENSURE(bSuccess,
-					::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+					(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
 				+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-				+=	::rtl::OString("\" into a double!"));
+				+=	::rtl::OString("\" into a double!")).getStr());
 			aReturn <<= (double)nValue;
 		}
 		break;

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/brwctrlr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/brwctrlr.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/brwctrlr.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/brwctrlr.cxx Tue Aug 20 10:48:46 2013
@@ -2013,7 +2013,7 @@ void SbaXDataBrowserController::ExecuteS
 	Reference< XInterface >  xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY);
 	::rtl::OUString aInitialText;
 	if (IsSearchableControl(xCurControl, &aInitialText))
-		sInitialText = (const sal_Unicode*)aInitialText;
+		sInitialText = aInitialText.getStr();
 
 	// prohibit the synchronization of the grid's display with the cursor's position
 	Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
@@ -2569,7 +2569,7 @@ IMPL_LINK(SbaXDataBrowserController, OnS
 		Reference< XPropertySet >  xCurrentColModel(xModelColumns->getByIndex(nModelPos),UNO_QUERY);
 		::rtl::OUString aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
 
-		sFieldList += (const sal_Unicode*)aName;
+		sFieldList += aName.getStr();
 		sFieldList += ';';
 
 		pContext->arrFields.push_back(xCurrentColumn);

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/exsrcbrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/exsrcbrw.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/exsrcbrw.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/browser/exsrcbrw.cxx Tue Aug 20 10:48:46 2013
@@ -202,7 +202,7 @@ void SAL_CALL SbaExternalSourceBrowser::
 					aControlProps = *(Sequence< ::com::sun::star::beans::PropertyValue>*)pArguments->Value.getValue();
 			}
 			else
-				OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString((const sal_Unicode*)pArguments->Name, gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
+				OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString(pArguments->Name.getStr(), gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
 		}
 		if (!sControlType.getLength())
 		{

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/TokenWriter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/TokenWriter.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/TokenWriter.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/TokenWriter.cxx Tue Aug 20 10:48:46 2013
@@ -76,6 +76,8 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::util;
 using ::com::sun::star::frame::XModel;
 
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+
 #if defined(UNX)
 const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
 #else
@@ -819,7 +821,7 @@ void OHTMLImportExport::WriteBody()
 	IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
 
 	(*m_pStream) << sMyBegComment; OUT_LF();
-	(*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(), gsl_getSystemTextEncoding()) << '\"';
+	(*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding()) << '\"';
 		// TODO : think about the encoding of the font name
 	(*m_pStream) << "; " << sFontSize;
 	m_pStream->WriteNumber(m_aFont.Height);
@@ -895,14 +897,14 @@ void OHTMLImportExport::WriteTables()
 	aStrOut	= aStrOut + "=1";
 
 	IncIndent(1);
-	TAG_ON( aStrOut );
+	TAG_ON( aStrOut.getStr() );
 
 	FontOn();
 
 	TAG_ON( OOO_STRING_SVTOOLS_HTML_caption );
 	TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
 
-	(*m_pStream)	<< ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding());
+	(*m_pStream)	<< ::rtl::OUStringToOString( m_sName, gsl_getSystemTextEncoding());
 		// TODO : think about the encoding of the name
 	TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
 	TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1072,7 +1074,7 @@ void OHTMLImportExport::WriteCell( sal_I
 		}
 	}
 
-	TAG_ON( aStrTD );
+	TAG_ON( aStrTD.getStr() );
 
 	FontOn();
 
@@ -1116,7 +1118,7 @@ void OHTMLImportExport::FontOn()
 	aStrOut  = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face;
 	aStrOut  = aStrOut + "=";
 	aStrOut  = aStrOut + "\"";
-	aStrOut  = aStrOut + ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(),gsl_getSystemTextEncoding());
+	aStrOut  = aStrOut + ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding());
 		// TODO : think about the encoding of the font name
 	aStrOut  = aStrOut + "\"";
 	aStrOut  = aStrOut + " ";

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/UITools.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/UITools.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/misc/UITools.cxx Tue Aug 20 10:48:46 2013
@@ -1500,7 +1500,7 @@ namespace
 	aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
 	aURL.Complete += _sModuleName;
 	aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-	aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
+	aURL.Complete += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8);
 
 	::rtl::OUString sAnchor;
 	::rtl::OUString sTempURL = aURL.Complete;

Modified: openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/querycontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/querycontroller.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/querycontroller.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dbaccess/source/ui/querydesign/querycontroller.cxx Tue Aug 20 10:48:46 2013
@@ -178,7 +178,7 @@ namespace dbaui
 					{
 						rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:");
 						::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
-						rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
+						rString += ::rtl::OStringToOUString( sT, RTL_TEXTENCODING_UTF8);
 					 break;}
 
 				case SQL_NODE_COMPARISON:

Modified: openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/app/app.cxx Tue Aug 20 10:48:46 2013
@@ -258,7 +258,7 @@ ResMgr* Desktop::GetDesktopResManager()
         // Create desktop resource manager and bootstrap process
         // was successful. Use default way to get language specific message.
         if ( Application::IsInExecute() )
-            Desktop::pResMgr = ResMgr::CreateResMgr( U2S( aMgrName ));
+            Desktop::pResMgr = ResMgr::CreateResMgr( U2S(aMgrName).getStr());
 
         if ( !Desktop::pResMgr )
         {
@@ -282,7 +282,7 @@ ResMgr* Desktop::GetDesktopResManager()
 
             ::com::sun::star::lang::Locale aLocale( aLanguage, aCountry, aVariant );
 
-            Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale);
+            Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S(aMgrName).getStr(), aLocale);
             AllSettings as = GetSettings();
             as.SetUILocale(aLocale);
             SetSettings(as);
@@ -1935,7 +1935,7 @@ void Desktop::Main()
         sal_Bool bCheckOk = sal_False;
         ::com::sun::star::lang::Locale aLocale;
         String aMgrName = String::CreateFromAscii( "ofa" );
-        ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale );
+        ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S(aMgrName).getStr(), aLocale );
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
 

Modified: openoffice/branches/rejuvenate01/main/desktop/source/app/appfirststart.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/app/appfirststart.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/app/appfirststart.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/app/appfirststart.cxx Tue Aug 20 10:48:46 2013
@@ -71,7 +71,7 @@ OUString Desktop::GetLicensePath()
 
     AllSettings aSettings(Application::GetSettings());
     aLocale = aSettings.GetUILocale();
-    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale);
 
     aLangString = aLocale.Language;
     if ( aLocale.Country.getLength() != 0 )

Modified: openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx Tue Aug 20 10:48:46 2013
@@ -294,7 +294,7 @@ void PackageRegistryImpl::insertBackend(
             buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
             OSL_ENSURE( 0, ::rtl::OUStringToOString(
                             buf.makeStringAndClear(),
-                            RTL_TEXTENCODING_UTF8 ) );
+                            RTL_TEXTENCODING_UTF8 ).getStr() );
         }
 #endif
     }

Modified: openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx Tue Aug 20 10:48:46 2013
@@ -110,7 +110,7 @@ ResMgr *FirstStartWizard::GetResManager(
     if ( !FirstStartWizard::pResMgr )
     {
         String aMgrName = String::CreateFromAscii( "dkt" );
-        FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString( aMgrName, RTL_TEXTENCODING_UTF8 ));
+        FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString( aMgrName, RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     return FirstStartWizard::pResMgr;
 }

Modified: openoffice/branches/rejuvenate01/main/dtrans/source/cnttype/mcnttype.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dtrans/source/cnttype/mcnttype.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/dtrans/source/cnttype/mcnttype.cxx (original)
+++ openoffice/branches/rejuvenate01/main/dtrans/source/cnttype/mcnttype.cxx Tue Aug 20 10:48:46 2013
@@ -327,7 +327,7 @@ OUString SAL_CALL CMimeContentType::pVal
 			throw IllegalArgumentException( );
 
 		// remove the last quote-sign
-		OUString qpvalue( pvalue, pvalue.getLength( ) - 1 );
+		const OUString qpvalue( pvalue.getStr(), pvalue.getLength( ) - 1 );
 		pvalue = qpvalue;
 
 		if ( !pvalue.getLength( ) )

Modified: openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/editeng/source/editeng/impedit2.cxx Tue Aug 20 10:48:46 2013
@@ -2720,7 +2720,7 @@ EditPaM ImpEditEngine::InsertText( const
                         ++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
                     EditSelection aSel( EditPaM( aPaM.GetNode(), (sal_uInt16) nChgPos ), aPaM );

Modified: openoffice/branches/rejuvenate01/main/extensions/source/bibliography/general.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/bibliography/general.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/bibliography/general.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/bibliography/general.cxx Tue Aug 20 10:48:46 2013
@@ -508,7 +508,7 @@ uno::Reference< awt::XControlModel >  Bi
 				{
 			        ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
                     DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
-			        sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+			        sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 );
 			        xPropSet->setPropertyValue( uProp, makeAny( sId ) );
 				}
 

Modified: openoffice/branches/rejuvenate01/main/extensions/source/logging/filehandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/logging/filehandler.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/logging/filehandler.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/logging/filehandler.cxx Tue Aug 20 10:48:46 2013
@@ -203,7 +203,7 @@ namespace logging
                 sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) );
                 sMessage.append( "\nerror code: " );
                 sMessage.append( (sal_Int32)res );
-                OSL_ENSURE( false, sMessage.makeStringAndClear() );
+                OSL_ENSURE( false, sMessage.getStr() );
             }
         #endif
             if ( m_eFileValidity == eValid )

Modified: openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/pcrcommon.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/pcrcommon.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/pcrcommon.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/pcrcommon.cxx Tue Aug 20 10:48:46 2013
@@ -61,7 +61,7 @@ namespace pcr
     ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
     {
         ::rtl::OUStringBuffer aBuffer;
-        ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+        ::rtl::OUString aTmp( rtl::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/extensions/source/propctrlr/propcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx Tue Aug 20 10:48:46 2013
@@ -1259,7 +1259,7 @@ namespace pcr
                     ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" );
                     sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() );
                     sMessage += "'!";
-                    OSL_ENSURE( false, sMessage );
+                    OSL_ENSURE( false, sMessage.getStr() );
                 }
             #endif
                 // finally insert this property control

Modified: openoffice/branches/rejuvenate01/main/extensions/source/update/check/updatecheckconfig.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/update/check/updatecheckconfig.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/extensions/source/update/check/updatecheckconfig.cxx (original)
+++ openoffice/branches/rejuvenate01/main/extensions/source/update/check/updatecheckconfig.cxx Tue Aug 20 10:48:46 2013
@@ -183,7 +183,7 @@ UpdateCheckROModel::getUpdateEntry(Updat
     rtl::OString aStr(RELEASE_NOTE);
     for(sal_Int32 n=1; n < 6; ++n )
     {
-        rtl::OUString aUStr = getStringValue(aStr + rtl::OString::valueOf(n));
+        rtl::OUString aUStr = getStringValue( (aStr + rtl::OString::valueOf(n)).getStr());
         if( aUStr.getLength() > 0 )
             rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr));
     }

Modified: openoffice/branches/rejuvenate01/main/filter/source/msfilter/eschesdo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/filter/source/msfilter/eschesdo.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/filter/source/msfilter/eschesdo.hxx (original)
+++ openoffice/branches/rejuvenate01/main/filter/source/msfilter/eschesdo.hxx Tue Aug 20 10:48:46 2013
@@ -61,6 +61,9 @@ public:
 	sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 )
 	{ return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; }
 
+	sal_Bool ImplGetPropertyValue( const rtl::OUString& rStr ) { return ImplGetPropertyValue( rStr.getStr() ); }
+	sal_Bool ImplGetInt32PropertyValue( const rtl::OUString& rStr ) { return ImplGetInt32PropertyValue( rStr.getStr() ); }
+
 	const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&	GetShapeRef() const 	{ return mXShape; }
 	const ::com::sun::star::uno::Any&		GetUsrAny() const		{ return mAny; }
 	const String&		GetType() const 		{ return mType; }

Modified: openoffice/branches/rejuvenate01/main/forms/source/misc/services.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/forms/source/misc/services.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/forms/source/misc/services.cxx (original)
+++ openoffice/branches/rejuvenate01/main/forms/source/misc/services.cxx Tue Aug 20 10:48:46 2013
@@ -347,7 +347,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL comp
 
 	for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts)
 	{
-		if (rtl_ustr_ascii_compare(*pClasses, _pImplName) == 0)
+		if( pClasses->compareToAscii( _pImplName) == 0)
 		{
 			::cppu::ComponentInstantiation aCurrentCreateFunction =
 				reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts);

Modified: openoffice/branches/rejuvenate01/main/fpicker/source/aqua/FilterHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/fpicker/source/aqua/FilterHelper.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/fpicker/source/aqua/FilterHelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/fpicker/source/aqua/FilterHelper.cxx Tue Aug 20 10:48:46 2013
@@ -105,7 +105,7 @@ shrinkFilterName( const rtl::OUString aF
     int nBracketLen = -1;
     int nBracketEnd = -1;
     rtl::OUString rFilterName = aFilterName;
-    const sal_Unicode *pStr = rFilterName;
+    const sal_Unicode* pStr = rFilterName.getStr();
     rtl::OUString aRealName = rFilterName;
 
     for( i = aRealName.getLength() - 1; i > 0; i-- )

Modified: openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/assertion.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/assertion.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/assertion.hxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/assertion.hxx Tue Aug 20 10:48:46 2013
@@ -154,7 +154,7 @@
 						_sAssertBuffer.append( "\n\t\""			);												\
 						_sAssertBuffer.append( STEXT			);												\
 						_sAssertBuffer.append( "\"\n"			);												\
-						OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.makeStringAndClear() );						\
+						OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.getStr() );						\
 					}
 
 	#endif

Modified: openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/logmechanism.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/logmechanism.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/logmechanism.hxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/inc/macros/debug/logmechanism.hxx Tue Aug 20 10:48:46 2013
@@ -52,7 +52,7 @@
                     are handled wrong.
 	_____________________________________________________________________________________________________________*/
 
-	#define	WRITE_LOGFILE( SFILENAME, STEXT )																	\
+	inline void writeToLogFile( const char* SFILENAME, const char* STEXT )
 				{																								\
 					::rtl::OString	_swriteLogfileFileName	( SFILENAME	);										\
 					::rtl::OString	_swriteLogfileText		( STEXT		);										\
@@ -61,6 +61,10 @@
                     fclose ( pFile                                    );                                        \
 				}
 
+	inline void writeToLogFile( const char* pFILENAME, const rtl::OString& rTEXT ) { writeToLogFile( pFILENAME, rTEXT.getStr()); }
+
+	#define WRITE_LOGFILE( SFILENAME, STEXT ) { writeToLogFile( (SFILENAME), (STEXT) ); }
+
 	/*_____________________________________________________________________________________________________________
 		LOGTYPE
 

Modified: openoffice/branches/rejuvenate01/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Tue Aug 20 10:48:46 2013
@@ -1187,7 +1187,7 @@ void ToolbarLayoutManager::implts_create
         uno::Reference< ui::XUIElement > xUIElement;
         implts_createToolBar( aTbxResName, bNotify, xUIElement );
         
-        if ( aTitle && xUIElement.is() )
+        if ( !aTitle.isEmpty() && xUIElement.is() )
         {
             vos::OGuard aGuard( Application::GetSolarMutex() );
 

Modified: openoffice/branches/rejuvenate01/main/framework/source/services/license.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/source/services/license.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/source/services/license.cxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/source/services/license.cxx Tue Aug 20 10:48:46 2013
@@ -282,7 +282,7 @@ css::uno::Any SAL_CALL License::execute(
         ::rtl::OString aMgrName = ::rtl::OString("fwe");
         AllSettings aSettings(Application::GetSettings());
         aLocale = aSettings.GetUILocale();
-        ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+        ResMgr* pResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale);
 
         aLangString = aLocale.Language;
         if ( aLocale.Country.getLength() != 0 )

Modified: openoffice/branches/rejuvenate01/main/framework/source/uielement/controlmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/framework/source/uielement/controlmenucontroller.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/framework/source/uielement/controlmenucontroller.cxx (original)
+++ openoffice/branches/rejuvenate01/main/framework/source/uielement/controlmenucontroller.cxx Tue Aug 20 10:48:46 2013
@@ -228,7 +228,7 @@ void ControlMenuController::updateImages
 {
     rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" ));
     
-    ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
+    ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ).getStr() );
     ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr );
     aResId.SetRT( RSC_IMAGELIST );
 	

Modified: openoffice/branches/rejuvenate01/main/i18npool/source/indexentry/indexentrysupplier_default.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/i18npool/source/indexentry/indexentrysupplier_default.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/i18npool/source/indexentry/indexentrysupplier_default.cxx (original)
+++ openoffice/branches/rejuvenate01/main/i18npool/source/indexentry/indexentrysupplier_default.cxx Tue Aug 20 10:48:46 2013
@@ -174,7 +174,7 @@ void Index::makeIndexKeys(const lang::Lo
     if (!keyStr.getLength()) {
         keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN, 
                     LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
-        if (!keyStr)
+        if( keyStr.isEmpty() )
             throw RuntimeException();
     }
 

Modified: openoffice/branches/rejuvenate01/main/i18npool/source/localedata/saxparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/i18npool/source/localedata/saxparser.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/i18npool/source/localedata/saxparser.cxx (original)
+++ openoffice/branches/rejuvenate01/main/i18npool/source/localedata/saxparser.cxx Tue Aug 20 10:48:46 2013
@@ -271,7 +271,7 @@ public: // ExtendedDocumentHandler
 		source.sPublicId = sPublicId;
 
 		source.aInputStream = createStreamFromFile(
-			OUStringToOString( sSystemId , RTL_TEXTENCODING_ASCII_US) );
+			OUStringToOString( sSystemId.getStr(), RTL_TEXTENCODING_ASCII_US).getStr() );
 
 		return source;
 	}

Modified: openoffice/branches/rejuvenate01/main/idlc/source/idlccompile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/idlc/source/idlccompile.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/idlc/source/idlccompile.cxx (original)
+++ openoffice/branches/rejuvenate01/main/idlc/source/idlccompile.cxx Tue Aug 20 10:48:46 2013
@@ -145,7 +145,7 @@ OString makeTempName(const OString& pref
 
 #if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2)
 
-    OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath)
+    OSL_ASSERT( sizeof(tmpFilePattern) > ( tmpPath.getLength()
                                            + RTL_CONSTASCII_LENGTH(
                                                 PATH_SEPARATOR )
                                            + prefix.getLength()
@@ -153,7 +153,7 @@ OString makeTempName(const OString& pref
                                                 "XXXXXX") ) );
 
     tmpFilePattern[ sizeof(tmpFilePattern)-1 ] = '\0';
-    strncpy(tmpFilePattern, tmpPath, sizeof(tmpFilePattern)-1);
+    strncpy(tmpFilePattern, tmpPath.getStr(), sizeof(tmpFilePattern)-1);
     strncat(tmpFilePattern, PATH_SEPARATOR, sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
     strncat(tmpFilePattern, prefix.getStr(), sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
     strncat(tmpFilePattern, "XXXXXX", sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
@@ -377,7 +377,7 @@ sal_Int32 compileFile(const OString * pa
 
 	if ( pOptions->isValid("-E") )
 	{
-		if (unlink(preprocFile) != 0)
+		if( unlink( preprocFile.getStr()) != 0)
 		{
 			fprintf(stderr, "%s: Could not remove parser input file %s\n",
 				   	pOptions->getProgramName().getStr(), preprocFile.getStr());

Modified: openoffice/branches/rejuvenate01/main/package/source/xstor/owriteablestream.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/package/source/xstor/owriteablestream.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/package/source/xstor/owriteablestream.cxx (original)
+++ openoffice/branches/rejuvenate01/main/package/source/xstor/owriteablestream.cxx Tue Aug 20 10:48:46 2013
@@ -565,7 +565,7 @@ uno::Reference< lang::XMultiServiceFacto
         ::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() );
 
         try {
-            if ( aTempURL && xStream.is() )
+            if ( !aTempURL.isEmpty() && xStream.is() )
             {
                 uno::Reference < ucb::XSimpleFileAccess > xTempAccess( 
                                 GetServiceFactory()->createInstance ( 

Modified: openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx Tue Aug 20 10:48:46 2013
@@ -56,6 +56,9 @@
     #define PYSTR_CHECK                 PyBytes_Check
 #endif
 
+#include <rtl/string.hxx>
+inline void PyErr_SetString( PyObject* pyObj, const rtl::OString& rName) { PyErr_SetString( pyObj, rName.getStr());}
+
 namespace pyuno
 {
 

Modified: openoffice/branches/rejuvenate01/main/rdbmaker/source/codemaker/global.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/rdbmaker/source/codemaker/global.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/rdbmaker/source/codemaker/global.cxx (original)
+++ openoffice/branches/rejuvenate01/main/rdbmaker/source/codemaker/global.cxx Tue Aug 20 10:48:46 2013
@@ -130,7 +130,7 @@ void FileStream::open(const OString& nam
 	if ( name.getLength() > 0 )
 	{
         m_name = name;
-		m_pFile = fopen(m_name, checkAccessMode(mode));
+		m_pFile = fopen( m_name.getStr(), checkAccessMode(mode));
     }
 }
 

Modified: openoffice/branches/rejuvenate01/main/registry/source/regimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/registry/source/regimpl.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/registry/source/regimpl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/registry/source/regimpl.cxx Tue Aug 20 10:48:46 2013
@@ -561,7 +561,7 @@ RegError ORegistry::destroyRegistry(cons
 				systemName = regName;
 
 			OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
-            if (unlink(name) != 0)
+            if( unlink( name.getStr()) != 0)
             {
                 return REG_DESTROY_REGISTRY_FAILED;
             }
@@ -819,7 +819,7 @@ RegError ORegistry::eraseKey(ORegKey* pK
         if (sFullKeyName.getLength() > 1)
             sFullKeyName += keyName;
         else
-            sFullKeyName += (keyName+1);
+            sFullKeyName += keyName.getStr() + 1;
 
         sFullPath = sFullKeyName.copy(0, keyName.lastIndexOf('/') + 1);
     } else

Modified: openoffice/branches/rejuvenate01/main/registry/tools/checksingleton.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/registry/tools/checksingleton.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/registry/tools/checksingleton.cxx (original)
+++ openoffice/branches/rejuvenate01/main/registry/tools/checksingleton.cxx Tue Aug 20 10:48:46 2013
@@ -116,7 +116,7 @@ bool Options_Impl::initOptions_Impl(std:
                 {
                     return badOption("invalid", option.c_str());
                 }
-                m_typeRegName = OString((*first).c_str(), (*first).size());
+                m_typeRegName = *first;
                 break;
             }
         case 'o':

Modified: openoffice/branches/rejuvenate01/main/reportdesign/source/core/resource/core_resource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/reportdesign/source/core/resource/core_resource.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/reportdesign/source/core/resource/core_resource.cxx (original)
+++ openoffice/branches/rejuvenate01/main/reportdesign/source/core/resource/core_resource.cxx Tue Aug 20 10:48:46 2013
@@ -64,7 +64,7 @@ namespace reportdesign
             ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
 
             rtl::OString sResLibName = rtl::OString( "rpt" );
-            m_pImpl = SimpleResMgr::Create(sResLibName, aLocale);
+            m_pImpl = SimpleResMgr::Create( sResLibName.getStr(), aLocale);
         }
 	}
 

Modified: openoffice/branches/rejuvenate01/main/reportdesign/source/core/sdr/ModuleHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/reportdesign/source/core/sdr/ModuleHelper.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/reportdesign/source/core/sdr/ModuleHelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/reportdesign/source/core/sdr/ModuleHelper.cxx Tue Aug 20 10:48:46 2013
@@ -88,7 +88,7 @@ ResMgr*	OModuleImpl::getResManager()
 	{
 		// create a manager with a fixed prefix
         rtl::OString sName = rtl::OString( "rptui" );
-		m_pRessources = ResMgr::CreateResMgr(sName);
+		m_pRessources = ResMgr::CreateResMgr( sName.getStr());
 	}
 	return m_pRessources;
 }

Modified: openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx (original)
+++ openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx Tue Aug 20 10:48:46 2013
@@ -206,9 +206,9 @@ Any OXMLControlProperty::convertString(c
 		#endif
 			rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters);
 			OSL_ENSURE(bSuccess,
-					::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+					(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
 				+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-				+=	::rtl::OString("\" into a boolean!"));
+				+=	::rtl::OString("\" into a boolean!")).getStr());
 			aReturn <<= bValue;
 		}
 		break;
@@ -221,9 +221,9 @@ Any OXMLControlProperty::convertString(c
 		#endif
 				rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
 				OSL_ENSURE(bSuccess,
-						::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+						(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
 					+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-					+=	::rtl::OString("\" into an integer!"));
+					+=	::rtl::OString("\" into an integer!")).getStr());
 				if (TypeClass_SHORT == _rExpectedType.getTypeClass())
 					aReturn <<= (sal_Int16)nValue;
 				else
@@ -243,9 +243,9 @@ Any OXMLControlProperty::convertString(c
 		#endif
 			rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
 			OSL_ENSURE(bSuccess,
-					::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+					(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
 				+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-				+=	::rtl::OString("\" into a double!"));
+				+=	::rtl::OString("\" into a double!")).getStr());
 			aReturn <<= (double)nValue;
 		}
 		break;
@@ -274,9 +274,9 @@ Any OXMLControlProperty::convertString(c
 				#endif
 					rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
 					OSL_ENSURE(bSuccess,
-							::rtl::OString("OPropertyImport::convertString: could not convert \"")
+							(::rtl::OString("OPropertyImport::convertString: could not convert \"")
 						+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-						+=	::rtl::OString("\" into a double!"));
+						+=	::rtl::OString("\" into a double!")).getStr());
 
 					// then convert it into the target type
 					switch (nType)

Modified: openoffice/branches/rejuvenate01/main/reportdesign/source/ui/inspection/DefaultInspection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/reportdesign/source/ui/inspection/DefaultInspection.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/reportdesign/source/ui/inspection/DefaultInspection.cxx (original)
+++ openoffice/branches/rejuvenate01/main/reportdesign/source/ui/inspection/DefaultInspection.cxx Tue Aug 20 10:48:46 2013
@@ -47,7 +47,7 @@ namespace rptui
     ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
     {
         ::rtl::OUStringBuffer aBuffer;
-        ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+        const ::rtl::OUString aTmp( ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
         DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
         aBuffer.appendAscii( INET_HID_SCHEME );
         aBuffer.append( aTmp.getStr() );

Modified: openoffice/branches/rejuvenate01/main/rsc/inc/rscerror.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/rsc/inc/rscerror.h?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/rsc/inc/rscerror.h (original)
+++ openoffice/branches/rejuvenate01/main/rsc/inc/rscerror.h Tue Aug 20 10:48:46 2013
@@ -27,6 +27,8 @@
 #include <tools/solar.h>
 #endif
 
+#include <rtl/string.hxx>
+
 /****************** D E F I N I T I O N S ********************************/
 /******************* R e t u r n   E r r o r s		   *******************/
 #define ERR_OK				0xFFFFFFFF
@@ -153,6 +155,8 @@ public:
 	// das Programm wird mit exit() verlassen
 	virtual void	FatalError( const ERRTYPE& rError, const RscId &aId,
 								const char * pMessage = NULL );
+	void Error( const ERRTYPE& rError, RscTop* pClass, const RscId& rId, const rtl::OString& rStr ) { this->Error( rError, pClass, rId, rStr.getStr()); }
+	void FatalError( const ERRTYPE& rError, const RscId& rId, const rtl::OString& rStr ) { this->FatalError( rError,rId, rStr.getStr()); }
 };
 
 #endif // _RSCERROR_H

Modified: openoffice/branches/rejuvenate01/main/rsc/source/parser/rscdb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/rsc/source/parser/rscdb.cxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/rsc/source/parser/rscdb.cxx (original)
+++ openoffice/branches/rejuvenate01/main/rsc/source/parser/rscdb.cxx Tue Aug 20 10:48:46 2013
@@ -112,7 +112,7 @@ static sal_uInt32 getLangIdAndShortenLoc
     sal_uInt32 nRet = GetLangId( aL );
     if( nRet == 0 )
     {
-        pTypCont->AddLanguage( aL );
+        pTypCont->AddLanguage( aL.getStr() );
         nRet = GetLangId( aL );
     }
     if( rVariant.getLength() )

Modified: openoffice/branches/rejuvenate01/main/sal/inc/osl/profile.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/osl/profile.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/osl/profile.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/osl/profile.hxx Tue Aug 20 10:48:46 2013
@@ -75,17 +75,17 @@ namespace osl {
 		{
 			sal_Char aBuf[1024];
 			return osl_readProfileString( profile,
-										  rSection,
-										  rEntry,
+										  rSection.getStr(),
+										  rEntry.getStr(),
 										  aBuf,
 										  sizeof( aBuf ),
-										  rDefault ) ? rtl::OString( aBuf ) : rtl::OString();
+										  rDefault.getStr() ) ? rtl::OString( aBuf ) : rtl::OString();
 
 		}
 
 		sal_Bool readBool( const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool bDefault )
 		{
-			return osl_readProfileBool( profile, rSection, rEntry, bDefault );
+			return osl_readProfileBool( profile, rSection.getStr(), rEntry.getStr(), bDefault );
 		}
 
 		sal_uInt32 readIdent(const rtl::OString& rSection, const rtl::OString& rEntry, 
@@ -98,11 +98,11 @@ namespace osl {
 			nItems = 0;
 			while( it != rStrings.end() )
 			{
-				pStrings[ nItems++ ] = *it;
+				pStrings[ nItems++ ] = (*it).getStr();
 				++it;
 			}
 			pStrings[ nItems ] = NULL;
-			sal_uInt32 nRet = osl_readProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nDefault);
+			sal_uInt32 nRet = osl_readProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
 			delete pStrings;
 			return nRet;
 		}
@@ -110,12 +110,12 @@ namespace osl {
 		sal_Bool writeString(const rtl::OString& rSection, const rtl::OString& rEntry, 
 							 const rtl::OString& rString)
 		{
-			return osl_writeProfileString(profile, rSection, rEntry, rString);
+			return osl_writeProfileString( profile, rSection.getStr(), rEntry.getStr(), rString.getStr());
 		}
 
 		sal_Bool writeBool(const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool Value)
 		{
-			return osl_writeProfileBool(profile, rSection, rEntry, Value);
+			return osl_writeProfileBool( profile, rSection.getStr(), rEntry.getStr(), Value);
 		}
 
 		sal_Bool writeIdent(const rtl::OString& rSection, const rtl::OString& rEntry, 
@@ -128,12 +128,12 @@ namespace osl {
 			nItems = 0;
 			while( it != rStrings.end() )
 			{
-				pStrings[ nItems++ ] = *it;
+				pStrings[ nItems++ ] = (*it).getStr();
 				++it;
 			}
 			pStrings[ nItems ] = NULL;
 			sal_Bool bRet =
-				osl_writeProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nValue );
+				osl_writeProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nValue );
 			delete pStrings;
 			return bRet;
 		}
@@ -144,7 +144,7 @@ namespace osl {
 		*/
 		sal_Bool removeEntry(const rtl::OString& rSection, const rtl::OString& rEntry)
 		{
-			return osl_removeProfileEntry(profile, rSection, rEntry);
+			return osl_removeProfileEntry( profile, rSection.getStr(), rEntry.getStr());
 		}
 
 		/** Get all entries belonging to the specified section.
@@ -156,11 +156,11 @@ namespace osl {
 			std::list< rtl::OString > aEntries;
 
 			// count buffer size necessary
-			int n = osl_getProfileSectionEntries( profile, rSection, NULL, 0 );
+			int n = osl_getProfileSectionEntries( profile, rSection.getStr(), NULL, 0 );
 			if( n > 1 )
 			{
 				sal_Char* pBuf = new sal_Char[ n+1 ];
-				osl_getProfileSectionEntries( profile, rSection, pBuf, n+1 );
+				osl_getProfileSectionEntries( profile, rSection.getStr(), pBuf, n+1 );
 				int nLen;
 				for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
 					aEntries.push_back( rtl::OString( pBuf+n ) );

Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/locale.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/locale.hxx?rev=1515767&r1=1515766&r2=1515767&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/locale.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/locale.hxx Tue Aug 20 10:48:46 2013
@@ -181,7 +181,7 @@ public:
 	static OLocale registerLocale( const OUString & language, const OUString & country,
 							const OUString & variant )
 	{
-		return rtl_locale_register( language, country, variant );
+		return rtl_locale_register( language.getStr(), country.getStr(), variant.getStr() );
 	}
 
 	/**
@@ -191,7 +191,7 @@ public:
 	 */
 	static OLocale registerLocale( const OUString & language, const OUString & country )
 	{
-		return rtl_locale_register( language, country, NULL );
+		return rtl_locale_register( language.getStr(), country.getStr(), NULL );
 	}
 
 	/** @deprecated
@@ -202,7 +202,7 @@ public:
 	 */
 	static void setDefault( const OUString & language, const OUString & country,
 							const OUString & variant )
-			 { rtl_locale_setDefault(language, country, variant); }
+			 { rtl_locale_setDefault( language.getStr(), country.getStr(), variant.getStr()); }
 
 	/**
 	 	Getter for programmatic name of field,



Mime
View raw message