[Libreoffice-commits] .: basic/source canvas/source chart2/source codemaker/source connectivity/source cppu/qa cui/source dbaccess/source dtrans/source editeng/source extensions/source filter/source formula/source fpicker/source framework/source i18npool/source idlc/source idl/source package/source pyuno/source registry/source registry/tools reportdesign/source rsc/source sal/qa sax/qa sax/source sax/test sc/source sdext/source sfx2/source shell/source stoc/source svtools/source svx/source sw/qa sw/source toolkit/source tools/inc tools/qa tools/source ucb/source unodevtools/source unotools/source vcl/source vcl/unx writerfilter/source xmloff/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Tue Sep 27 11:23:06 PDT 2011
basic/source/classes/sbunoobj.cxx | 25 -
canvas/source/cairo/cairo_textlayout.cxx | 4
chart2/source/tools/XMLRangeHelper.cxx | 33 -
codemaker/source/codemaker/global.cxx | 28 -
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/commontools/parameters.cxx | 6
connectivity/source/cpool/ZPoolCollection.cxx | 12
connectivity/source/drivers/mozab/MDriver.cxx | 2
connectivity/source/parse/sqlflex.l | 2
cppu/qa/cppumaker/test_cppumaker.cxx | 12
cppu/qa/test_unotype.cxx | 12
cui/source/factory/dlgfact.cxx | 4
dbaccess/source/core/api/OptimisticSet.cxx | 16
dbaccess/source/ext/macromigration/migrationengine.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 36 --
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dtrans/source/cnttype/mcnttype.cxx | 7
editeng/source/editeng/impedit2.cxx | 3
extensions/source/bibliography/general.cxx | 2
extensions/source/logging/filehandler.cxx | 2
extensions/source/propctrlr/pcrcommon.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 4
extensions/source/resource/ResourceIndexAccess.cxx | 2
extensions/source/update/check/updatecheckconfig.cxx | 3
filter/source/placeware/Base64Codec.cxx | 32 -
filter/source/xsltfilter/OleHandler.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 2
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 4
i18npool/source/indexentry/indexentrysupplier_default.cxx | 2
i18npool/source/localedata/saxparser.cxx | 2
idl/source/prj/database.cxx | 2
idlc/source/idlccompile.cxx | 8
idlc/source/options.cxx | 3
package/source/manifest/Base64Codec.cxx | 32 -
pyuno/source/loader/pyuno_loader.cxx | 4
pyuno/source/module/pyuno_except.cxx | 8
pyuno/source/module/pyuno_module.cxx | 16
registry/source/regimpl.cxx | 4
registry/tools/checksingleton.cxx | 2
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
rsc/source/parser/rscdb.cxx | 2
rsc/source/parser/rscyacc.y | 16
rsc/source/rsc/rsc.cxx | 2
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 177 ++++++----
sax/qa/cppunit/test_converter.cxx | 8
sax/source/tools/converter.cxx | 34 -
sax/test/saxdemo.cxx | 2
sc/source/core/data/cell.cxx | 2
sc/source/core/tool/compiler.cxx | 2
sc/source/filter/excel/xecontent.cxx | 3
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/xml/xmlconti.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/namedlg/namedlg.cxx | 2
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 9
sfx2/source/appl/sfxhelp.cxx | 4
sfx2/source/appl/shutdowniconunx.cxx | 4
sfx2/source/control/msg.cxx | 3
sfx2/source/control/shell.cxx | 2
shell/source/unix/exec/shellexec.cxx | 2
stoc/source/inspect/introspection.cxx | 9
svtools/source/edit/texteng.cxx | 3
svtools/source/uno/wizard/unowizard.cxx | 3
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/fmcomp/gridcell.cxx | 4
sw/qa/core/swdoc-test.cxx | 3
sw/source/core/unocore/XMLRangeHelper.cxx | 33 -
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlfly.cxx | 2
sw/source/filter/html/wrthtml.cxx | 5
sw/source/filter/ww8/docxattributeoutput.cxx | 9
sw/source/filter/ww8/docxexport.cxx | 4
sw/source/filter/ww8/docxexport.hxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 46 +-
sw/source/filter/ww8/rtfexport.cxx | 8
sw/source/filter/ww8/rtfsdrexport.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 2
toolkit/source/helper/property.cxx | 4
toolkit/source/layout/vcl/wrapper.cxx | 2
tools/inc/tools/diagnose_ex.h | 2
tools/qa/cppunit/test_reversemap.cxx | 1
tools/source/fsys/tempfile.cxx | 2
tools/source/fsys/urlobj.cxx | 18 -
ucb/source/ucp/gvfs/gvfs_content.cxx | 23 -
ucb/source/ucp/webdav/DAVProperties.cxx | 12
ucb/source/ucp/webdav/NeonHeadRequest.cxx | 2
ucb/source/ucp/webdav/NeonSession.cxx | 40 +-
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 4
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 3
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 1
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 1
unodevtools/source/skeletonmaker/javatypemaker.cxx | 1
unodevtools/source/skeletonmaker/ostringostreaminserter.hxx | 49 ++
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 1
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 1
unotools/source/ucbhelper/tempfile.cxx | 2
vcl/source/control/edit.cxx | 3
vcl/source/gdi/pdfwriter_impl.cxx | 15
vcl/unx/generic/dtrans/X11_selection.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/printergfx/glyphset.cxx | 8
vcl/unx/generic/printergfx/printerjob.cxx | 3
vcl/unx/generic/printergfx/psputil.cxx | 2
vcl/unx/gtk/a11y/atkaction.cxx | 2
vcl/unx/gtk/a11y/atkimage.cxx | 2
vcl/unx/gtk/a11y/atktable.cxx | 2
vcl/unx/gtk/a11y/atkwrapper.cxx | 5
vcl/unx/gtk/a11y/atkwrapper.hxx | 2
vcl/unx/gtk/app/gtkdata.cxx | 2
vcl/unx/gtk/app/gtkinst.cxx | 2
vcl/unx/gtk/window/gtkframe.cxx | 4
writerfilter/source/dmapper/FontTable.cxx | 2
xmloff/source/core/xmluconv.cxx | 34 -
xmloff/source/draw/ximpcustomshape.cxx | 2
117 files changed, 579 insertions(+), 461 deletions(-)
New commits:
commit 6671fa81db0ecea4ada005bb79f55f08fb440ad4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 27 20:21:15 2011 +0200
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 57ad90b..b503f85 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2028,9 +2028,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
SbxVariable* pVar = pMethods->Get( i );
if( pVar )
{
- ::rtl::OUStringBuffer aPropStr;
if( (i % nPropsPerLine) == 0 )
- aPropStr.appendAscii( "\n" );
+ aRet.appendAscii( "\n" );
// address the method
const Reference< XIdlMethod >& rxMethod = pUnoMethods[i];
@@ -2044,10 +2043,10 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
eType = (SbxDataType) ( SbxOBJECT | SbxARRAY );
}
// output the name and the type
- aPropStr.append( Dbg_SbxDataType2String( eType ) );
- aPropStr.appendAscii( " " );
- aPropStr.append ( pVar->GetName() );
- aPropStr.appendAscii( " ( " );
+ aRet.append( Dbg_SbxDataType2String( eType ) );
+ aRet.appendAscii( " " );
+ aRet.append ( pVar->GetName() );
+ aRet.appendAscii( " ( " );
// the get-method mustn't have a parameter
Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
@@ -2058,22 +2057,20 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
{
for( sal_uInt16 j = 0; j < nParamCount; j++ )
{
- aPropStr.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
+ aRet.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
if( j < nParamCount - 1 )
- aPropStr.appendAscii( ", " );
+ aRet.appendAscii( ", " );
}
}
else
- aPropStr.appendAscii( "void" );
+ aRet.appendAscii( "void" );
- aPropStr.appendAscii( " ) " );
+ aRet.appendAscii( " ) " );
if( i == nMethodCount - 1 )
- aPropStr.appendAscii( "\n" );
+ aRet.appendAscii( "\n" );
else
- aPropStr.appendAscii( "; " );
-
- aRet.append( aPropStr );
+ aRet.appendAscii( "; " );
}
}
return aRet.makeStringAndClear();
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index eb5a335..68143b5 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -314,7 +314,7 @@ namespace cairocanvas
rendering::FontRequest aFontRequest = mpFont->getFontRequest();
rendering::FontInfo aFontInfo = aFontRequest.FontDescription;
- cairo_select_font_face( pCairo, ::rtl::OUStringToOString( aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
+ cairo_select_font_face( pCairo, ::rtl::OUStringToOString( aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ).getStr(), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
cairo_set_font_size( pCairo, aFontRequest.CellSize );
}
@@ -335,7 +335,7 @@ namespace cairocanvas
before we were depending on unmodified current point which I believed was preserved by save/restore */
cairo_move_to( pCairo, 0, 0 );
useFont( pCairo );
- cairo_show_text( pCairo, aUTF8String );
+ cairo_show_text( pCairo, aUTF8String.getStr() );
cairo_restore( pCairo );
return true;
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index fa8fa9f..6c2d94b 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -90,38 +90,37 @@ private:
// ----------------------------------------
-OUStringBuffer lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell )
+void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output )
{
- ::rtl::OUStringBuffer aBuffer;
+ OSL_ASSERT(output != 0);
+
if( rCell.empty())
- return aBuffer;
+ return;
sal_Int32 nCol = rCell.nColumn;
- aBuffer.append( (sal_Unicode)'.' );
+ output->append( (sal_Unicode)'.' );
if( ! rCell.bRelativeColumn )
- aBuffer.append( (sal_Unicode)'$' );
+ output->append( (sal_Unicode)'$' );
// get A, B, C, ..., AA, AB, ... representation of column number
if( nCol < 26 )
- aBuffer.append( (sal_Unicode)('A' + nCol) );
+ output->append( (sal_Unicode)('A' + nCol) );
else if( nCol < 702 )
{
- aBuffer.append( (sal_Unicode)('A' + nCol / 26 - 1 ));
- aBuffer.append( (sal_Unicode)('A' + nCol % 26) );
+ output->append( (sal_Unicode)('A' + nCol / 26 - 1 ));
+ output->append( (sal_Unicode)('A' + nCol % 26) );
}
else // works for nCol <= 18,278
{
- aBuffer.append( (sal_Unicode)('A' + nCol / 702 - 1 ));
- aBuffer.append( (sal_Unicode)('A' + (nCol % 702) / 26 ));
- aBuffer.append( (sal_Unicode)('A' + nCol % 26) );
+ output->append( (sal_Unicode)('A' + nCol / 702 - 1 ));
+ output->append( (sal_Unicode)('A' + (nCol % 702) / 26 ));
+ output->append( (sal_Unicode)('A' + nCol % 26) );
}
// write row number as number
if( ! rCell.bRelativeRow )
- aBuffer.append( (sal_Unicode)'$' );
- aBuffer.append( rCell.nRow + (sal_Int32)1 );
-
- return aBuffer;
+ output->append( (sal_Unicode)'$' );
+ output->append( rCell.nRow + (sal_Int32)1 );
}
void lcl_getSingleCellAddressFromXMLString(
@@ -403,13 +402,13 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
else
aBuffer.append( rRange.aTableName );
}
- aBuffer.append( lcl_getXMLStringForCell( rRange.aUpperLeft ));
+ lcl_getXMLStringForCell( rRange.aUpperLeft, &aBuffer );
if( ! rRange.aLowerRight.empty())
{
// we have a range (not a single cell)
aBuffer.append( sal_Unicode( ':' ));
- aBuffer.append( lcl_getXMLStringForCell( rRange.aLowerRight ));
+ lcl_getXMLStringForCell( rRange.aLowerRight, &aBuffer );
}
return aBuffer.makeStringAndClear();
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 7d3faa9..6178eff 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -107,15 +107,15 @@ OString createFileNameFromType( const OString& destination,
withSeperator = sal_True;
}
- OStringBuffer nameBuffer(length);
+ OStringBuffer fileNameBuf(length);
if (withPoint)
- nameBuffer.append('.');
+ fileNameBuf.append('.');
else
- nameBuffer.append(destination.getStr(), destination.getLength());
+ fileNameBuf.append(destination.getStr(), destination.getLength());
if (withSeperator)
- nameBuffer.append("/", 1);
+ fileNameBuf.append("/", 1);
OString tmpStr(type);
if (prefix.getLength() > 0)
@@ -123,10 +123,10 @@ OString createFileNameFromType( const OString& destination,
tmpStr = type.replaceAt(type.lastIndexOf('/')+1, 0, prefix);
}
- nameBuffer.append(tmpStr.getStr(), tmpStr.getLength());
- nameBuffer.append(postfix.getStr(), postfix.getLength());
+ fileNameBuf.append(tmpStr.getStr(), tmpStr.getLength());
+ fileNameBuf.append(postfix.getStr(), postfix.getLength());
- OString fileName(nameBuffer);
+ OString fileName(fileNameBuf.makeStringAndClear());
sal_Char token;
#ifdef SAL_UNX
@@ -137,32 +137,32 @@ OString createFileNameFromType( const OString& destination,
token = '\\';
#endif
- nameBuffer = OStringBuffer(length);
+ OStringBuffer buffer(length);
sal_Int32 nIndex = 0;
do
{
- nameBuffer.append(fileName.getToken(0, token, nIndex).getStr());
+ buffer.append(fileName.getToken(0, token, nIndex).getStr());
if( nIndex == -1 )
break;
- if (nameBuffer.getLength() == 0 || OString(".") == nameBuffer.getStr())
+ if (buffer.getLength() == 0 || OString(".") == buffer.getStr())
{
- nameBuffer.append(token);
+ buffer.append(token);
continue;
}
#if defined(SAL_UNX)
- if (mkdir((char*)nameBuffer.getStr(), 0777) == -1)
+ if (mkdir((char*)buffer.getStr(), 0777) == -1)
#else
- if (mkdir((char*)nameBuffer.getStr()) == -1)
+ if (mkdir((char*)buffer.getStr()) == -1)
#endif
{
if ( errno == ENOENT )
return OString();
}
- nameBuffer.append(token);
+ buffer.append(token);
} while( nIndex != -1 );
OUString uSysFileName;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 1d6e63f..a9b16cb 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1069,7 +1069,7 @@ try
::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
sMessage += pResult->Name;
sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
- OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
+ OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
#endif
}
}
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 870727b..e827873 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -623,9 +623,9 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_FAIL( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
- += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
- += ::rtl::OString( " could not be filled!" ) );
+ OSL_FAIL( ( ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " )
+ += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
+ += ::rtl::OString( " could not be filled!" ) ).getStr() );
}
}
}
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 40824f1..2db64d3 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -441,9 +441,9 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co
}
catch(const NoSuchElementException&)
{
- OSL_FAIL(::rtl::OString("::openNode: there is no element named ")
- += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("!"));
+ OSL_FAIL((::rtl::OString("::openNode: there is no element named ")
+ += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ::rtl::OString("!")).getStr());
}
catch(Exception&)
{
@@ -471,9 +471,9 @@ Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference<
catch(NoSuchElementException& e)
{
OSL_UNUSED( e ); // make compiler happy
- OSL_FAIL(::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
- += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("!"));
+ OSL_FAIL((::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ")
+ += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ::rtl::OString("!")).getStr());
}
return aReturn;
}
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 082a2bb..44052e1 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -283,7 +283,7 @@ namespace
if ( !_rFunction )
{ // did not find the symbol
- OSL_FAIL( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) );
+ OSL_FAIL( ( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() );
osl_unloadModule( _rModule );
_rModule = NULL;
}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 85296a8..45485fd 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -791,7 +791,7 @@ void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IPars
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;
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 850eb10..141c3e2 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -378,6 +378,18 @@
#include <cstddef>
#include <iostream>
+//TODO, copied here from test/oustringostreaminserter.hxx, make DRY again:
+#include "osl/thread.h"
+template< typename charT, typename traits > std::basic_ostream<charT, traits> &
+operator <<(
+ std::basic_ostream<charT, traits> & stream, rtl::OUString const & string)
+{
+ return stream <<
+ rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr();
+ // best effort; potentially loses data due to conversion failures and
+ // embedded null characters
+}
+
namespace {
class Test: public CppUnit::TestFixture {
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index ee40c85..110ae20 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -59,6 +59,18 @@
#include "rtl/ustring.hxx"
#include "sal/types.h"
+//TODO, copied here from test/oustringostreaminserter.hxx, make DRY again:
+#include "osl/thread.h"
+template< typename charT, typename traits > std::basic_ostream<charT, traits> &
+operator <<(
+ std::basic_ostream<charT, traits> & stream, rtl::OUString const & string)
+{
+ return stream <<
+ rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr();
+ // best effort; potentially loses data due to conversion failures and
+ // embedded null characters
+}
+
namespace com { namespace sun { namespace star { namespace uno {
class Any;
} } } }
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e7c4574..2a6340d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1900,7 +1900,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
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_Impl::CreateEditObjectDialog( Window* p
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;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index e086ea5..6b4ace8 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -258,12 +258,12 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
sSql.append( ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) );
sSql.append(s_sSET);
- sSql.append(aSqlIter->second);
+ sSql.append(aSqlIter->second.toString());
::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first];
if ( rCondition.getLength() )
{
sSql.appendAscii(" WHERE ");
- sSql.append( rCondition );
+ sSql.append( rCondition.toString() );
}
executeUpdate(_rInsertRow ,_rOrginalRow,sSql.makeStringAndClear(),aSqlIter->first);
}
@@ -332,9 +332,9 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
sSql.append(sComposedTableName);
sSql.appendAscii(" ( ");
- sSql.append(aSqlIter->second);
+ sSql.append(aSqlIter->second.toString());
sSql.append(s_sVALUES);
- sSql.append(aParameter[aSqlIter->first]);
+ sSql.append(aParameter[aSqlIter->first].toString());
sSql.appendAscii(" )");
::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first];
@@ -342,11 +342,11 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
{
::rtl::OUStringBuffer sQuery;
sQuery.appendAscii("SELECT ");
- sQuery.append(aSqlIter->second);
+ sQuery.append(aSqlIter->second.toString());
sQuery.appendAscii(" FROM ");
sQuery.append(sComposedTableName);
sQuery.appendAscii(" WHERE ");
- sQuery.append(rCondition);
+ sQuery.append(rCondition.toString());
try
{
@@ -420,7 +420,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
sSql.append( ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) );
sSql.appendAscii(" WHERE ");
- sSql.append( rCondition );
+ sSql.append( rCondition.toString() );
executeDelete(_rDeleteRow,sSql.makeStringAndClear(),aSqlIter->first);
}
}
@@ -696,7 +696,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
::rtl::OUStringBuffer sQuery;
sQuery.appendAscii("SELECT ");
- sQuery.append(aSqlIter->second);
+ sQuery.append(aSqlIter->second.toString());
sQuery.appendAscii(" FROM ");
sQuery.append(sComposedTableName);
sQuery.appendAscii(" WHERE ");
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index e85f603..ef319d6 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1081,7 +1081,7 @@ namespace dbmm
)
{
Any aElement( _rxContainer->getByName( *elementName ) );
- ::rtl::OUString sElementName( ::rtl::OUStringBuffer( sHierarhicalBase ).append( *elementName ) );
+ ::rtl::OUString sElementName( sHierarhicalBase + *elementName );
Reference< XNameAccess > xSubContainer( aElement, UNO_QUERY );
if ( xSubContainer.is() )
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index f4d9aa4..98b9f4b 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -419,7 +419,6 @@ sal_Bool ORTFImportExport::Write()
String aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName();
aFonts = ByteString (aName,eDestEnc);
}
- ::rtl::OString aFormat("\\fcharset0\\fnil ");
ByteString aFontNr;
(*m_pStream) << "{\\fonttbl";
@@ -428,7 +427,7 @@ sal_Bool ORTFImportExport::Write()
{
(*m_pStream) << "\\f";
m_pStream->WriteNumber(static_cast<sal_Int32>(j));
- (*m_pStream) << aFormat;
+ (*m_pStream) << "\\fcharset0\\fnil ";
(*m_pStream) << aFonts.GetToken(j).GetBuffer();
(*m_pStream) << ';';
}
@@ -445,9 +444,9 @@ sal_Bool ORTFImportExport::Write()
(*m_pStream) << ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}"
<< ODatabaseImportExport::sNewLine;
- ::rtl::OString aTRRH("\\trrh-270\\pard\\intbl");
- ::rtl::OString aFS("\\fs20\\f0\\cf0\\cb2");
- ::rtl::OString aCell1("\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx");
+ static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
+ static char const aFS[] = "\\fs20\\f0\\cf0\\cb2";
+ static char const aCell1[] = "\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx";
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
@@ -583,8 +582,8 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
(*m_pStream) << ODatabaseImportExport::sNewLine;
- static const ::rtl::OString aCell2("\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx");
- static const ::rtl::OString aTRRH("\\trrh-270\\pard\\intbl");
+ static char const aCell2[] = "\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx";
+ static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
for ( sal_Int32 i=1; i<=_nColumnCount; ++i )
{
@@ -597,7 +596,6 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
const sal_Bool bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant );
const sal_Bool bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline );
const sal_Bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout );
- static const ::rtl::OString aFS2("\\fs20\\f1\\cf0\\cb1");
::comphelper::ComponentContext aContext(m_xFactory);
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
@@ -607,15 +605,14 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
{
(*m_pStream) << ODatabaseImportExport::sNewLine;
(*m_pStream) << '{';
- (*m_pStream) << pHorzChar[i-1];
+ (*m_pStream) << pHorzChar[i-1].getStr();
if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B;
if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I;
if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL;
if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE;
- (*m_pStream) << aFS2;
- (*m_pStream) << ' ';
+ (*m_pStream) << "\\fs20\\f1\\cf0\\cb1 ";
try
{
@@ -771,7 +768,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()).getStr() << '\"';
// TODO : think about the encoding of the font name
(*m_pStream) << "; " << sFontSize;
m_pStream->WriteNumber(static_cast<sal_Int32>(m_aFont.Height));
@@ -790,10 +787,7 @@ void OHTMLImportExport::WriteBody()
::Color aColor(nColor);
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- ::rtl::OString sOut( ' ' );
- sOut = sOut + OOO_STRING_SVTOOLS_HTML_O_bgcolor;
- sOut = sOut + "=";
- (*m_pStream) << sOut;
+ (*m_pStream) << " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=";
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
(*m_pStream) << '>'; OUT_LF();
@@ -847,14 +841,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()).getStr();
// TODO : think about the encoding of the name
TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1022,7 +1016,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
}
}
- TAG_ON( aStrTD );
+ TAG_ON( aStrTD.getStr() );
FontOn();
@@ -1066,13 +1060,13 @@ 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 + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_color;
aStrOut = aStrOut + "=";
- (*m_pStream) << aStrOut;
+ (*m_pStream) << aStrOut.getStr();
sal_Int32 nColor = 0;
if(m_xObject.is())
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 5960101..19687ae 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1311,7 +1311,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;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 52cbf98..e58110e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1527,7 +1527,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
const ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( xDestMetaData, _xTable, ::dbtools::eInDataManipulation, false, false, true );
sSql.append( sComposedTableName );
sSql.appendAscii(" ( ");
- sSql.append( sColumns );
+ sSql.append( sColumns.makeStringAndClear() );
sSql.appendAscii(" ) ( ");
sSql.append( m_pSourceObject->getSelectStatement());
sSql.appendAscii(" )");
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 952e4ea..6634356 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -160,7 +160,7 @@ void SAL_CALL CMimeContentType::getSym( void )
{
if ( m_nPos < m_ContentType.getLength( ) )
{
- m_nxtSym = OUString( &m_ContentType[m_nPos], 1 );
+ m_nxtSym = m_ContentType.copy(m_nPos, 1);
++m_nPos;
return;
}
@@ -329,12 +329,11 @@ OUString SAL_CALL CMimeContentType::pValue( )
getSym( );
pvalue = quotedPValue( );
- if ( OUString( &pvalue[pvalue.getLength() - 1], 1 ) != OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
+ if ( pvalue[pvalue.getLength() - 1] != '"' )
throw IllegalArgumentException( );
// remove the last quote-sign
- OUString qpvalue( pvalue, pvalue.getLength( ) - 1 );
- pvalue = qpvalue;
+ pvalue = pvalue.copy(0, pvalue.getLength() - 1);
if ( !pvalue.getLength( ) )
throw IllegalArgumentException( );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 9c8b9c7..297b06a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2640,8 +2640,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
pOldTxt[nChgPos] == pNewTxt[nChgPos] )
++nChgPos;
- xub_StrLen nChgLen = static_cast< xub_StrLen >( nNewLen - nChgPos );
- String aChgText( aNewText.copy( nChgPos ), nChgLen );
+ String aChgText( aNewText.copy( nChgPos ) );
// select text from first pos to be changed to current pos
EditSelection aSel( EditPaM( aPaM.GetNode(), (sal_uInt16) nChgPos ), aPaM );
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index fd3297f..7f58f15 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -497,7 +497,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
{
::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 ) );
}
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index c8262a5..bd570a1 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -208,7 +208,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_FAIL( sMessage.makeStringAndClear() );
+ OSL_FAIL( sMessage.makeStringAndClear().getStr() );
}
#endif
if ( m_eFileValidity == eValid )
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index d05808d..63419de 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -62,7 +62,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 );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index dce1d02..1dddac4 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1176,7 +1176,7 @@ namespace pcr
::rtl::OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" );
sMessage += ::rtl::OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "'!" );
- DBG_ASSERT( _rDescriptor.DisplayName.getLength(), sMessage );
+ DBG_ASSERT( _rDescriptor.DisplayName.getLength(), sMessage.getStr() );
#endif
_rDescriptor.DisplayName = _rProperty.Name;
}
@@ -1257,7 +1257,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_FAIL( sMessage );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
// finally insert this property control
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 31a244b..523a5fd 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -61,7 +61,7 @@ namespace
rArgs[0] >>= sFilename;
SolarMutexGuard aGuard;
const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding()));
- return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName));
+ return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr()));
}
class ResourceIndexAccessBase : public cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 2b3d6a7..7f4e161 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -188,7 +188,8 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
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));
}
diff --git a/filter/source/placeware/Base64Codec.cxx b/filter/source/placeware/Base64Codec.cxx
index 435b36c..46c1ed7 100644
--- a/filter/source/placeware/Base64Codec.cxx
+++ b/filter/source/placeware/Base64Codec.cxx
@@ -84,7 +84,6 @@ void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, cons
nLen = 3;
if (nLen == 0)
{
- sBuffer.setLength(0);
return;
}
@@ -111,23 +110,24 @@ void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, cons
break;
}
- sBuffer.appendAscii("====");
+ sal_Unicode buf[] = { '=', '=', '=', '=' };
sal_uInt8 nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0000) >> 18);
- sBuffer.setCharAt(0, aBase64EncodeTable [nIndex]);
+ buf[0] = aBase64EncodeTable [nIndex];
nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F000) >> 12);
- sBuffer.setCharAt(1, aBase64EncodeTable [nIndex]);
- if (nLen == 1)
- return;
-
- nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6);
- sBuffer.setCharAt(2, aBase64EncodeTable [nIndex]);
- if (nLen == 2)
- return;
-
- nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F));
- sBuffer.setCharAt(3, aBase64EncodeTable [nIndex]);
+ buf[1] = aBase64EncodeTable [nIndex];
+ if (nLen > 1)
+ {
+ nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6);
+ buf[2] = aBase64EncodeTable [nIndex];
+ if (nLen > 2)
+ {
+ nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F));
+ buf[3] = aBase64EncodeTable [nIndex];
+ }
+ }
+ sBuffer.append(buf, SAL_N_ELEMENTS(buf));
}
void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequence < sal_Int8 >& aPass)
@@ -137,9 +137,7 @@ void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Seque
const sal_Int8* pBuffer = aPass.getConstArray();
while (i < nBufferLength)
{
- rtl::OUStringBuffer sBuffer;
- ThreeByteToFourByte ((const sal_uInt8*)pBuffer, i, nBufferLength, sBuffer);
- aStrBuffer.append(sBuffer);
+ ThreeByteToFourByte ((const sal_uInt8*)pBuffer, i, nBufferLength, aStrBuffer);
i += 3;
}
}
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 6baa99a..a26642f 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -198,7 +198,7 @@ namespace XSLT
{
//decode the base64 string
Sequence<sal_Int8> oledata;
- SvXMLUnitConverter::decodeBase64(oledata, rtl::OUString::createFromAscii(content));
+ SvXMLUnitConverter::decodeBase64(oledata, rtl::OStringToOUString(content, RTL_TEXTENCODING_ASCII_US));
//create a temp stream to write data to
Reference<XStream> subStream = createTempFile();
Reference<XInputStream> xInput = subStream->getInputStream();
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index e961bf6..da3682e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1609,7 +1609,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaT
{
rtl::OUStringBuffer aBuffer;
FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
- rFormula += aBuffer;
+ rFormula += aBuffer.makeStringAndClear();
return p;
}
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 3669681..9b5051a 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -1926,8 +1926,8 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
else
{
g_warning( "Duff filter token '%s'\n",
- (const sal_Char *) rtl::OUStringToOString(
- rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString(
+ rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr() );
}
#endif
}
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 0c18c9c..94753c2 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1213,7 +1213,7 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbx
uno::Reference< ui::XUIElement > xUIElement;
implts_createToolBar( aTbxResName, bNotify, xUIElement );
- if ( aTitle && xUIElement.is() )
+ if ( aTitle.getLength() != 0 && xUIElement.is() )
{
SolarMutexGuard aGuard;
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 7a02463..a082b02 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -472,7 +472,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult )
* only for numbers up to 9999.
*/
static
-OUStringBuffer gr_smallNum(sal_Unicode table[], int n)
+OUString gr_smallNum(sal_Unicode table[], int n)
{
if (n > 9999)
throw IllegalArgumentException();
@@ -496,7 +496,7 @@ OUStringBuffer gr_smallNum(sal_Unicode table[], int n)
sb.insert(0, LEFT_KERAIA);
}
- return sb;
+ return sb.makeStringAndClear();
}
static
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 6d6ceb6..ec29d86 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -179,7 +179,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
if (!keyStr.getLength()) {
keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN,
LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
- if (!keyStr)
+ if (!keyStr.getLength())
throw RuntimeException();
}
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 989e7de..81caef9 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -272,7 +272,7 @@ public: // ExtendedDocumentHandler
source.sPublicId = sPublicId;
source.aInputStream = createStreamFromFile(
- OUStringToOString( sSystemId , RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString(sSystemId, RTL_TEXTENCODING_ASCII_US).getStr() );
return source;
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index b97fcd0..d488023 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -338,7 +338,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
{
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"cannot read file: "));
- aStr.append(aName);
+ aStr.append(aName.makeStringAndClear());
SetError(aStr.makeStringAndClear(), pTok);
WriteError( aTokStm );
return sal_False;
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 5f4ff7b..281d2b2 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -152,7 +152,7 @@ OString makeTempName(const OString& prefix)
#if defined(SAL_W32) || defined(SAL_UNX)
- OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath)
+ OSL_ASSERT( sizeof(tmpFilePattern) > ( tmpPath.getLength()
+ RTL_CONSTASCII_LENGTH(
PATH_SEPARATOR )
+ prefix.getLength()
@@ -160,7 +160,7 @@ OString makeTempName(const OString& prefix)
"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));
@@ -291,7 +291,7 @@ sal_Int32 compileFile(const OString * pathname)
cppArgs.append("\"");
OString cmdFileName = makeTempName(OString("idlc_"));
- FILE* pCmdFile = fopen(cmdFileName, "w");
+ FILE* pCmdFile = fopen(cmdFileName.getStr(), "w");
if ( !pCmdFile )
{
@@ -368,7 +368,7 @@ sal_Int32 compileFile(const OString * pathname)
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());
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index a56852d..407f85e 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -229,10 +229,9 @@ bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgum
sal_Int32 k = 0;
do
{
- OStringBuffer token; token.append("-I\""); token.append(param.getToken(0, ';', k)); token.append("\"");
if (buffer.getLength() > 0)
buffer.append(' ');
- buffer.append(token);
+ buffer.append("-I\""); buffer.append(param.getToken(0, ';', k)); buffer.append("\"");
} while (k != -1);
param = buffer.makeStringAndClear();
}
diff --git a/package/source/manifest/Base64Codec.cxx b/package/source/manifest/Base64Codec.cxx
index b4f5b6d..189bdb3 100644
--- a/package/source/manifest/Base64Codec.cxx
+++ b/package/source/manifest/Base64Codec.cxx
@@ -85,7 +85,6 @@ void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, cons
nLen = 3;
if (nLen == 0)
{
- sBuffer.setLength(0);
return;
}
@@ -112,23 +111,24 @@ void ThreeByteToFourByte (const sal_uInt8* pBuffer, const sal_Int32 nStart, cons
break;
}
- sBuffer.appendAscii("====");
+ sal_Unicode buf[] = { '=', '=', '=', '=' };
sal_uInt8 nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0000) >> 18);
- sBuffer.setCharAt(0, aBase64EncodeTable [nIndex]);
+ buf[0] = aBase64EncodeTable [nIndex];
nIndex = static_cast< sal_uInt8 >((nBinaer & 0x3F000) >> 12);
- sBuffer.setCharAt(1, aBase64EncodeTable [nIndex]);
- if (nLen == 1)
- return;
-
- nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6);
- sBuffer.setCharAt(2, aBase64EncodeTable [nIndex]);
- if (nLen == 2)
- return;
-
- nIndex = static_cast< sal_uInt8 >(nBinaer & 0x3F);
- sBuffer.setCharAt(3, aBase64EncodeTable [nIndex]);
+ buf[1] = aBase64EncodeTable [nIndex];
+ if (nLen > 1)
+ {
+ nIndex = static_cast< sal_uInt8 >((nBinaer & 0xFC0) >> 6);
+ buf[2] = aBase64EncodeTable [nIndex];
+ if (nLen > 2)
+ {
+ nIndex = static_cast< sal_uInt8 >(nBinaer & 0x3F);
+ buf[3] = aBase64EncodeTable [nIndex];
+ }
+ }
+ sBuffer.append(buf, SAL_N_ELEMENTS(buf));
}
void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequence < sal_Int8 >& aPass)
@@ -138,9 +138,7 @@ void Base64Codec::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Seque
const sal_uInt8* pBuffer = reinterpret_cast< const sal_uInt8* >( aPass.getConstArray() );
while (i < nBufferLength)
{
- rtl::OUStringBuffer sBuffer;
- ThreeByteToFourByte (pBuffer, i, nBufferLength, sBuffer);
- aStrBuffer.append(sBuffer);
+ ThreeByteToFourByte (pBuffer, i, nBufferLength, aStrBuffer);
i += 3;
}
}
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index f7a909f..f1dcf06 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -150,11 +150,11 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
OUString fileUrl;
if( nNew == -1 )
{
- fileUrl = OUString( &( pythonPathBootstrap[nIndex] ) );
+ fileUrl = pythonPathBootstrap.copy(nIndex);
}
else
{
- fileUrl = OUString( &(pythonPathBootstrap[nIndex]) , nNew - nIndex );
+ fileUrl = pythonPathBootstrap.copy(nIndex, nNew - nIndex);
}
OUString systemPath;
osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index 97b876f..f36cb0a 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -69,23 +69,23 @@ void raisePyExceptionWithAny( const com::sun::star::uno::Any &anyExc )
buf.appendAscii( ")" );
PyErr_SetString(
PyExc_SystemError,
- OUStringToOString(buf.makeStringAndClear(),RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString(buf.makeStringAndClear(),RTL_TEXTENCODING_ASCII_US).getStr() );
}
}
catch( com::sun::star::lang::IllegalArgumentException & e)
{
PyErr_SetString( PyExc_SystemError,
- OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr() );
}
catch( com::sun::star::script::CannotConvertException & e)
{
PyErr_SetString( PyExc_SystemError,
- OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr() );
}
catch( RuntimeException & e)
{
PyErr_SetString( PyExc_SystemError,
- OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr() );
}
}
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index a126152..07659aa 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -694,7 +694,7 @@ static PyObject * absolutize( PyObject *, PyObject * args )
PyErr_SetString(
PyExc_OSError,
- OUStringToOString(buf.makeStringAndClear(),osl_getThreadTextEncoding()));
+ OUStringToOString(buf.makeStringAndClear(),osl_getThreadTextEncoding()).getStr());
return 0;
}
return ustring2PyUnicode( ret ).getAcquired();
@@ -722,7 +722,8 @@ static PyObject * invoke(PyObject *, PyObject *args)
OStringBuffer buf;
buf.append("uno.invoke expects a tuple as 3rd argument, got ");
buf.append(PyString_AsString(PyObject_Str(item2)));
- PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
+ PyErr_SetString(
+ PyExc_RuntimeError, buf.makeStringAndClear().getStr());
}
}
else
@@ -730,14 +731,15 @@ static PyObject * invoke(PyObject *, PyObject *args)
OStringBuffer buf;
buf.append("uno.invoke expected a string as 2nd argument, got ");
buf.append(PyString_AsString(PyObject_Str(item1)));
- PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
+ PyErr_SetString(
+ PyExc_RuntimeError, buf.makeStringAndClear().getStr());
}
}
else
{
OStringBuffer buf;
buf.append("uno.invoke expects object, name, (arg1, arg2, ... )\n");
- PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
+ PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear().getStr());
}
return ret;
}
@@ -780,14 +782,16 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
OStringBuffer buf;
buf.append( "uno.setCurrentContext expects an XComponentContext implementation, got " );
buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 0) ) ) );
- PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+ PyErr_SetString(
+ PyExc_RuntimeError, buf.makeStringAndClear().getStr() );
}
}
else
{
OStringBuffer buf;
buf.append( "uno.setCurrentContext expects exactly one argument (the current Context)\n" );
- PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() );
+ PyErr_SetString(
+ PyExc_RuntimeError, buf.makeStringAndClear().getStr() );
}
}
catch( com::sun::star::uno::Exception & e )
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 987b679..fd1bb90 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -570,7 +570,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
systemName = regName;
OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
- if (unlink(name) != 0)
+ if (unlink(name.getStr()) != 0)
{
return REG_DESTROY_REGISTRY_FAILED;
}
@@ -830,7 +830,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
if (sFullKeyName.getLength() > 1)
sFullKeyName += keyName;
else
- sFullKeyName += (keyName+1);
+ sFullKeyName += keyName.copy(1);
sFullPath = sFullKeyName.copy(0, keyName.lastIndexOf('/') + 1);
} else
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index e1995d6..406af9d 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -121,7 +121,7 @@ bool Options_Impl::initOptions_Impl(std::vector< std::string > & rArgs)
{
return badOption("invalid", option.c_str());
}
- m_typeRegName = OString((*first).c_str(), (*first).size());
+ m_typeRegName = *first;
break;
}
case 'o':
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index f402224..e040931 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -48,7 +48,7 @@ namespace rptui
::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) );
DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
aBuffer.appendAscii( INET_HID_SCHEME );
aBuffer.append( aTmp.getStr() );
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 3368c1f..38b4d1e 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -115,7 +115,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
sal_uInt32 nRet = GetLangId( aL );
if( nRet == 0 )
{
- pTypCont->AddLanguage( aL );
+ pTypCont->AddLanguage( aL.getStr() );
nRet = GetLangId( aL );
}
if( rVariant.getLength() )
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 7a7bb32..b48537a 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -175,7 +175,7 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember )
}
else
pTC->pEH->Error( ERR_FALSETYPE, S.Top().pClass, aName1,
- pHS->getString( pHeader->pClass->GetId() ) );
+ pHS->getString( pHeader->pClass->GetId() ).getStr() );
}
else
{
@@ -214,7 +214,7 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember )
{
if( ERR_CONT_INVALIDTYPE == aError )
pTC->pEH->Error( aError, S.Top().pClass, aName1,
- pHS->getString( pHeader->pClass->GetId() ) );
+ pHS->getString( pHeader->pClass->GetId() ).getStr() );
else
pTC->pEH->Error( aError, S.Top().pClass, aName1 );
S.Top().pClass->GetElement( S.Top(), RscId(),
@@ -775,7 +775,7 @@ var_header_class
else
{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
@@ -804,7 +804,7 @@ var_header_class
else
{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
if( !DoClassHeader( &$6, sal_True ) )
@@ -833,7 +833,7 @@ var_header_class
else
{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
if( !DoClassHeader( &$6, sal_True ) )
@@ -853,7 +853,7 @@ var_header
S.Push( aInst );
else{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
}
@@ -877,7 +877,7 @@ var_header
}
else{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
}
@@ -902,7 +902,7 @@ var_header
}
else{
pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
- pHS->getString( $1 ) );
+ pHS->getString( $1 ).getStr() );
return( ERR_ERROR );
};
}
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 649c96b..24fac69 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -840,7 +840,7 @@ ERRTYPE RscCompiler::Link()
sMsg += "temporary rc file: " + aRcTmp + "\n";
sMsg += "temporary ilst file: " + aSysListTmp + "\n";
sMsg += "ilst file: " + aSysList + "\n";
- pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg);
+ pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg.getStr());
}
if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index fa377ac..581e5e2 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -8763,7 +8763,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer[0]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8779,7 +8780,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OStringBuffer[0]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8795,7 +8797,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OStringBuffer[0]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8811,7 +8814,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer[0]+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8827,7 +8831,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer[0]+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8843,7 +8848,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer[1]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8859,7 +8865,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OStringBuffer[1]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8875,7 +8882,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OStringBuffer[1]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8891,7 +8899,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer[1]+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8907,7 +8916,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer[1]+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8923,7 +8933,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer[2]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8939,7 +8950,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OUStringBuffer[2]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8955,7 +8967,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OUStringBuffer[2]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8971,7 +8984,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer[2]+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -8987,7 +9001,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer[2]+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9003,7 +9018,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer[3]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9019,7 +9035,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OStringBuffer[3]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9035,7 +9052,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OStringBuffer[3]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9051,7 +9069,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer[3]+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9067,7 +9086,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer[3]+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9083,7 +9103,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer[4]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9099,7 +9120,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OStringBuffer[4]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9115,7 +9137,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OStringBuffer[4]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9131,7 +9154,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer[4]+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9147,7 +9171,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer[4]+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9163,7 +9188,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 11 and return OStringBuffer(kSInt32Max)+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9179,7 +9205,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 0 and return OStringBuffer(kSInt32Max)+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9195,7 +9222,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -11 and return OStringBuffer(kSInt32Max)+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9211,7 +9239,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 2147483647 and return OStringBuffer(kSInt32Max)+2147483647",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -9227,7 +9256,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int32 -2147483648 and return OStringBuffer(kSInt32Max)+(-2147483648)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14482,7 +14512,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer[0]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14498,7 +14529,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OStringBuffer[0]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14514,7 +14546,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OStringBuffer[0]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14529,7 +14562,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer[0]+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14562,7 +14596,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer[1]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14578,7 +14613,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OStringBuffer[1]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14594,7 +14630,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OStringBuffer[1]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14609,7 +14646,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer[1]+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14625,7 +14663,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -9223372036854775808 and return OStringBuffer[1]+(-9223372036854775808)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14641,7 +14680,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer[2]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14657,7 +14697,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OUStringBuffer[2]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14673,7 +14714,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OUStringBuffer[2]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14688,7 +14730,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer[2]+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14704,7 +14747,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -9223372036854775808 and return OStringBuffer[2]+(-9223372036854775808)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14720,7 +14764,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer[3]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14736,7 +14781,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OStringBuffer[3]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14752,7 +14798,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OStringBuffer[3]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14767,7 +14814,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer[3]+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14783,7 +14831,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -9223372036854775808 and return OStringBuffer[3]+(-9223372036854775808)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14799,7 +14848,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer[4]+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14815,7 +14865,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OStringBuffer[4]+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14831,7 +14882,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OStringBuffer[4]+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14846,7 +14898,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer[4]+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14862,7 +14915,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -9223372036854775808 and return OStringBuffer[4]+(-9223372036854775808)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14878,7 +14932,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 11 and return OStringBuffer(kSInt64Max)+11",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14894,7 +14949,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 0 and return OStringBuffer(kSInt64Max)+0",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14910,7 +14966,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -11 and return OStringBuffer(kSInt64Max)+(-11)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14926,7 +14983,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 9223372036854775807 and return OStringBuffer(kSInt64Max)+9223372036854775807",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
@@ -14942,7 +15000,8 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"input Int64 -9223372036854775808 and return OStringBuffer(kSInt64Max)+(-9223372036854775808)",
- aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
+ (aStrBuf.toString() == expVal &&
+ aStrBuf.getLength() == expVal.getLength())
);
}
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index e03dead..923c7eb 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -97,8 +97,8 @@ static void doTest(util::Duration const & rid, char const*const pis,
CPPUNIT_ASSERT(eqDuration(rid, od));
::rtl::OUStringBuffer buf;
Converter::convertDuration(buf, od);
- OSL_TRACE(
- ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8));
+ OSL_TRACE("%s",
+ ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
CPPUNIT_ASSERT(buf.makeStringAndClear().equalsAscii(pos));
}
@@ -168,8 +168,8 @@ static void doTest(util::DateTime const & rdt, char const*const pis,
CPPUNIT_ASSERT(eqDateTime(rdt, odt));
::rtl::OUStringBuffer buf;
Converter::convertDateTime(buf, odt, true);
- OSL_TRACE(
- ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8));
+ OSL_TRACE("%s",
+ ::rtl::OUStringToOString(buf.getStr(), RTL_TEXTENCODING_UTF8).getStr());
CPPUNIT_ASSERT(buf.makeStringAndClear().equalsAscii(pos));
}
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index efa9f16..7ce607e 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -450,7 +450,7 @@ void Converter::convertDouble( OUStringBuffer& rBuffer,
fNumber *= fFactor;
::rtl::math::doubleToUStringBuffer( rBuffer, fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true);
if(bWriteUnits)
- rBuffer.append(sUnit);
+ rBuffer.append(sUnit.makeStringAndClear());
}
}
@@ -1478,7 +1478,6 @@ void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart, const
nLen = 3;
if (nLen == 0)
{
- sBuffer.setLength(0);
return;
}
@@ -1505,23 +1504,24 @@ void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart, const
break;
}
- sBuffer.appendAscii("====");
+ sal_Unicode buf[] = { '=', '=', '=', '=' };
sal_uInt8 nIndex (static_cast<sal_uInt8>((nBinaer & 0xFC0000) >> 18));
- sBuffer.setCharAt(0, aBase64EncodeTable [nIndex]);
+ buf[0] = aBase64EncodeTable [nIndex];
nIndex = static_cast<sal_uInt8>((nBinaer & 0x3F000) >> 12);
- sBuffer.setCharAt(1, aBase64EncodeTable [nIndex]);
- if (nLen == 1)
- return;
-
- nIndex = static_cast<sal_uInt8>((nBinaer & 0xFC0) >> 6);
- sBuffer.setCharAt(2, aBase64EncodeTable [nIndex]);
- if (nLen == 2)
- return;
-
- nIndex = static_cast<sal_uInt8>((nBinaer & 0x3F));
- sBuffer.setCharAt(3, aBase64EncodeTable [nIndex]);
+ buf[1] = aBase64EncodeTable [nIndex];
+ if (nLen > 1)
+ {
+ nIndex = static_cast<sal_uInt8>((nBinaer & 0xFC0) >> 6);
+ buf[2] = aBase64EncodeTable [nIndex];
+ if (nLen > 2)
+ {
+ nIndex = static_cast<sal_uInt8>((nBinaer & 0x3F));
+ buf[3] = aBase64EncodeTable [nIndex];
+ }
+ }
+ sBuffer.append(buf, SAL_N_ELEMENTS(buf));
}
void Converter::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& aPass)
@@ -1531,9 +1531,7 @@ void Converter::encodeBase64(rtl::OUStringBuffer& aStrBuffer, const uno::Sequenc
const sal_Int8* pBuffer = aPass.getConstArray();
while (i < nBufferLength)
{
- rtl::OUStringBuffer sBuffer;
- ThreeByteToFourByte (pBuffer, i, nBufferLength, sBuffer);
- aStrBuffer.append(sBuffer);
+ ThreeByteToFourByte (pBuffer, i, nBufferLength, aStrBuffer);
i += 3;
}
}
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 5e10512..f8ac35c 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -226,7 +226,7 @@ public: // ExtendedDocumentHandler
source.sPublicId = sPublicId;
source.aInputStream = createStreamFromFile(
- OUStringToOString( sSystemId , RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString( sSystemId, RTL_TEXTENCODING_ASCII_US).getStr() );
return source;
}
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index a3e53dd..0a4bd3c 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1016,7 +1016,7 @@ void ScFormulaCell::GetFormula( String& rFormula, const FormulaGrammar::Grammar
{
rtl::OUStringBuffer rBuffer( rFormula );
GetFormula( rBuffer, eGrammar );
- rFormula = rBuffer;
+ rFormula = rBuffer.makeStringAndClear();
}
void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows )
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index c7d7d9b..1a484ef 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5211,7 +5211,7 @@ void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken
; // nothing
}
if ( aBuffer.getLength() )
- rBuffer.append(aBuffer);
+ rBuffer.append(aBuffer.makeStringAndClear());
else
rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
}
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 15aaee4..bcfd95a 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -508,8 +508,7 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
{
OUString sId = msTarget.getLength() ? rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(),
XclXmlUtils::ToOUString( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" ),
- msTarget,
- XclXmlUtils::ToOUString( "External" ) ) : OUString();
+ msTarget, true ) : OUString();
rStrm.GetCurrentStream()->singleElement( XML_hyperlink,
XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(),
FSNS( XML_r, XML_id ), sId.getLength()
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index b83affe..c937489 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -978,7 +978,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
// OOXTODO: XML_theme, index into <clrScheme/>
// OOXTODO: XML_tint, double
FSEND );
- lcl_WriteValue( pStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ) ); // Twips->Pt
+ lcl_WriteValue( pStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt
lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline : NULL );
lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : NULL );
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 2b752f7..b4ca250 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -104,7 +104,7 @@ void ScXMLContentContext::Characters( const ::rtl::OUString& rChars )
void ScXMLContentContext::EndElement()
{
- sValue.append(sOUText);
+ sValue.append(sOUText.toString());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index a1d5214..e484fcd 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4782,7 +4782,7 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
// relative Referenzen Excel-konform auf die linke Spalte anpassen:
pData->UpdateSymbol(aContent, ScAddress( nStartCol, nOutRow, nTab ));
aFormula = '=';
- aFormula += aContent;
+ aFormula += aContent.toString();
pDoc->PutCell( nStartCol,nOutRow,nTab, new ScStringCell( aName ) );
pDoc->PutCell( nEndCol ,nOutRow,nTab, new ScStringCell( aFormula ) );
++nOutRow;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1e5733a..0e30cab 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -416,7 +416,7 @@ void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
{
rtl::OUStringBuffer sBuffer;
pRangeData->UpdateSymbol( sBuffer, maCursorPos );
- aAssign = sBuffer;
+ aAssign = sBuffer.makeStringAndClear();
}
else
{
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 37f9785..2b5b3af 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -685,13 +685,10 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
bool isSpaces(TextElement* pTextElem)
{
- rtl::OUString strSpace(32);
- ::rtl::OUString ouTxt2(pTextElem->Text);
- for(int i=0; i< pTextElem->Text.getLength(); i++)
- {
- rtl::OUString strToken = ouTxt2.copy(i,1) ;
- if( !strSpace.equals(strToken) )
+ for (sal_Int32 i = 0; i != pTextElem->Text.getLength(); ++i) {
+ if (pTextElem->Text[i] != ' ') {
return false;
+ }
}
return true;
}
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index c69f775..6e37c16 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -282,7 +282,9 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
::rtl::OUString aCodedList;
if ( pValues[nProp] >>= aCodedList )
{
- rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+ rtl::OString aTmp(
+ rtl::OUStringToOString(
+ aCodedList, RTL_TEXTENCODING_UTF8 ) );
sal_Int32 nIndex = 0;
do
{
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 5e70016..a9a147c 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -160,7 +160,7 @@ static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
GtkWidget *pImage = gtk_image_new_from_pixbuf( pPixbuf );
g_object_unref( G_OBJECT( pPixbuf ) );
- GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel );
+ GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL,
oustring_delete, GConnectFlags(0));
@@ -212,7 +212,7 @@ add_image_menu_item( GtkMenuShell *pMenuShell,
pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
GtkWidget *pMenuItem;
- pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel );
+ pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
gtk_menu_shell_append( pMenuShell, pMenuItem );
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 119b186..def2a67 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -70,8 +70,7 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
::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);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index f18c2e7..7a32326 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1071,7 +1071,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
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 = U2S(aVerbs[n].VerbName).getStr();
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
pNewSlot->pFirstArgDef = 0;
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 48ed32d..4af7c7b 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -260,7 +260,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
OString cmd =
#ifdef LINUX
// avoid blocking (call it in background)
- OStringBuffer().append( "( " ).append( aBuffer ).append( " ) &" ).makeStringAndClear();
+ OStringBuffer().append( "( " ).append( aBuffer.makeStringAndClear() ).append( " ) &" ).makeStringAndClear();
#else
aBuffer.makeStringAndClear();
#endif
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 253b0f4..889179c 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2288,9 +2288,12 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
}
else
{
- OSL_FAIL( OString( "Introspection: Property \"" ) +
- OUStringToOString( aPropName, RTL_TEXTENCODING_ASCII_US ) +
- OString( "\" found more than once in PropertySet" ) );
+ OSL_FAIL(
+ (OString("Introspection: Property \"") +
+ OUStringToOString(
+ aPropName, RTL_TEXTENCODING_UTF8) +
+ OString("\" found more than once in PropertySet")).
+ getStr());
}
// Count pflegen
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 9decddd..b44243e 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -770,8 +770,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
pOldTxt[nChgPos] == pNewTxt[nChgPos] )
++nChgPos;
- xub_StrLen nChgLen = static_cast< xub_StrLen >(nNewLen - nChgPos);
- String aChgText( aNewText.copy( nChgPos ), nChgLen );
+ String aChgText( aNewText.copy( nChgPos ) );
// select text from first pos to be changed to current pos
TextSelection aSel( TextPaM( aPaM.GetPara(), (sal_uInt16) nChgPos ), aPaM );
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index e8d7ada..2c36f8f 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -221,7 +221,8 @@ 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(
+ rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) );
INetURLObject aHID( aTmp );
if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
aBuffer.appendAscii( INET_HID_SCHEME );
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 2837df8..3ba8917 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1622,14 +1622,14 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta
// Einfuegen mu� sich an den Column Positionen orientieren
sal_Int32 i;
- String aName;
Any aWidth;
for (i = 0; i < xColumns->getCount(); ++i)
{
Reference< ::com::sun::star::beans::XPropertySet > xCol;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list