[Libreoffice-commits] .: 9 commits - idl/inc idl/source rsc/source sw/source tools/inc tools/source unusedcode.easy vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Sep 20 02:17:52 PDT 2011
idl/inc/lex.hxx | 2 -
idl/inc/types.hxx | 2 -
idl/source/cmptools/lex.cxx | 6 +--
idl/source/objects/types.cxx | 6 +--
idl/source/prj/database.cxx | 21 +++++++-----
rsc/source/res/rscmgr.cxx | 36 ++++++++++-----------
rsc/source/rsc/rsc.cxx | 20 +++++------
sw/source/filter/html/css1atr.cxx | 48 +++++++++++++---------------
tools/inc/tools/errinf.hxx | 19 -----------
tools/source/ref/errinf.cxx | 14 --------
unusedcode.easy | 2 -
vcl/unx/generic/fontmanager/fontcache.cxx | 15 ++------
vcl/unx/generic/fontmanager/fontmanager.cxx | 30 ++++++++---------
13 files changed, 90 insertions(+), 131 deletions(-)
New commits:
commit 0398b2546349c469180b2433cc58d15fffa283bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 09:17:00 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index dd5ae81..668b136 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,6 +4,7 @@
BitmapPalette::IsGreyPalette() const
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
+ByteString::Assign(char)
CAT::Inverse() const
CAT::makeChromaticAdaptationTag() const
CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned char*, float const*)
commit 39b24f2b079d68499e182c3f13910cbe9dee15e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 08:54:26 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index 29dc6d5..78a1626 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -467,11 +467,10 @@ void FontCache::read()
{
if( pFont->m_bUserOverride )
{
- ByteString aFilePath = rManager.getDirectory( nDir );
- aFilePath.Append( '/' );
- aFilePath.Append( ByteString(aFile) );
+ rtl::OStringBuffer aFilePath(rManager.getDirectory(nDir));
+ aFilePath.append('/').append(aFile);
struct stat aStat;
- if( stat( aFilePath.GetBuffer(), &aStat ) ||
+ if( stat( aFilePath.getStr(), &aStat ) ||
! S_ISREG( aStat.st_mode ) ||
aStat.st_size < 16 )
{
@@ -480,7 +479,7 @@ void FontCache::read()
#if OSL_DEBUG_LEVEL > 2
else
fprintf( stderr, "keeping file %s in outdated cache entry due to user override\n",
- aFilePath.GetBuffer() );
+ aFilePath.getStr() );
#endif
}
else
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 8c5c1bd..dbd73f8 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1337,19 +1337,16 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
aName.Erase( aName.Len()-4 );
aName.Append( pSuffix[i] );
- ByteString aFilePath( aDir );
- aFilePath.Append( '/' );
- aFilePath.Append( aName );
+ rtl::OStringBuffer aFilePath(aDir);
+ aFilePath.append('/').append(aName);
ByteString aAfmFile;
- if( access( aFilePath.GetBuffer(), R_OK ) )
+ if( access( aFilePath.makeStringAndClear().getStr(), R_OK ) )
{
// try in subdirectory afm instead
- aFilePath = aDir;
- aFilePath.Append( "/afm/" );
- aFilePath.Append( aName );
+ aFilePath.append(aDir).append("/afm/").append(aName);
- if( ! access( aFilePath.GetBuffer(), R_OK ) )
+ if( ! access(aFilePath.getStr(), R_OK) )
{
aAfmFile = "afm/";
aAfmFile += aName;
@@ -1381,14 +1378,16 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, co
}
else if (eFormat == AFM)
{
- ByteString aFilePath( aDir );
- aFilePath.Append( '/' );
- aFilePath.Append( ByteString( rFontFile ) );
+ rtl::OStringBuffer aFilePath(aDir);
+ aFilePath.append('/').append(rFontFile);
BuiltinFont* pFont = new BuiltinFont();
pFont->m_nDirectory = nDirID;
pFont->m_aMetricFile = rFontFile;
- if( pFont->readAfmMetrics( aFilePath, m_pAtoms, false, true ) )
+ if( pFont->readAfmMetrics( aFilePath.makeStringAndClear(), m_pAtoms,
+ false, true ) )
+ {
rNewFonts.push_back( pFont );
+ }
else
delete pFont;
}
@@ -2308,10 +2307,9 @@ void PrintFontManager::initialize()
continue;
struct stat aStat;
- ByteString aFilePath( aPath );
- aFilePath.Append( '/' );
- aFilePath.Append( ByteString( aFileName ) );
- if( ! stat( aFilePath.GetBuffer(), &aStat ) &&
+ rtl::OStringBuffer aFilePath(aPath);
+ aFilePath.append('/').append(aFileName);
+ if( ! stat( aFilePath.getStr(), &aStat ) &&
S_ISREG( aStat.st_mode ) )
{
if( findFontFileID( nDirID, aFileName ) == 0 )
commit 0190dca0b181f6a9fd069864e396164b532bebd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 01:20:35 2011 +0100
callcatcher: StandardErrorInfo is never constructed
diff --git a/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx
index 0b08d38..951fcfe 100644
--- a/tools/inc/tools/errinf.hxx
+++ b/tools/inc/tools/errinf.hxx
@@ -85,25 +85,6 @@ public:
};
-// ---------------------
-// - StandardErrorInfo -
-// ---------------------
-
-class StandardErrorInfo : public DynamicErrorInfo
-{
-private:
- sal_uIntPtr lExtId;
-
-public:
- TYPEINFO();
-
- StandardErrorInfo( sal_uIntPtr lUserId, sal_uIntPtr lExtId,
- sal_uInt16 nFlags = 0);
- sal_uIntPtr GetExtendedErrorCode() const { return lExtId; }
-
-};
-
-
// -------------------
// - StringErrorInfo -
// -------------------
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index d47dc75..cc8a18c 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -138,7 +138,6 @@ void EDcr_Impl::UnRegisterEDcr(DynamicErrorInfo *pDcr)
TYPEINIT0(ErrorInfo);
TYPEINIT1(DynamicErrorInfo, ErrorInfo);
-TYPEINIT1(StandardErrorInfo, DynamicErrorInfo);
TYPEINIT1(StringErrorInfo, DynamicErrorInfo);
TYPEINIT1(TwoStringErrorInfo, DynamicErrorInfo);
TYPEINIT1(MessageInfo, DynamicErrorInfo);
@@ -188,13 +187,6 @@ sal_uInt16 DynamicErrorInfo::GetDialogMask() const
}
-StandardErrorInfo::StandardErrorInfo(
- sal_uIntPtr UserId, sal_uIntPtr lArgExtId, sal_uInt16 nFlags)
-: DynamicErrorInfo(UserId, nFlags), lExtId(lArgExtId)
-{
-}
-
-
StringErrorInfo::StringErrorInfo(
sal_uIntPtr UserId, const String& aStringP, sal_uInt16 nFlags)
: DynamicErrorInfo(UserId, nFlags), aString(aStringP)
@@ -444,12 +436,6 @@ sal_Bool SimpleErrorHandler::CreateString(
aStr.append(RTL_CONSTASCII_STRINGPARAM("\nDId "));
aStr.append(static_cast<sal_Int32>(*pDyn));
}
- StandardErrorInfo *pStd=PTR_CAST(StandardErrorInfo,pInfo);
- if(pStd)
- {
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nXId "));
- aStr.append(static_cast<sal_Int32>(pStd->GetExtendedErrorCode()));
- }
rStr = rtl::OStringToOUString(aStr.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
return sal_True;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5114159..dd5ae81 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -832,7 +832,6 @@ SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
StackWindow::LinkStubButtonHdl(void*, void*)
-StandardErrorInfo::StandardErrorInfo(unsigned long, unsigned long, unsigned short)
StatusBar::CopyItems(StatusBar const&)
StatusBar::GetItemBits(unsigned short) const
StatusBar::GetItemData(unsigned short) const
commit 70e2e12154c256b9eb1c1b88fb46630c0ac130a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 01:13:09 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e026b04..1137694 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -851,22 +851,22 @@ ERRTYPE RscCompiler::Link()
pTC->ChangeLanguage( it->aLangName );
pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
pTC->ClearSysNames();
- ByteString aSysSearchPath( it->aLangSearchPath );
+ rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath);
xub_StrLen nIndex = 0;
ByteString aSearchPath = pTC->GetSearchPath();
while( nIndex != STRING_NOTFOUND )
{
ByteString aToken = aSearchPath.GetToken( 0, cSearchDelim, nIndex );
- if( aSysSearchPath.Len() )
- aSysSearchPath.Append( cSearchDelim );
- aSysSearchPath.Append( aToken );
- aSysSearchPath.Append( cAccessDelim );
- aSysSearchPath.Append( it->aLangName );
- aSysSearchPath.Append( cSearchDelim );
- aSysSearchPath.Append( aToken );
+ if (aSysSearchPath.getLength())
+ aSysSearchPath.append(cSearchDelim);
+ aSysSearchPath.append(aToken);
+ aSysSearchPath.append(cAccessDelim);
+ aSysSearchPath.append(it->aLangName);
+ aSysSearchPath.append(cSearchDelim);
+ aSysSearchPath.append(aToken);
}
- OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
- pTC->SetSysSearchPath( aSysSearchPath );
+ OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.getStr() );
+ pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear());
WriteRcContext aContext;
commit 07a793a2b73a4449432138f037416075d69c9f4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 01:01:16 2011 +0100
WaE: and no longer need this here then
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index e60d50f..29dc6d5 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -690,8 +690,6 @@ bool FontCache::getFontCacheFile( int nDirID, const OString& rFile, list< PrintF
*/
void FontCache::updateFontCacheEntry( const PrintFontManager::PrintFont* pFont, bool bFlush )
{
- PrintFontManager& rManager( PrintFontManager::get() );
-
OString aFile;
int nDirID = 0;
switch( pFont->m_eType )
commit 90587ed9352bf3ca1ec07ff38a2b89acf646f088
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 00:58:50 2011 +0100
missed optimization opportunity from 9b6ea21 to drop unused ByteString
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index b88d244..e60d50f 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -748,10 +748,6 @@ void FontCache::updateFontCacheEntry( const PrintFontManager::PrintFont* pFont,
{
pCacheFont = clonePrintFont( pFont );
m_aCache[nDirID].m_aEntries[aFile].m_aEntry.push_back( pCacheFont );
-
- ByteString aPath = rManager.getDirectory( nDirID );
- aPath.Append( '/' );
- aPath.Append( ByteString( aFile ) );
m_bDoFlush = true;
}
if( bFlush )
commit 05139b62b2e2a773073caa3395a0824f5f6840c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 00:20:34 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index b8a5d2a..308ff62 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -246,15 +246,15 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
const sal_Char *pVal,
const String *pSVal )
{
- ByteString sOut;
+ rtl::OStringBuffer sOut;
if( bFirstCSS1Rule && (nCSS1OutMode & CSS1_OUTMODE_RULE_ON)!=0 )
{
bFirstCSS1Rule = sal_False;
OutNewLine();
- ((((sOut += '<') += OOO_STRING_SVTOOLS_HTML_style) += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += "=\"text/css\">";
- Strm() << sOut.GetBuffer();
- sOut.Erase();
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_style).append(' ')
+ .append(OOO_STRING_SVTOOLS_HTML_O_type).append("=\"text/css\">");
+ Strm() << sOut.makeStringAndClear().getStr();
OutNewLine();
Strm() << '<' << OOO_STRING_SVTOOLS_HTML_comment;
@@ -269,7 +269,9 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
case CSS1_OUTMODE_SPAN_TAG1_ON:
if( bTagOn )
{
- ((((sOut += '<') += OOO_STRING_SVTOOLS_HTML_span) += ' ') += OOO_STRING_SVTOOLS_HTML_O_style) += "=\"";
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_span)
+ .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_style)
+ .append("=\"");
}
else
{
@@ -280,30 +282,29 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
case CSS1_OUTMODE_RULE_ON:
{
- ByteString sTmp( aCSS1Selector, eDestEnc );
OutNewLine();
- (sOut = sTmp) += " { ";
+ sOut.append(rtl::OUStringToOString(aCSS1Selector, eDestEnc)).append(" { ");
}
break;
case CSS1_OUTMODE_STYLE_OPT_ON:
- ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_style) += "=\"";
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_style)
+ .append("=\"");
break;
}
bFirstCSS1Property = sal_False;
}
else
{
- sOut += "; ";
+ sOut.append("; ");
}
- (sOut += pProp) += ": ";
+ sOut.append(pProp).append(": ");
if( nCSS1OutMode & CSS1_OUTMODE_ENCODE )
{
// In STYLE-Optionen den String codieren
- Strm() << sOut.GetBuffer();
- sOut.Erase();
+ Strm() << sOut.makeStringAndClear().getStr();
if( pVal )
HTMLOutFuncs::Out_String( Strm(), String::CreateFromAscii(pVal),
eDestEnc, &aNonConvertableCharacters );
@@ -314,16 +315,13 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
{
// Im STYLE-Tag des String direct ausgeben
if( pVal )
- sOut += pVal;
+ sOut.append(pVal);
else if( pSVal )
- {
- ByteString sTmp( *pSVal, eDestEnc );
- sOut += sTmp;
- }
+ sOut.append(rtl::OUStringToOString(*pSVal, eDestEnc));
}
- if( sOut.Len() )
- Strm() << sOut.GetBuffer();
+ if (sOut.getLength())
+ Strm() << sOut.makeStringAndClear().getStr();
}
static void AddUnitPropertyValue(rtl::OStringBuffer &rOut, long nVal,
@@ -552,23 +550,23 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
{
// wenn eine Property als Bestandteil einer Style-Option
// ausgegeben wurde, muss die Optiomn noch beendet werden
- ByteString sOut;
+ rtl::OStringBuffer sOut;
switch( nCSS1OutMode & CSS1_OUTMODE_ANY_OFF )
{
case CSS1_OUTMODE_SPAN_TAG_OFF:
- sOut = sCSS1_span_tag_end;
+ sOut.append(sCSS1_span_tag_end);
break;
case CSS1_OUTMODE_STYLE_OPT_OFF:
- sOut = cCSS1_style_opt_end;
+ sOut.append(cCSS1_style_opt_end);
break;
case CSS1_OUTMODE_RULE_OFF:
- sOut = sCSS1_rule_end;
+ sOut.append(sCSS1_rule_end);
break;
}
- if( sOut.Len() )
- Strm() << sOut.GetBuffer();
+ if (sOut.getLength())
+ Strm() << sOut.makeStringAndClear().getStr();
}
}
commit 557ba436637d3cc926c063aba0458f04a916fa66
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 19 23:44:54 2011 +0100
ByteString->rtl::OString[Buffer]
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 607f0ec..c3d28f1 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -66,7 +66,7 @@ public:
SvToken & operator = ( const SvToken & rObj );
- ByteString GetTokenAsString() const;
+ rtl::OString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index e4f405d..b6bdfdb 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -245,7 +245,7 @@ public:
void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
- ByteString GetParserString() const;
+ rtl::OString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
const ByteString & rChief );
#endif
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 244aa23..ace8e06 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -38,9 +38,9 @@
#include <globals.hxx>
#include <tools/bigint.hxx>
-ByteString SvToken::GetTokenAsString() const
+rtl::OString SvToken::GetTokenAsString() const
{
- ByteString aStr;
+ rtl::OString aStr;
switch( nType )
{
case SVTOKEN_EMPTY:
@@ -61,7 +61,7 @@ ByteString SvToken::GetTokenAsString() const
aStr = aString;
break;
case SVTOKEN_CHAR:
- aStr = cChar;
+ aStr = rtl::OString(cChar);
break;
case SVTOKEN_RTTIBASE:
aStr = "RTTIBASE";
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 625b066..d027e86 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1699,14 +1699,14 @@ void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteMethodArgs( rBase, rOutStm, nTab +2, nT );
}
-ByteString SvMetaType::GetParserString() const
+rtl::OString SvMetaType::GetParserString() const
{
SvMetaType * pBT = GetBaseType();
if( pBT != this )
return pBT->GetParserString();
int type = GetType();
- ByteString aPStr;
+ rtl::OString aPStr;
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
@@ -1719,7 +1719,7 @@ ByteString SvMetaType::GetParserString() const
}
}
else
- aPStr = GetParserChar();
+ aPStr = rtl::OString(GetParserChar());
return aPStr;
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 5761a45..e823bdf 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -311,32 +311,35 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
else if( pTok->Is( SvHash_include() ) )
{
pTok = aTokStm.GetToken_Next();
- ByteString aName;
+ rtl::OStringBuffer aName;
if( pTok->IsString() )
- aName = pTok->GetString();
+ aName.append(pTok->GetString());
else if( pTok->IsChar() && pTok->GetChar() == '<' )
{
pTok = aTokStm.GetToken_Next();
while( !pTok->IsEof()
&& !(pTok->IsChar() && pTok->GetChar() == '>') )
{
- aName += pTok->GetTokenAsString();
+ aName.append(pTok->GetTokenAsString());
pTok = aTokStm.GetToken_Next();
}
if( pTok->IsEof() )
{
- ByteString aStr( "unexpected eof in #include" );
+ rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+ "unexpected eof in #include"));
// set error
- SetError( aStr, pTok );
+ SetError(aStr, pTok);
WriteError( aTokStm );
return sal_False;
}
}
- if( !ReadIdFile( String::CreateFromAscii(aName.GetBuffer()) ) )
+ if (!ReadIdFile(rtl::OStringToOUString(aName.toString(),
+ RTL_TEXTENCODING_ASCII_US)))
{
- ByteString aStr = "cannot read file: ";
- aStr += aName;
- SetError( aStr, pTok );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "cannot read file: "));
+ aStr.append(aName);
+ SetError(aStr.makeStringAndClear(), pTok);
WriteError( aTokStm );
return sal_False;
}
commit 512c562b8671fb8998ab8c6f31502b59f108e13a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 19 23:44:07 2011 +0100
ByteString->rtl::OString[Buffer]
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 1e65962..663ab35 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -314,41 +314,41 @@ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
}
-static ByteString MakeSmartName( const ByteString & rDefName )
+static rtl::OString MakeSmartName( const ByteString & rDefName )
{
- ByteString aSmartName;
+ rtl::OStringBuffer aSmartName;
if( rDefName.Len() )
{
char * pStr = (char *)rDefName.GetBuffer();
- aSmartName = (char)toupper( *pStr );
+ aSmartName.append(static_cast<sal_Char>(toupper(*pStr)));
while( *++pStr )
{
if( '_' == *pStr )
{
if( *++pStr )
- aSmartName += (char)toupper( *pStr );
+ aSmartName.append(static_cast<sal_Char>(toupper(*pStr)));
else
break;
}
else
- aSmartName += (char)tolower( *pStr );
+ aSmartName.append(static_cast<sal_Char>(tolower(*pStr)));
}
}
- return aSmartName;
+ return aSmartName.makeStringAndClear();
}
-static ByteString MakeName( RscTypCont * pTypCon, RscTop * pClass,
+static rtl::OString MakeName( RscTypCont * pTypCon, RscTop * pClass,
const ByteString & rName )
{
- ByteString aRet;
+ rtl::OStringBuffer aRet;
if( !pTypCon->IsSmart() || isdigit( rName.GetChar(0) ) )
{
- aRet += pHS->getString( pClass->GetId() ).getStr();
- aRet += rName;
+ aRet.append(pHS->getString( pClass->GetId() ).getStr());
+ aRet.append(rName);
}
else
- aRet += MakeSmartName( rName );
- return aRet;
+ aRet.append(MakeSmartName(rName));
+ return aRet.makeStringAndClear();
}
/*************************************************************************
@@ -390,7 +390,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
{
fprintf( fOutput, "class %s",
MakeName( pTC, rInst.pClass,
- rId.GetName() ).GetBuffer() );
+ rId.GetName() ).getStr() );
fprintf( fOutput, " : public %s",
pHS->getString( rInst.pClass->GetId() ).getStr() );
fprintf( fOutput, "\n{\nprotected:\n" );
@@ -408,7 +408,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "public:\n " );
fprintf( fOutput, "%s%s bFreeRes = TRUE )",
MakeName( pTC, rInst.pClass,
- rId.GetName() ).GetBuffer(),
+ rId.GetName() ).getStr(),
(rInst.pClass->aCallParType).GetBuffer() );
fprintf( fOutput, ";\n};\n\n" );
}
@@ -426,7 +426,7 @@ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput,
{
fprintf( fOutput, " %s", pHS->getString( rInst.pClass->GetId() ).getStr() );
fprintf( fOutput, " a%s;\n",
- MakeName( pTC, rInst.pClass, rId.GetName() ).GetBuffer() );
+ MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() );
return ERR_OK;
}
@@ -469,8 +469,8 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput,
else if (pTC)
{
fprintf( fOutput, "%s::%s",
- MakeName( pTC, rInst.pClass, rId.GetName() ).GetBuffer(),
- MakeName( pTC, rInst.pClass, rId.GetName() ).GetBuffer() );
+ MakeName( pTC, rInst.pClass, rId.GetName() ).getStr(),
+ MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() );
fprintf( fOutput, "%s", (rInst.pClass->aCallParType).GetBuffer() );
if( GetCount( rInst ) )
fprintf( fOutput, " bFreeRes" );
@@ -518,7 +518,7 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, const RscId & rId )
{
fprintf( fOutput, ",\n a%s",
- MakeName( pTC, rInst.pClass, rId.GetName() ).GetBuffer() );
+ MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() );
fprintf( fOutput, "%s", (rInst.pClass->aCallPar2).GetBuffer() );
fprintf( fOutput, " ResId( %s ) )", (rId.GetName()).GetBuffer() );
More information about the Libreoffice-commits
mailing list