[Libreoffice-commits] .: 9 commits - basic/inc basic/source idl/inc idl/source l10ntools/inc l10ntools/source sfx2/inc tools/inc tools/source unotools/inc unotools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jan 27 05:00:46 PST 2012
basic/inc/basic/sbx.hxx | 1
basic/inc/basic/sbxobj.hxx | 3
basic/source/sbx/sbxobj.cxx | 5
idl/inc/basobj.hxx | 7 -
idl/inc/hash.hxx | 22 +--
idl/inc/lex.hxx | 14 +-
idl/inc/module.hxx | 7 -
idl/inc/object.hxx | 4
idl/inc/slot.hxx | 4
idl/inc/types.hxx | 26 +---
idl/source/cmptools/hash.cxx | 29 ++--
idl/source/objects/basobj.cxx | 24 +--
idl/source/objects/bastype.cxx | 20 +--
idl/source/objects/module.cxx | 41 ------
idl/source/objects/object.cxx | 91 --------------
idl/source/objects/slot.cxx | 221 +++++++++++-----------------------
idl/source/objects/types.cxx | 120 ++++++++++--------
idl/source/prj/database.cxx | 6
l10ntools/inc/export.hxx | 38 ++---
l10ntools/inc/gsicheck.hxx | 2
l10ntools/inc/tagtest.hxx | 38 ++---
l10ntools/source/export.cxx | 26 ++--
l10ntools/source/gsicheck.cxx | 8 -
l10ntools/source/helpmerge.cxx | 8 +
l10ntools/source/merge.cxx | 13 +-
l10ntools/source/tagtest.cxx | 107 ++++++++--------
sfx2/inc/sfx2/progress.hxx | 1
tools/inc/tools/globname.hxx | 8 -
tools/source/ref/globname.cxx | 30 ----
unotools/inc/unotools/optionsdlg.hxx | 14 +-
unotools/source/config/optionsdlg.cxx | 9 -
unusedcode.easy | 1
32 files changed, 351 insertions(+), 597 deletions(-)
New commits:
commit 68eabebbf7e3f41310fa198fcf5d565fa03c9f6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 12:48:15 2012 +0000
update unused list
diff --git a/unusedcode.easy b/unusedcode.easy
index 6a75a57..d75fd4f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1678,6 +1678,7 @@ unicode::isBase(unsigned short)
unicode::isPunctuation(unsigned short)
unicode::isTitle(unsigned short)
unographic::GraphicDescriptor::isValid() const
+unotools::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<unotools::ConfigurationChanges> const&, rtl::OUString const&) const
unotools::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
unotools::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<unotools::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
commit 8145136690674689610da84b47b96e81dd9438f0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 12:47:59 2012 +0000
SvGlobalName::GetctorName is now redundant
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index f0bf3e7..e691d3a 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -100,15 +100,7 @@ public:
void MakeFromMemory( void * pData );
sal_Bool MakeId( const String & rId );
- String GetctorName() const;
String GetHexName() const;
- String GetRegDbName() const
- {
- String a = '{';
- a += GetHexName();
- a += '}';
- return a;
- }
SvGlobalName( const CLSID & rId );
const CLSID & GetCLSID() const { return *(CLSID *)pImp->szData; }
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 6a57099..e9b2ed0 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -339,36 +339,6 @@ sal_Bool SvGlobalName::MakeId( const String & rIdStr )
}
/*************************************************************************
-|* SvGlobalName::GetctorName()
-*************************************************************************/
-String SvGlobalName::GetctorName() const
-{
- rtl::OStringBuffer aStrBuffer;
-
- sal_Char buf[ 20 ];
- sal_uInt32 Data1;
- memcpy(&Data1, pImp->szData, sizeof(sal_uInt32));
- sprintf( buf, "0x%8.8" SAL_PRIXUINT32, Data1 );
- aStrBuffer.append(buf);
- sal_uInt16 i;
- for( i = 4; i < 8; i += 2 )
- {
- aStrBuffer.append(',');
- sal_uInt16 Data2;
- memcpy(&Data2, pImp->szData+i, sizeof(sal_uInt16));
- sprintf( buf, "0x%4.4X", Data2 );
- aStrBuffer.append(buf);
- }
- for( i = 8; i < 16; i++ )
- {
- aStrBuffer.append(',');
- sprintf( buf, "0x%2.2x", pImp->szData[ i ] );
- aStrBuffer.append(buf);
- }
- return rtl::OStringToOUString(aStrBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
-}
-
-/*************************************************************************
|* SvGlobalName::GetHexName()
*************************************************************************/
String SvGlobalName::GetHexName() const
commit 595b7345012ddfb2e04f70f4d03c0bd6cbd62862
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 11:36:47 2012 +0000
drop unnecessary include
diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx
index 9a0034e..e7a38bc 100644
--- a/unotools/inc/unotools/optionsdlg.hxx
+++ b/unotools/inc/unotools/optionsdlg.hxx
@@ -29,7 +29,7 @@
#define INCLUDED_unotools_OPTIONSDLG_HXX
#include "unotools/unotoolsdllapi.h"
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
class SvtOptionsDlgOptions_Impl;
@@ -43,12 +43,12 @@ public:
SvtOptionsDialogOptions();
virtual ~SvtOptionsDialogOptions();
- sal_Bool IsGroupHidden ( const String& _rGroup ) const;
- sal_Bool IsPageHidden ( const String& _rPage,
- const String& _rGroup ) const;
- sal_Bool IsOptionHidden ( const String& _rOption,
- const String& _rPage,
- const String& _rGroup ) const;
+ sal_Bool IsGroupHidden ( const rtl::OUString& _rGroup ) const;
+ sal_Bool IsPageHidden ( const rtl::OUString& _rPage,
+ const rtl::OUString& _rGroup ) const;
+ sal_Bool IsOptionHidden ( const rtl::OUString& _rOption,
+ const rtl::OUString& _rPage,
+ const rtl::OUString& _rGroup ) const;
};
#endif
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 51295be..53e4eac 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -261,22 +261,23 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions()
{
if ( pOptions->IsModified() )
pOptions->Commit();
- DELETEZ( pOptions );
+ delete pOptions;
+ pOptions = NULL;
}
}
-sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const String& _rGroup ) const
+sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const rtl::OUString& _rGroup ) const
{
return m_pImp->IsGroupHidden( _rGroup );
}
-sal_Bool SvtOptionsDialogOptions::IsPageHidden( const String& _rPage, const String& _rGroup ) const
+sal_Bool SvtOptionsDialogOptions::IsPageHidden( const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const
{
return m_pImp->IsPageHidden( _rPage, _rGroup );
}
sal_Bool SvtOptionsDialogOptions::IsOptionHidden(
- const String& _rOption, const String& _rPage, const String& _rGroup ) const
+ const rtl::OUString& _rOption, const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const
{
return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup );
}
commit 7045e4e15c9a41864c92899f6a58f68e13a24930
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 11:16:15 2012 +0000
ByteString->rtl::OString
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index e3ca6f0..40ecba8 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -72,7 +72,7 @@ typedef boost::unordered_map<rtl::OString, PFormEntrys*, rtl::OStringHash>
typedef boost::unordered_map<rtl::OString, MergeData*, rtl::OStringHash>
MergeDataHashMap;
-#define SOURCE_LANGUAGE ByteString("en-US")
+#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
#define LIST_REFID "LIST_REFID"
typedef ByteStringHashMap ExportListEntry;
@@ -139,11 +139,11 @@ public:
sal_Bool bRestMerged;
- ByteString sResTyp;
- ByteString sId;
- ByteString sGId;
- ByteString sHelpId;
- ByteString sFilename;
+ rtl::OString sResTyp;
+ rtl::OString sId;
+ rtl::OString sGId;
+ rtl::OString sHelpId;
+ rtl::OString sFilename;
ByteStringHashMap sText;
sal_uInt16 nTextRefId;
@@ -157,7 +157,7 @@ public:
ByteStringHashMap sTitle;
sal_uInt16 nTitleRefId;
- ByteString sTextTyp;
+ rtl::OString sTextTyp;
ExportList *pStringList;
ExportList *pUIEntries;
@@ -165,11 +165,11 @@ public:
ExportList *pFilterList;
ExportList *pPairedList;
- ByteString sPForm;
+ rtl::OString sPForm;
void Dump();
- ResData( const ByteString &rPF, const ByteString &rGId )
+ ResData(const rtl::OString &rPF, const rtl::OString &rGId)
:
nWidth( 0 ),
nChildIndex( 0 ),
@@ -197,9 +197,9 @@ public:
{
sGId = comphelper::string::remove(sGId, '\r');
sPForm = comphelper::string::remove(sPForm, '\r');
- };
+ }
- ResData( const ByteString &rPF, const ByteString &rGId , const ByteString &rFilename )
+ ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::OString &rFilename)
:
nChildIndex( 0 ),
nIdLevel( ID_LEVEL_NULL ),
@@ -227,7 +227,7 @@ public:
{
sGId = comphelper::string::remove(sGId, '\r');
sPForm = comphelper::string::remove(sPForm, '\r');
- };
+ }
};
@@ -435,21 +435,21 @@ class MergeData
{
friend class MergeDataFile;
private:
- ByteString sTyp;
- ByteString sGID;
- ByteString sLID;
- ByteString sFilename;
+ rtl::OString sTyp;
+ rtl::OString sGID;
+ rtl::OString sLID;
+ rtl::OString sFilename;
PFormEntrysHashMap aMap;
public:
- MergeData( const ByteString &rTyp, const ByteString &rGID, const ByteString &rLID , const ByteString &rFilename )
+ MergeData( const rtl::OString &rTyp, const rtl::OString &rGID, const rtl::OString &rLID , const rtl::OString &rFilename )
: sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {};
~MergeData();
PFormEntrys* GetPFormEntries();
void Insert( PFormEntrys* pfEntrys );
- PFormEntrys* GetPFObject( const ByteString& rPFO );
+ PFormEntrys* GetPFObject( const rtl::OString &rPFO );
- ByteString Dump();
+ rtl::OString Dump();
sal_Bool operator==( ResData *pData );
};
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index b98d729..fff822f 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -118,7 +118,7 @@ public:
~GSIBlock();
void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
- void InsertLine( GSILine* pLine, const ByteString aSourceLang);
+ void InsertLine( GSILine* pLine, const rtl::OString &rSourceLang);
void SetReferenceLine( GSILine* pLine );
sal_Bool CheckSyntax( sal_uLong nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags );
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 95ce009..a3d9165 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -79,18 +79,18 @@ explicit TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr, ParserMessageL
/**
Is the property to be ignored or does it have the default value anyways
**/
- sal_Bool IsPropertyRelevant( const ByteString &aName, const String &aValue ) const;
- sal_Bool IsPropertyValueValid( const ByteString &aName, const String &aValue ) const;
+ sal_Bool IsPropertyRelevant( const rtl::OString &rName, const String &rValue ) const;
+ sal_Bool IsPropertyValueValid( const rtl::OString &rName, const String &rValue ) const;
/**
Does the property contain the same value for all languages
e.g.: the href in a link tag
**/
- sal_Bool IsPropertyInvariant( const ByteString &aName, const String &aValue ) const;
+ sal_Bool IsPropertyInvariant( const rtl::OString &rName, const String &rValue ) const;
/**
a subset of IsPropertyInvariant but containing only those that are fixable
we dont wat to fix e.g.: ahelp :: visibility
**/
- sal_Bool IsPropertyFixable( const ByteString &aName ) const;
+ sal_Bool IsPropertyFixable( const rtl::OString &rName ) const;
sal_Bool MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, ParserMessageList &rErrorList, sal_Bool bFixTags = sal_False ) const;
sal_Bool IsDone() const { return bDone; }
@@ -108,8 +108,8 @@ private:
public:
~ParserMessageList() { clear(); }
- void AddError( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
- void AddWarning( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag );
+ void AddError( sal_uInt16 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag );
+ void AddWarning( sal_uInt16 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag );
sal_Bool HasErrors();
bool empty() const { return maList.empty(); }
@@ -212,8 +212,8 @@ private:
TokenList& operator =( const TokenList& rList );
public:
- TokenList() {};
- ~TokenList(){ clear(); };
+ TokenList() {}
+ ~TokenList(){ clear(); }
size_t size() const { return maList.size(); }
void clear()
@@ -244,40 +244,40 @@ public:
class ParserMessage
{
sal_uInt16 nErrorNr;
- ByteString aErrorText;
+ rtl::OString aErrorText;
sal_uInt16 nTagBegin,nTagLength;
protected:
- ParserMessage( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+ ParserMessage( sal_uInt16 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag );
public:
sal_uInt16 GetErrorNr() { return nErrorNr; }
- ByteString GetErrorText() { return aErrorText; }
+ rtl::OString GetErrorText() { return aErrorText; }
sal_uInt16 GetTagBegin() { return nTagBegin; }
sal_uInt16 GetTagLength() { return nTagLength; }
virtual ~ParserMessage() {}
virtual sal_Bool IsError() =0;
- virtual ByteString Prefix() =0;
+ virtual rtl::OString Prefix() =0;
};
class ParserError : public ParserMessage
{
public:
- ParserError( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+ ParserError( sal_uInt16 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag );
- virtual sal_Bool IsError() {return sal_True;};
- virtual ByteString Prefix() {return "Error:"; };
+ virtual sal_Bool IsError() {return sal_True;}
+ virtual rtl::OString Prefix() {return rtl::OString(RTL_CONSTASCII_STRINGPARAM("Error:")); }
};
class ParserWarning : public ParserMessage
{
public:
- ParserWarning( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag );
+ ParserWarning( sal_uInt16 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag );
- virtual sal_Bool IsError() {return sal_False;};
- virtual ByteString Prefix() {return "Warning:"; };
+ virtual sal_Bool IsError() {return sal_False;}
+ virtual rtl::OString Prefix() {return rtl::OString(RTL_CONSTASCII_STRINGPARAM("Warning:")); }
};
class SimpleParser
@@ -304,7 +304,7 @@ class TokenParser
{
sal_Bool match( const TokenInfo &aCurrentToken, const TokenId &aExpectedToken );
sal_Bool match( const TokenInfo &aCurrentToken, const TokenInfo &aExpectedToken );
- void ParseError( sal_uInt16 nErrNr, ByteString aErrMsg, const TokenInfo &rTag );
+ void ParseError( sal_uInt16 nErrNr, const rtl::OString &rErrMsg, const TokenInfo &rTag );
void Paragraph();
void PfCase();
void PfCaseBegin();
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index dc07f41..39b8d04 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -337,8 +337,9 @@ int GetError()
void ResData::Dump(){
printf("**************\nResData\n");
- printf("sPForm = %s , sResTyp = %s , sId = %s , sGId = %s , sHelpId = %s\n",sPForm.GetBuffer()
- ,sResTyp.GetBuffer(),sId.GetBuffer(),sGId.GetBuffer(),sHelpId.GetBuffer());
+ printf("sPForm = %s , sResTyp = %s , sId = %s , sGId = %s , sHelpId = %s\n",
+ sPForm.getStr(), sResTyp.getStr(), sId.getStr(),
+ sGId.getStr(), sHelpId.getStr());
rtl::OString a("*pStringList");
rtl::OString b("*pUIEntries");
@@ -373,10 +374,10 @@ sal_Bool ResData::SetId( const rtl::OString& rId, sal_uInt16 nLevel )
SetError();
}
- if ( sId.Len() > 255 )
+ if ( sId.getLength() > 255 )
{
YYWarning( "LocalId > 255 chars, truncating..." );
- sId.Erase( 255 );
+ sId = sId.copy(0, 255);
sId = comphelper::string::stripEnd(sId, ' ');
sId = comphelper::string::stripEnd(sId, '\t');
}
@@ -656,7 +657,7 @@ int Export::Execute( int nToken, const char * pToken )
sToken = comphelper::string::stripEnd(sToken, ' ');
rtl::OString sTLower = getToken(sToken, 0, ' ').toAsciiLowerCase();
pResData->sResTyp = sTLower;
- ByteString sId( sToken.Copy( pResData->sResTyp.Len() + 1 ));
+ ByteString sId( sToken.Copy( pResData->sResTyp.getLength() + 1 ));
ByteString sCondition;
if ( sId.Search( "#" ) != STRING_NOTFOUND )
{
@@ -1792,14 +1793,15 @@ sal_Bool Export::PrepareTextToMerge(ByteString &rText, sal_uInt16 nTyp,
sLastListLine = "<";
sLastListLine += sTmp;
}
- if ( pResData->sResTyp.EqualsIgnoreCaseAscii( "pairedlist" ) ){
+ if ( pResData->sResTyp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pairedlist")) )
+ {
pResData->sId = GetPairedListID( sLastListLine );
}
else pResData->sId = rtl::OString::valueOf(static_cast<sal_Int32>(nListIndex));
- if ( pResData->sGId.Len())
- pResData->sGId += ".";
- pResData->sGId += sOldId;
+ if (!pResData->sGId.isEmpty())
+ pResData->sGId = pResData->sGId + rtl::OString('.');
+ pResData->sGId = pResData->sGId + sOldId;
nTyp = STRING_TYP_TEXT;
}
break;
@@ -2065,9 +2067,9 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
ByteString sOldId = pResData->sId;
ByteString sOldGId = pResData->sGId;
ByteString sOldTyp = pResData->sResTyp;
- if ( pResData->sGId.Len())
- pResData->sGId += ".";
- pResData->sGId += sOldId;
+ if (!pResData->sGId.isEmpty())
+ pResData->sGId = pResData->sGId + rtl::OString('.');
+ pResData->sGId = pResData->sGId + sOldId;
ByteString sSpace;
for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
sSpace += "\t";
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index e915a4a..a33e8ea 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -318,11 +318,9 @@ GSIBlock::~GSIBlock()
maList.clear();
}
-/*****************************************************************************/
-void GSIBlock::InsertLine( GSILine* pLine, ByteString aSourceLang)
-/*****************************************************************************/
+void GSIBlock::InsertLine( GSILine* pLine, const rtl::OString &rSourceLang)
{
- if ( pLine->GetLanguageId().Equals( aSourceLang ) )
+ if ( pLine->GetLanguageId().Equals( rSourceLang ) )
{
if ( pSourceLine )
{
@@ -338,7 +336,7 @@ void GSIBlock::InsertLine( GSILine* pLine, ByteString aSourceLang)
}
}
- if ( aSourceLang.Len() ) // only check blockstructure if source lang is given
+ if (!rSourceLang.isEmpty()) // only check blockstructure if source lang is given
{
for ( size_t nPos = 0, n = maList.size(); nPos < n; ++nPos )
{
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index f6b7813..7b1be3c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -577,7 +577,13 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
aLangHM->erase( sCur );
}
}
- }else if( pResData == NULL ){fprintf(stdout,"Can't find GID=%s LID=%s TYP=%s\n",pResData->sGId.GetBuffer(),pResData->sId.GetBuffer(),pResData->sResTyp.GetBuffer());}
+ }
+ else if( pResData == NULL )
+ {
+ fprintf(stdout,"Can't find GID=%s LID=%s TYP=%s\n",
+ pResData->sGId.getStr(), pResData->sId.getStr(),
+ pResData->sResTyp.getStr());
+ }
pXMLElement->ChangeLanguageTag( String( sCur , RTL_TEXTENCODING_ASCII_US) );
}
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 6015a66..7fe05a5 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -134,10 +134,10 @@ void MergeData::Insert(PFormEntrys* pfEntrys )
aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) );
}
-ByteString MergeData::Dump(){
- ByteString sRet( "MergeData\n" );
-
- printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",sTyp.GetBuffer(),sGID.GetBuffer(),sLID.GetBuffer(), sFilename.GetBuffer() );
+rtl::OString MergeData::Dump()
+{
+ printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",
+ sTyp.getStr(), sGID.getStr(), sLID.getStr(), sFilename.getStr());
PFormEntrysHashMap::const_iterator idbg;
for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
@@ -147,10 +147,11 @@ ByteString MergeData::Dump(){
printf("\n");
}
printf("\n");
- return sRet;
+ return rtl::OString(RTL_CONSTASCII_STRINGPARAM("MergeData\n"));
}
-PFormEntrys* MergeData::GetPFObject( const ByteString& rPFO ){
+PFormEntrys* MergeData::GetPFObject( const rtl::OString& rPFO )
+{
if( aMap.find( ByteString("HACK") ) != aMap.end() )
return aMap[ rPFO ];
return NULL;
diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 58a1299..90d8178 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.cxx
@@ -95,7 +95,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
String aDelims( String::CreateFromAscii( " \\=>/" ) );
String aPortion;
String aValue; // store the value of a property
- ByteString aName; // store the name of a property/tag
+ rtl::OString aName; // store the name of a property/tag
sal_Bool bCheckName = sal_False;
sal_Bool bCheckEmpty = sal_False;
sal_Unicode cDelim;
@@ -223,14 +223,14 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
{
if ( !IsPropertyValueValid( aName, aValue ) )
{
- rErrorList.AddError( 25, ByteString("Property '").Append(aName).Append("' has invalid value '").Append(rtl::OUStringToOString(aValue, RTL_TEXTENCODING_UTF8)).Append("' "), *this );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(aName).append(RTL_CONSTASCII_STRINGPARAM("' has invalid value '")).append(rtl::OUStringToOString(aValue, RTL_TEXTENCODING_UTF8)).append("' ").makeStringAndClear(), *this );
bIsBroken = sal_True;
}
aProperties[ aName ] = aValue;
}
else
{
- rErrorList.AddError( 25, ByteString("Property '").Append(aName).Append("' defined twice "), *this );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(aName).append(RTL_CONSTASCII_STRINGPARAM("' defined twice ")).makeStringAndClear(), *this );
bIsBroken = sal_True;
}
}
@@ -336,10 +336,9 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
{
aName = rtl::OUStringToOString(aPortion, RTL_TEXTENCODING_UTF8);
// "a-zA-Z_-.0-9"
- xub_StrLen nCount;
sal_Bool bBroken = sal_False;
- const sal_Char* aBuf = aName.GetBuffer();
- for ( nCount = 0 ; !bBroken && nCount < aName.Len() ; nCount++ )
+ const sal_Char* aBuf = aName.getStr();
+ for (sal_Int32 nCount = 0 ; !bBroken && nCount < aName.getLength() ; ++nCount)
{
bBroken = ! ( ( aBuf[nCount] >= 'a' && aBuf[nCount] <= 'z' )
||( aBuf[nCount] >= 'A' && aBuf[nCount] <= 'Z' )
@@ -364,7 +363,7 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
{
if ( aPortion.Len() )
{
- rErrorList.AddError( 25, ByteString("Found displaced characters '").Append(rtl::OUStringToOString(aPortion, RTL_TEXTENCODING_UTF8)).Append("' in Tag "), *this );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Found displaced characters '")).append(rtl::OUStringToOString(aPortion, RTL_TEXTENCODING_UTF8)).append(RTL_CONSTASCII_STRINGPARAM("' in Tag ")).makeStringAndClear(), *this );
bIsBroken = sal_True;
}
bCheckEmpty = sal_False;
@@ -387,46 +386,46 @@ void TokenInfo::SplitTag( ParserMessageList &rErrorList )
}
}
-sal_Bool TokenInfo::IsPropertyRelevant( const ByteString &aName, const String &aValue ) const
+sal_Bool TokenInfo::IsPropertyRelevant( const rtl::OString &rName, const String &rValue ) const
{
- if ( aTagName.EqualsAscii( "alt" ) && aName.Equals( "xml-lang" ) )
+ if ( aTagName.EqualsAscii( "alt" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("xml-lang")) )
return sal_False;
- if ( aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "visibility" ) && aValue.EqualsAscii("visible") )
+ if ( aTagName.EqualsAscii( "ahelp" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("visibility")) && rValue.EqualsAscii("visible") )
return sal_False;
- if ( aTagName.EqualsAscii( "image" ) && (aName.Equals( "width" ) || aName.Equals( "height" )) )
+ if ( aTagName.EqualsAscii( "image" ) && (rName.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) || rName.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))) )
return sal_False;
return sal_True;
}
-sal_Bool TokenInfo::IsPropertyValueValid( const ByteString &aName, const String &aValue ) const
+sal_Bool TokenInfo::IsPropertyValueValid( const rtl::OString &rName, const String &rValue ) const
{
/* removed due to i56740
- if ( aTagName.EqualsAscii( "switchinline" ) && aName.Equals( "select" ) )
+ if ( aTagName.EqualsAscii( "switchinline" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) )
{
- return aValue.EqualsAscii("sys") ||
- aValue.EqualsAscii("appl") ||
- aValue.EqualsAscii("distrib");
+ return rValue.EqualsAscii("sys") ||
+ rValue.EqualsAscii("appl") ||
+ rValue.EqualsAscii("distrib");
} */
- if ( aTagName.EqualsAscii( "caseinline" ) && aName.Equals( "select" ) )
+ if ( aTagName.EqualsAscii( "caseinline" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("select")) )
{
- return /*!aValue.EqualsAscii("OS2") && removed due to i56740 */
- !aValue.EqualsAscii("");
+ return /*!rValue.EqualsAscii("OS2") && removed due to i56740 */
+ !rValue.EqualsAscii("");
}
// we don't know any better so we assume it to be OK
return sal_True;
}
-sal_Bool TokenInfo::IsPropertyInvariant( const ByteString &aName, const String &aValue ) const
+sal_Bool TokenInfo::IsPropertyInvariant( const rtl::OString &rName, const String &rValue ) const
{
- if ( aTagName.EqualsAscii( "link" ) && aName.Equals( "name" ) )
+ if ( aTagName.EqualsAscii( "link" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("name")) )
return sal_False;
- if ( aTagName.EqualsAscii( "link" ) && aName.Equals( "href" ) )
+ if ( aTagName.EqualsAscii( "link" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href")) )
{ // check for external reference
- if ( aValue.Copy( 0, 5 ).EqualsIgnoreCaseAscii( "http:" )
- || aValue.Copy( 0, 6 ).EqualsIgnoreCaseAscii( "https:" )
- || aValue.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "ftp:" ) )
+ if ( rValue.Copy( 0, 5 ).EqualsIgnoreCaseAscii( "http:" )
+ || rValue.Copy( 0, 6 ).EqualsIgnoreCaseAscii( "https:" )
+ || rValue.Copy( 0, 4 ).EqualsIgnoreCaseAscii( "ftp:" ) )
return sal_False;
else
return sal_True;
@@ -434,15 +433,15 @@ sal_Bool TokenInfo::IsPropertyInvariant( const ByteString &aName, const String &
return sal_True;
}
-sal_Bool TokenInfo::IsPropertyFixable( const ByteString &aName ) const
+sal_Bool TokenInfo::IsPropertyFixable( const rtl::OString &rName ) const
{
// name everything that is allowed to be fixed automatically here
- if ( (aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "hid" ))
- || (aTagName.EqualsAscii( "link" ) && aName.Equals( "href" ))
- || (aTagName.EqualsAscii( "alt" ) && aName.Equals( "id" ))
- || (aTagName.EqualsAscii( "variable" ) && aName.Equals( "id" ))
- || (aTagName.EqualsAscii( "image" ) && aName.Equals( "src" ))
- || (aTagName.EqualsAscii( "image" ) && aName.Equals( "id" ) ))
+ if ( (aTagName.EqualsAscii( "ahelp" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("hid")))
+ || (aTagName.EqualsAscii( "link" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("href")))
+ || (aTagName.EqualsAscii( "alt" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")))
+ || (aTagName.EqualsAscii( "variable" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")))
+ || (aTagName.EqualsAscii( "image" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("src")))
+ || (aTagName.EqualsAscii( "image" ) && rName.equalsL(RTL_CONSTASCII_STRINGPARAM("id")) ))
return sal_True;
return sal_False;
}
@@ -480,10 +479,10 @@ sal_Bool TokenInfo::MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, P
{
rInfo.aProperties.find( iProp->first )->second = iProp->second;
rInfo.SetHasBeenFixed();
- rErrorList.AddWarning( 25, ByteString("Property '").Append(iProp->first).Append("': FIXED different value in Translation "), *this );
+ rErrorList.AddWarning( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("': FIXED different value in Translation ")).makeStringAndClear(), *this );
}
else
- rErrorList.AddError( 25, ByteString("Property '").Append(iProp->first).Append("': value different in Translation "), *this );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("': value different in Translation ")).makeStringAndClear(), *this );
}
else return sal_False;
}
@@ -495,7 +494,7 @@ sal_Bool TokenInfo::MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, P
if ( IsPropertyRelevant( iProp->first, iProp->second ) )
{
if ( bGenErrors )
- rErrorList.AddError( 25, ByteString("Property '").Append(iProp->first).Append("' missing in Translation "), *this );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("' missing in Translation ")).makeStringAndClear(), *this );
else return sal_False;
}
}
@@ -507,7 +506,7 @@ sal_Bool TokenInfo::MatchesTranslation( TokenInfo& rInfo, sal_Bool bGenErrors, P
if ( IsPropertyRelevant( iProp->first, iProp->second ) )
{
if ( bGenErrors )
- rErrorList.AddError( 25, ByteString("Extra Property '").Append(iProp->first).Append("' in Translation "), rInfo );
+ rErrorList.AddError( 25, rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Extra Property '")).append(iProp->first).append(RTL_CONSTASCII_STRINGPARAM("' in Translation ")).makeStringAndClear(), rInfo );
else return sal_False;
}
}
@@ -548,14 +547,14 @@ String TokenInfo::MakeTag() const
}
-void ParserMessageList::AddError( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag )
+void ParserMessageList::AddError( sal_uInt16 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag )
{
- maList.push_back( new ParserError( nErrorNr, aErrorText, rTag ) );
+ maList.push_back( new ParserError( nErrorNr, rErrorText, rTag ) );
}
-void ParserMessageList::AddWarning( sal_uInt16 nErrorNr, ByteString aErrorText, const TokenInfo &rTag )
+void ParserMessageList::AddWarning( sal_uInt16 nErrorNr, const rtl::OString& rErrorText, const TokenInfo &rTag )
{
- maList.push_back( new ParserWarning( nErrorNr, aErrorText, rTag ) );
+ maList.push_back( new ParserWarning( nErrorNr, rErrorText, rTag ) );
}
sal_Bool ParserMessageList::HasErrors()
@@ -786,7 +785,6 @@ String SimpleParser::GetNextTokenString( ParserMessageList &rErrorList, sal_uInt
if ( nEndPos == STRING_NOTFOUND )
{ // Token is incomplete. Skip start and search for better ones
nPos = nStyle3StartPos +2;
- ByteString sTmp( "Tag Start '\\<' without Tag End '\\>': " );
rErrorList.AddError( 24, "Tag Start '\\<' without Tag End '\\>'", TokenInfo( TAG_UNKNOWN_TAG, nStyle3StartPos, aSource.Copy( nStyle3StartPos-10, 20 ) ) );
return GetNextTokenString( rErrorList, rTagStartPos );
}
@@ -1315,37 +1313,38 @@ sal_Bool TokenParser::match( const TokenInfo &aCurrentToken, const TokenInfo &rE
aExpectedToken.aTokenString.Insert( String::CreateFromAscii( "Close tag for " ), 0 );
}
- ByteString sTmp( "Expected Symbol" );
+ rtl::OString sTmp(RTL_CONSTASCII_STRINGPARAM("Expected Symbol"));
if ( aCurrentToken.nId == TAG_NOMORETAGS )
{
ParseError( 7, sTmp, aExpectedToken );
}
else
{
- sTmp += ": ";
- sTmp += rtl::OUStringToOString(aParser.GetLexem( aExpectedToken ), RTL_TEXTENCODING_UTF8);
- sTmp += " near ";
- ParseError( 7, sTmp, aCurrentToken );
+ rtl::OStringBuffer aBuf(sTmp);
+ aBuf.append(": ").
+ append(rtl::OUStringToOString(aParser.GetLexem( aExpectedToken ), RTL_TEXTENCODING_UTF8)).
+ append(RTL_CONSTASCII_STRINGPARAM(" near "));
+ ParseError( 7, aBuf.makeStringAndClear(), aCurrentToken );
}
return sal_False;
}
-void TokenParser::ParseError( sal_uInt16 nErrNr, ByteString aErrMsg, const TokenInfo &rTag )
+void TokenParser::ParseError( sal_uInt16 nErrNr, const rtl::OString &rErrMsg, const TokenInfo &rTag )
{
- pErrorList->AddError( nErrNr, aErrMsg, rTag);
+ pErrorList->AddError( nErrNr, rErrMsg, rTag);
// Das Fehlerhafte Tag ueberspringen
aTag = aParser.GetNextToken( *pErrorList );
}
-ParserMessage::ParserMessage( sal_uInt16 PnErrorNr, ByteString PaErrorText, const TokenInfo &rTag )
+ParserMessage::ParserMessage( sal_uInt16 PnErrorNr, const rtl::OString &rPaErrorText, const TokenInfo &rTag )
: nErrorNr( PnErrorNr )
, nTagBegin( 0 )
, nTagLength( 0 )
{
String aLexem( SimpleParser::GetLexem( rTag ) );
- rtl::OStringBuffer aErrorBuffer(PaErrorText);
+ rtl::OStringBuffer aErrorBuffer(rPaErrorText);
aErrorBuffer.append(RTL_CONSTASCII_STRINGPARAM(": "));
aErrorBuffer.append(rtl::OUStringToOString(aLexem, RTL_TEXTENCODING_UTF8));
if ( rTag.nId == TAG_NOMORETAGS )
@@ -1360,12 +1359,12 @@ ParserMessage::ParserMessage( sal_uInt16 PnErrorNr, ByteString PaErrorText, cons
nTagLength = aLexem.Len();
}
-ParserError::ParserError( sal_uInt16 ErrorNr, ByteString ErrorText, const TokenInfo &rTag )
-: ParserMessage( ErrorNr, ErrorText, rTag )
+ParserError::ParserError( sal_uInt16 ErrorNr, const rtl::OString &rErrorText, const TokenInfo &rTag )
+: ParserMessage( ErrorNr, rErrorText, rTag )
{}
-ParserWarning::ParserWarning( sal_uInt16 ErrorNr, ByteString ErrorText, const TokenInfo &rTag )
-: ParserMessage( ErrorNr, ErrorText, rTag )
+ParserWarning::ParserWarning( sal_uInt16 ErrorNr, const rtl::OString &rErrorText, const TokenInfo &rTag )
+: ParserMessage( ErrorNr, rErrorText, rTag )
{}
sal_Bool LingTest::IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens )
commit 5a0fd87d15ad0da5035337a8a1b90c4e32f855dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 10:00:03 2012 +0000
remove WriteSrc, WriteCxx and WriteHxx
I can't see that WriteSrc, WriteCxx WriteHxx are anything other than unused
archaic remnants of the past.
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 6d49b4c..9cd03b7 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -89,9 +89,6 @@ public:
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
-
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
};
SV_DECL_IMPL_REF(SvMetaObject)
SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 750914d..4e5953e 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -97,11 +97,6 @@ public:
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable );
- virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table *pIdTable );
-
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
};
SV_DECL_IMPL_REF(SvMetaModule)
SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index a5d8432..1dd2cef 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -141,10 +141,6 @@ public:
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable );
- virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pTable );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
};
SV_IMPL_REF(SvMetaClass)
SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 50d5d08..3c00ca8 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -261,8 +261,6 @@ public:
SvStream & rOutStm );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pIdTable );
- virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pIdTable );
virtual void WriteCSV( SvIdlDataBase&, SvStream& );
};
SV_DECL_IMPL_REF(SvMetaSlot)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 8db0b7e..09ff414 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -119,8 +119,6 @@ public:
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pIdTable );
- virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pIdTable );
virtual void WriteCSV( SvIdlDataBase&, SvStream& );
void FillIDTable(Table *pIDTable);
rtl::OString Compare( SvMetaAttribute *pAttr );
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 9a55bfc..8ad1b08 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -119,14 +119,6 @@ void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */,
{
}
-void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
-{
-}
-
-void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
-{
-}
-
SV_IMPL_META_FACTORY1( SvMetaName, SvMetaObject );
SvMetaName::SvMetaName()
{
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index ab40dcd..c261d4c 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -507,35 +507,4 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pTable )
-{
- if( !aSlotIdFile.getString().isEmpty() )
- rOutStm << "//#include <" << aSlotIdFile.getString().getStr() << '>' << endl;
- for( sal_uLong n = 0; n < aClassList.Count(); n++ )
- {
- aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
- }
-}
-
-void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
- sal_uInt16 nTab )
-{
- for( sal_uLong n = 0; n < aClassList.Count(); n++ )
- {
- SvMetaClass * pClass = aClassList.GetObject( n );
- pClass->WriteHxx( rBase, rOutStm, nTab );
- }
-}
-
-void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
- sal_uInt16 nTab )
-{
- for( sal_uLong n = 0; n < aClassList.Count(); n++ )
- {
- SvMetaClass * pClass = aClassList.GetObject( n );
- pClass->WriteCxx( rBase, rOutStm, nTab );
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 033e5a2..b95b0a0 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -661,91 +661,4 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pTable )
-{
- for( sal_uLong n=0; n<aAttrList.Count(); n++ )
- {
- SvMetaAttribute * pAttr = aAttrList.GetObject( n );
- pAttr->WriteSrc( rBase, rOutStm, pTable );
- }
-}
-
-void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
-{
- rtl::OString aSuperName(RTL_CONSTASCII_STRINGPARAM("SvDispatch"));
- if( GetSuperClass() )
- aSuperName = GetSuperClass()->GetName().getString();
- const char * pSup = aSuperName.getStr();
-
- rOutStm
- << "class " << GetSvName().getStr()
- << ": public " << pSup << endl
- << '{' << endl
- << "protected:" << endl
- << "\tvirtual SvGlobalName GetTypeName() const;" << endl
- << "\tvirtual sal_Bool FillTypeLibInfo( SvGlobalName *, sal_uInt16 * pMajor," << endl
- << "\t sal_uInt16 * pMinor ) const;" << endl
- << "\tvirtual sal_Bool FillTypeLibInfo( ByteString * pName, sal_uInt16 * pMajor," << endl;
- rOutStm
- << "\t sal_uInt16 * pMinor ) const;" << endl
- << "\tvirtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl
- << "public:" << endl
- << "\t static SvGlobalName ClassName()" << endl
- << "\t { return SvGlobalName( " << rtl::OUStringToOString(GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " ); }" << endl
- << "};" << endl;
-}
-
-void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
-{
- rtl::OString aSuperName(RTL_CONSTASCII_STRINGPARAM("SvDispatch"));
- if( GetSuperClass() )
- aSuperName = GetSuperClass()->GetName().getString();
- const char * pSup = aSuperName.getStr();
-
- rtl::OString name = GetSvName();
- // GetTypeName
- rOutStm << "SvGlobalName " << name.getStr() << "::GetTypeName() const" << endl
- << '{' << endl
- << "\treturn ClassName();" << endl
- << '}' << endl;
-
- SvMetaModule * pMod = GetModule();
- // FillTypeLibInfo
- rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
- << "\t sal_uInt16 * pMajor," << endl
- << "\t sal_uInt16 * pMinor ) const" << endl
- << '{' << endl
- << "\tSvGlobalName aN( " << rtl::OUStringToOString(pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8).getStr() << " );" << endl;
- rOutStm << "\t*pGN = aN;" << endl
- << "\t*pMajor = "
- << rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMajorVersion())).getStr()
- << ';' << endl
- << "\t*pMinor = "
- << rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMinorVersion())).getStr()
- << ';' << endl
- << "\treturn sal_True;" << endl
- << '}' << endl;
-
- // FillTypeLibInfo
- rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( ByteString * pName,"
- << "\t sal_uInt16 * pMajor," << endl
- << "\t sal_uInt16 * pMinor ) const" << endl;
- rOutStm << '{' << endl
- << "\t*pName = \"" << pMod->GetTypeLibFileName().getStr() << "\";" << endl
- << "\t*pMajor = "
- << rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMajorVersion())).getStr()
- << ';' << endl
- << "\t*pMinor = "
- << rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMinorVersion())).getStr()
- << ';' << endl
- << "\treturn sal_True;" << endl
- << '}' << endl;
-
- rOutStm << "void " << name.getStr() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
- << '{' << endl
- << "\t" << pSup << "::Notify( rBC, rHint );" << endl
- << '}' << endl;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 8742c12..cedd9be 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1495,83 +1495,6 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const rtl::OString& rShellName, sal_uInt16
return nSCount;
}
-void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
- Table * pTable )
-{
- if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
- return;
-
- sal_uLong nSId = GetSlotId().GetValue();
- if( !pTable->IsKeyValid( nSId ) )
- {
- pTable->Insert( nSId, this );
- rOutStm << "SfxSlotInfo "
- << rtl::OString::valueOf(static_cast<sal_Int32>(nSId)).getStr()
- << endl << '{' << endl;
-
- WriteTab( rOutStm, 1 );
- rtl::OString aStr = GetConfigName().getString();
- if( aStr.isEmpty() )
- aStr = GetName().getString();
-
- rOutStm << "SlotName = \"" << aStr.getStr() << "\";" << endl;
-
- aStr = GetHelpText().getString();
- if( !aStr.isEmpty() )
- {
- WriteTab( rOutStm, 1 );
- rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl;
- }
-
- rOutStm << "};" << endl;
- }
-
- SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
- if( GetPseudoSlots() && pEnum )
- {
- for( sal_uLong n = 0; n < pEnum->Count(); n++ )
- {
- rtl::OString aValName = pEnum->GetObject( n )->GetName().getString();
- rtl::OStringBuffer aBuf;
- if( !GetPseudoPrefix().isEmpty() )
- aBuf.append(GetPseudoPrefix());
- else
- aBuf.append(GetSlotId().getString());
- aBuf.append('_');
- aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
-
- rtl::OString aSId = aBuf.makeStringAndClear();
-
- sal_uLong nSId2;
- sal_Bool bIdOk = sal_False;
- if( rBase.FindId( aSId, &nSId2 ) )
- {
- aSId = rtl::OString::valueOf(static_cast<sal_Int32>(nSId2));
- bIdOk = sal_True;
- }
-
- // if id not found, write always
- if( !bIdOk || !pTable->IsKeyValid( nSId2 ) )
- {
- pTable->Insert( nSId2, this );
- rOutStm << "SfxSlotInfo " << aSId.getStr()
- << endl << '{' << endl;
-
- WriteTab( rOutStm, 1 );
- rOutStm << "SlotName = \"" << aValName.getStr() << "\";" << endl;
-
- rtl::OString aStr = GetHelpText().getString();
- if (!aStr.isEmpty())
- {
- WriteTab( rOutStm, 1 );
- rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl;
- }
- rOutStm << "};" << endl;
- }
- }
- }
-}
-
void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 391cdab..5b53d96 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -740,10 +740,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const rtl::OString&, SvIdlData
{
}
-void SvMetaAttribute::WriteSrc( SvIdlDataBase &, SvStream &, Table * )
-{
-}
-
void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, Table * )
{
}
commit 9cd7d08b4a0c9ab81c2ce9872ff78baa5a065c7f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 09:53:10 2012 +0000
SvDispatch class doesn't exist anymore
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index ad24fae..b4db6e6 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -56,7 +56,6 @@ class SbxDimArray;
class SbxFactory;
class SfxBroadcaster;
-class SvDispatch;
#ifndef __SBX_SBXPARAMINFO
#define __SBX_SBXPARAMINFO
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 0360ad5..0432300 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -35,7 +35,6 @@
class SbxProperty;
-class SvDispatch;
class SbxObjectImpl;
@@ -98,8 +97,6 @@ public:
SbxArray* GetMethods() { return pMethods; }
SbxArray* GetProperties() { return pProps; }
SbxArray* GetObjects() { return pObjs; }
- // Hooks
- virtual SvDispatch* GetSvDispatch();
// Debugging
void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
};
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index fd919d6..9038679 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -871,11 +871,6 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
--nLevel;
}
-SvDispatch* SbxObject::GetSvDispatch()
-{
- return NULL;
-}
-
SbxMethod::SbxMethod( const String& r, SbxDataType t )
: SbxVariable( t )
{
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 6eefe53..6dbdcfa 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -38,7 +38,6 @@ class String;
class SfxObjectShell;
class SfxStatusBarManager;
class INetHint;
-class SvDispatch;
struct SfxProgress_Impl;
struct PlugInLoadStatus;
struct SvProgressArg;
commit 58d4275efae7fc0f3e97c02d79b67cf688052e81
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 08:00:05 2012 +0000
make idl ByteString free
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 368e062..391cdab 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1870,15 +1870,13 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
if( bOk )
{
if( 0 == aEnumValueList.Count() )
+ {
// the first
aPrefix = aEnumVal->GetName().getString();
+ }
else
{
- rtl::OString sCommonPrefix = getCommonSubPrefix(aPrefix, aEnumVal->GetName().getString());
- sal_uInt16 nPos = ByteString(aPrefix).Match( aEnumVal->GetName().getString() );
- if( nPos != aPrefix.getLength() && nPos != STRING_MATCH )
- aPrefix = aPrefix.copy(0, nPos);
- assert(sCommonPrefix == aPrefix);
+ aPrefix = getCommonSubPrefix(aPrefix, aEnumVal->GetName().getString());
}
aEnumValueList.Append( aEnumVal );
}
commit 04a32c98be8b890689699068a6147d836d3b2689
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 07:57:48 2012 +0000
use assert to demo equivalence
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 080a9e1..368e062 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1844,6 +1844,22 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
}
+namespace
+{
+ rtl::OString getCommonSubPrefix(const rtl::OString &rA, const rtl::OString &rB)
+ {
+ sal_Int32 nMax = std::min(rA.getLength(), rB.getLength());
+ sal_Int32 nI = 0;
+ while (nI < nMax)
+ {
+ if (rA[nI] != rB[nI])
+ break;
+ ++nI;
+ }
+ return rA.copy(0, nI);
+ }
+}
+
void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
@@ -1858,9 +1874,11 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
aPrefix = aEnumVal->GetName().getString();
else
{
+ rtl::OString sCommonPrefix = getCommonSubPrefix(aPrefix, aEnumVal->GetName().getString());
sal_uInt16 nPos = ByteString(aPrefix).Match( aEnumVal->GetName().getString() );
if( nPos != aPrefix.getLength() && nPos != STRING_MATCH )
aPrefix = aPrefix.copy(0, nPos);
+ assert(sCommonPrefix == aPrefix);
}
aEnumValueList.Append( aEnumVal );
}
commit f75694e5b13236248171885633b0a3612940e04a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 27 07:52:36 2012 +0000
ByteString->rtl::OString
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 959a9f8..6d49b4c 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -151,8 +151,8 @@ public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
- void SetDescription( const ByteString& rText )
+ virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+ void SetDescription( const rtl::OString& rText )
{ aDescription.setString(rText); }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
virtual const SvString & GetName() const { return aName; }
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 6449dfd..733f0eb 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -40,12 +40,12 @@ class SvHashTable
sal_uInt32 lAsk; // number of requests
sal_uInt32 lTry; // number of tries
protected:
- sal_Bool Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+ sal_Bool Test_Insert( const rtl::OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual StringCompare Compare( const void * , sal_uInt32 ) const = 0;
+ virtual bool equals( const rtl::OString& , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual sal_uInt32 HashFunc( const void * ) const = 0;
+ virtual sal_uInt32 HashFunc( const rtl::OString& ) const = 0;
public:
SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
@@ -59,20 +59,20 @@ class SvStringHashTable;
class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
- ByteString aName;
+ rtl::OString aName;
sal_uInt32 nHashId;
sal_uLong nValue;
sal_Bool bHasId;
public:
SvStringHashEntry() : bHasId( sal_False ) {;}
- SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
+ SvStringHashEntry( const rtl::OString& rName, sal_uInt32 nIdx )
: aName( rName )
, nHashId( nIdx )
, nValue( 0 )
, bHasId( sal_True ) {}
~SvStringHashEntry();
- const ByteString & GetName() const { return aName; }
+ const rtl::OString& GetName() const { return aName; }
sal_Bool HasId() const { return bHasId; }
sal_uInt32 GetId() const { return nHashId; }
@@ -101,17 +101,17 @@ class SvStringHashTable : public SvHashTable
{
SvStringHashEntry* pEntries;
protected:
- virtual sal_uInt32 HashFunc( const void * pElement ) const;
- virtual StringCompare Compare( const void * pElement, sal_uInt32 nIndex ) const;
+ virtual sal_uInt32 HashFunc( const rtl::OString& rElement ) const;
+ virtual bool equals( const rtl::OString &rElement, sal_uInt32 nIndex ) const;
public:
SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel
virtual ~SvStringHashTable();
- ByteString GetNearString( const ByteString & rName ) const;
+ rtl::OString GetNearString( const rtl::OString& rName ) const;
virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const;
- sal_Bool Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
- sal_Bool Test( const ByteString & rStr, sal_uInt32 * pHash ) const; // test of insert string
+ sal_Bool Insert( const rtl::OString& rStr, sal_uInt32 * pHash ); // insert string
+ sal_Bool Test( const rtl::OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 3b51dd8..03b6578 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -45,13 +45,13 @@ class BigInt;
class SvToken
{
friend class SvTokenStream;
- sal_uLong nLine, nColumn;
+ sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
- ByteString aString;
+ rtl::OString aString;
union
{
- sal_uLong nLong;
- sal_Bool bBool;
+ sal_uLong nLong;
+ sal_Bool bBool;
char cChar;
SvStringHashEntry * pHash;
};
@@ -61,7 +61,7 @@ public:
SvToken( sal_uLong n );
SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
- SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
+ SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr );
SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
@@ -91,7 +91,7 @@ public:
sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
- const ByteString & GetString() const
+ const rtl::OString& GetString() const
{
return IsIdentifierHash()
? pHash->GetName()
@@ -122,7 +122,7 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
inline SvToken::SvToken( char c )
: nType( SVTOKEN_CHAR ), cChar( c ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr )
: nType( nTypeP ), aString( rStr ) {}
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 471a0a5..750914d 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -70,7 +70,7 @@ public:
const String & GetIdlFileName() const { return aIdlFileName; }
const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
- virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 85e56eb..50d5d08 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -245,7 +245,7 @@ public:
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
+ virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
SvIdlDataBase& );
void WriteSlotStubs( const rtl::OString& rShellName,
ByteStringList & rList,
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index b0d5f21..8db0b7e 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -115,7 +115,7 @@ public:
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
sal_uLong MakeSfx( rtl::OStringBuffer& rAtrrArray );
- virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
+ virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pIdTable );
@@ -123,7 +123,7 @@ public:
Table * pIdTable );
virtual void WriteCSV( SvIdlDataBase&, SvStream& );
void FillIDTable(Table *pIDTable);
- ByteString Compare( SvMetaAttribute *pAttr );
+ rtl::OString Compare( SvMetaAttribute *pAttr );
};
SV_IMPL_REF(SvMetaAttribute)
SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
@@ -150,7 +150,7 @@ class SvMetaType : public SvMetaExtern
sal_Bool bIsShell;
char cParserChar;
- void WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
+ void WriteSfxItem( const rtl::OString& rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
@@ -208,7 +208,7 @@ public:
void SetCall1( int e);
int GetCall1() const;
- void SetBasicName(const ByteString& rName)
+ void SetBasicName(const rtl::OString& rName)
{ aBasicName.setString(rName); }
const rtl::OString& GetBasicName() const;
@@ -219,10 +219,10 @@ public:
const rtl::OString& GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
- virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
@@ -240,7 +240,7 @@ public:
void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
rtl::OString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
- const ByteString & rChief );
+ const rtl::OString& rChief );
};
SV_IMPL_REF(SvMetaType)
SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *)
@@ -258,10 +258,10 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeString,SvMetaTypeString *)
class SvMetaEnumValue : public SvMetaName
{
- ByteString aEnumValue;
+ rtl::OString aEnumValue;
public:
- SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
- SvMetaEnumValue();
+ SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
+ SvMetaEnumValue();
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
@@ -275,7 +275,7 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *)
class SvMetaTypeEnum : public SvMetaType
{
SvMetaEnumValueMemberList aEnumValueList;
- ByteString aPrefix;
+ rtl::OString aPrefix;
protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
@@ -288,7 +288,7 @@ public:
sal_uInt16 GetMaxValue() const;
sal_uLong Count() const { return aEnumValueList.Count(); }
- const ByteString & GetPrefix() const { return aPrefix; }
+ const rtl::OString& GetPrefix() const { return aPrefix; }
SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList.GetObject( n ); }
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 6021a56..c4c0f9f 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -50,7 +50,7 @@ SvHashTable::~SvHashTable()
{
}
-sal_Bool SvHashTable::Test_Insert( const void * pElement, sal_Bool bInsert,
+sal_Bool SvHashTable::Test_Insert( const rtl::OString& rElement, sal_Bool bInsert,
sal_uInt32 * pInsertPos )
{
sal_uInt32 nHash;
@@ -60,13 +60,13 @@ sal_Bool SvHashTable::Test_Insert( const void * pElement, sal_Bool bInsert,
lAsk++;
lTry++;
- nHash = HashFunc( pElement );
+ nHash = HashFunc( rElement );
nIndex = nHash % nMax;
nLoop = 0; // divide to range
while( (nMax != nLoop) && IsEntry( nIndex ) )
{ // is place occupied
- if( COMPARE_EQUAL == Compare( pElement, nIndex ) )
+ if( equals( rElement, nIndex ) )
{
if( pInsertPos )
*pInsertPos = nIndex; // place of Element
@@ -123,10 +123,10 @@ SvStringHashTable::~SvStringHashTable()
delete [] pEntries;
}
-sal_uInt32 SvStringHashTable::HashFunc( const void * pElement ) const
+sal_uInt32 SvStringHashTable::HashFunc( const rtl::OString& rElement ) const
{
sal_uInt32 nHash = 0; // hash value
- const char * pStr = ((const ByteString * )pElement)->GetBuffer();
+ const char * pStr = rElement.getStr();
int nShift = 0;
while( *pStr )
@@ -144,18 +144,18 @@ sal_uInt32 SvStringHashTable::HashFunc( const void * pElement ) const
return( nHash );
}
-ByteString SvStringHashTable::GetNearString( const ByteString & rName ) const
+rtl::OString SvStringHashTable::GetNearString( const rtl::OString& rName ) const
{
for( sal_uInt32 i = 0; i < GetMax(); i++ )
{
SvStringHashEntry * pE = Get( i );
if( pE )
{
- if( pE->GetName().EqualsIgnoreCaseAscii( rName ) && !pE->GetName().Equals( rName ) )
+ if( pE->GetName().equalsIgnoreAsciiCase( rName ) && !pE->GetName().equals( rName ) )
return pE->GetName();
}
}
- return ByteString();
+ return rtl::OString();
}
sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
@@ -165,13 +165,13 @@ sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
return pEntries[ nIndex ].HasId();
}
-sal_Bool SvStringHashTable::Insert( const ByteString & rName, sal_uInt32 * pIndex )
+sal_Bool SvStringHashTable::Insert( const rtl::OString& rName, sal_uInt32 * pIndex )
{
sal_uInt32 nIndex;
if( !pIndex ) pIndex = &nIndex;
- if( !SvHashTable::Test_Insert( &rName, sal_True, pIndex ) )
+ if( !SvHashTable::Test_Insert( rName, sal_True, pIndex ) )
return sal_False;
if( !IsEntry( *pIndex ) )
@@ -179,10 +179,9 @@ sal_Bool SvStringHashTable::Insert( const ByteString & rName, sal_uInt32 * pInde
return sal_True;
}
-sal_Bool SvStringHashTable::Test( const ByteString & rName, sal_uInt32 * pPos ) const
+sal_Bool SvStringHashTable::Test( const rtl::OString& rName, sal_uInt32 * pPos ) const
{
- return ((SvStringHashTable *)this)->SvHashTable::
- Test_Insert( &rName, sal_False, pPos );
+ return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, sal_False, pPos );
}
SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
@@ -192,10 +191,10 @@ SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
return( NULL );
}
-StringCompare SvStringHashTable::Compare( const void * pElement,
+bool SvStringHashTable::equals( const rtl::OString& rElement,
sal_uInt32 nIndex ) const
{
- return ((const ByteString *)pElement)->CompareTo( pEntries[ nIndex ].GetName() );
+ return rElement.equals( pEntries[ nIndex ].GetName() );
}
void SvStringHashTable::FillHashList( SvStringHashList * pList ) const
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index b08e891..9a55bfc 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -169,7 +169,7 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aDescription;
}
-sal_Bool SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const rtl::OString& rName, SvIdlDataBase * )
{
aName.setString(rName);
return sal_True;
@@ -237,16 +237,16 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
{
rOutStm << "<DESCRIPTION>" << endl;
- ByteString aDesc( GetDescription().getString() );
- sal_uInt16 nPos = aDesc.Search( '\n' );
- while ( nPos != STRING_NOTFOUND )
+ rtl::OString aDesc( GetDescription().getString() );
+ sal_Int32 nPos = aDesc.indexOf('\n');
+ while ( nPos != -1 )
{
- rOutStm << aDesc.Copy( 0, nPos ).GetBuffer() << endl;
- aDesc.Erase(0,nPos+1);
- nPos = aDesc.Search( '\n' );
+ rOutStm << aDesc.copy( 0, nPos ).getStr() << endl;
+ aDesc = aDesc.copy(nPos+1);
+ nPos = aDesc.indexOf('\n');
}
- rOutStm << aDesc.GetBuffer() << endl << "</DESCRIPTION>" << endl;
+ rOutStm << aDesc.getStr() << endl << "</DESCRIPTION>" << endl;
}
void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index e31bcfe..8777111 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -169,9 +169,9 @@ sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
{
if( nVal )
- rOutStm << pName->GetName().GetBuffer();
+ rOutStm << pName->GetName().getStr();
else
- rOutStm << pName->GetName().GetBuffer() << "(FALSE)";
+ rOutStm << pName->GetName().getStr() << "(FALSE)";
return sal_True;
}
@@ -199,7 +199,7 @@ sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rIn
pTok = rInStm.GetToken();
if( pTok->IsIdentifier() )
{
- *(ByteString *)this = pTok->GetString();
+ setString(pTok->GetString());
rInStm.GetToken_Next();
}
if( bOk && bBraket )
@@ -216,7 +216,7 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
- rOutStm << pName->GetName().GetBuffer() << '(';
+ rOutStm << pName->GetName().getStr() << '(';
rOutStm << getString().getStr() << ')';
return sal_True;
}
@@ -269,7 +269,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
sal_uLong n;
if( rBase.FindId( pTok->GetString(), &n ) )
{
- *(ByteString *)this = pTok->GetString();
+ setString(pTok->GetString());
nValue = n;
return sal_True;
}
@@ -315,7 +315,7 @@ sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
pTok = rInStm.GetToken();
if( pTok->IsString() )
{
- *(ByteString *)this = pTok->GetString();
+ setString(pTok->GetString());
rInStm.GetToken_Next();
}
if( bOk && bBraket )
@@ -331,7 +331,7 @@ sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
- rOutStm << pName->GetName().GetBuffer() << "(\"";
+ rOutStm << pName->GetName().getStr() << "(\"";
rOutStm << m_aStr.getStr() << "\")";
return sal_True;
}
@@ -374,7 +374,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
if( pTok->IsString() )
{
pTok = rInStm.GetToken_Next();
- bOk = MakeId( String::CreateFromAscii( pTok->GetString().GetBuffer() ) );
+ bOk = MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) );
}
if( bOk && bBraket )
bOk = rInStm.Read( ')' );
@@ -389,7 +389,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
- rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\"";
+ rOutStm << SvHash_uuid()->GetName().getStr() << "(\"";
rOutStm << rtl::OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
return sal_True;
}
@@ -421,7 +421,7 @@ sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
{
- rOutStm << SvHash_Version()->GetName().GetBuffer() << '('
+ rOutStm << SvHash_Version()->GetName().getStr() << '('
<< rtl::OString::valueOf(static_cast<sal_Int32>(nMajorVersion)).getStr()
<< '.'
<< rtl::OString::valueOf(static_cast<sal_Int32>(nMinorVersion)).getStr()
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 84502c2..ab40dcd 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -109,7 +109,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm.Seek( nPos );
}
-sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
{
if( pBase )
{
@@ -231,7 +231,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
{
- DirEntry aFullName( String::CreateFromAscii( pTok->GetString().GetBuffer() ) );
+ DirEntry aFullName( String::CreateFromAscii( pTok->GetString().getStr() ) );
rBase.StartNewFile( aFullName.GetFull() );
if( aFullName.Find( rBase.GetPath() ) )
{
@@ -334,14 +334,14 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aBeginName.MakeId( String::CreateFromAscii( pTok->GetString().GetBuffer() ) );
+ bOk = aBeginName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) );
}
rInStm.ReadDelemiter();
if( bOk )
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aEndName.MakeId( String::CreateFromAscii( pTok->GetString().GetBuffer() ) );
+ bOk = aEndName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) );
}
rInStm.ReadDelemiter();
if( bOk )
@@ -366,7 +366,7 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab )
{
- rOutStm << SvHash_module()->GetName().GetBuffer() << endl
+ rOutStm << SvHash_module()->GetName().getStr() << endl
<< '\"';
rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() );
rOutStm << '\"' << endl << '\"';
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index a9ebfa3..033e5a2 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -275,10 +275,10 @@ void SvMetaClass::WriteContextSvIdl
{
SvClassElement * pEle = aClassList.GetObject( n );
WriteTab( rOutStm, nTab );
- rOutStm << SvHash_import()->GetName().GetBuffer() << ' '
+ rOutStm << SvHash_import()->GetName().getStr() << ' '
<< pEle->GetPrefix().getStr();
if( pEle->GetAutomation() )
- rOutStm << " [ " << SvHash_Automation()->GetName().GetBuffer()
+ rOutStm << " [ " << SvHash_Automation()->GetName().getStr()
<< " ]";
if( !pEle->GetPrefix().isEmpty() )
rOutStm << ' ' << pEle->GetPrefix().getStr();
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index c690c25..8742c12 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -638,7 +638,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aSlotType.Is() )
{
WriteTab( rOutStm, nTab );
- rOutStm << SvHash_SlotType()->GetName().GetBuffer() << '(';
+ rOutStm << SvHash_SlotType()->GetName().getStr() << '(';
aSlotType->WriteTheType( rBase, rOutStm, nTab, WRITE_IDL );
rOutStm << ");" << endl;
}
@@ -702,105 +702,107 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
rOutStm << ';' << endl;
}
- ByteString aDel( ", " );
- ByteString aOut;
+ rtl::OString aDel(RTL_CONSTASCII_STRINGPARAM(", "));
+ rtl::OStringBuffer aOut;
if( aVolatile )
- aOut += aVolatile.GetSvIdlString( SvHash_Volatile() );
+ aOut.append(aVolatile.GetSvIdlString( SvHash_Volatile() ));
else if( !aCachable )
// because of Default == TRUE, only when no other is set
- aOut += aCachable.GetSvIdlString( SvHash_Cachable() );
+ aOut.append(aCachable.GetSvIdlString( SvHash_Cachable() ));
else
- aDel.Erase();
+ aDel = rtl::OString();
if( aToggle )
{
- ( aOut += aDel ) += aToggle.GetSvIdlString( SvHash_Toggle() );
- aDel = ", ";
+ aOut.append(aDel).append(aToggle.GetSvIdlString( SvHash_Toggle() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aAutoUpdate )
{
- (aOut += aDel ) += aAutoUpdate.GetSvIdlString( SvHash_AutoUpdate() );
- aDel = ", ";
+ aOut.append(aDel).append(aAutoUpdate.GetSvIdlString( SvHash_AutoUpdate() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
- ByteString aDel1( ", " );
+ rtl::OString aDel1(RTL_CONSTASCII_STRINGPARAM(", "));
if( aAsynchron )
- ( aOut += aDel ) += aAsynchron.GetSvIdlString( SvHash_Asynchron() );
+ aOut.append(aDel).append(aAsynchron.GetSvIdlString( SvHash_Asynchron() ));
else if( !aSynchron )
+ {
// because of Default == TRUE, only when no other is set
- ( aOut += aDel ) += aSynchron.GetSvIdlString( SvHash_Synchron() );
+ aOut.append(aDel).append(aSynchron.GetSvIdlString( SvHash_Synchron() ));
+ }
else
aDel1 = aDel;
- aDel = ", ";
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
if( aRecordManual )
- ( aOut += aDel1 ) += aRecordManual.GetSvIdlString( SvHash_RecordManual() );
+ aOut.append(aDel1).append(aRecordManual.GetSvIdlString( SvHash_RecordManual() ));
else if( aNoRecord )
- ( aOut += aDel1 ) += aNoRecord.GetSvIdlString( SvHash_NoRecord() );
+ aOut.append(aDel1).append(aNoRecord.GetSvIdlString( SvHash_NoRecord() ));
else if( !aRecordPerSet )
// because of Default == TRUE, only when no other is set
- ( aOut += aDel1 ) += aRecordPerSet.GetSvIdlString( SvHash_RecordPerSet() );
+ aOut.append(aDel1).append(aRecordPerSet.GetSvIdlString( SvHash_RecordPerSet() ));
else if( aRecordPerItem )
- ( aOut += aDel1 ) += aRecordPerItem.GetSvIdlString( SvHash_RecordPerItem() );
+ aOut.append(aDel1).append(aRecordPerItem.GetSvIdlString( SvHash_RecordPerItem() ));
else
aDel = aDel1;
if( aRecordAbsolute )
{
- ( aOut += aDel ) += aRecordAbsolute.GetSvIdlString( SvHash_RecordAbsolute() );
- aDel = ", ";
+ aOut.append(aDel).append(aRecordAbsolute.GetSvIdlString( SvHash_RecordAbsolute() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aHasDialog )
{
- ( aOut += aDel ) += aHasDialog.GetSvIdlString( SvHash_HasDialog() );
- aDel = ", ";
+ aOut.append(aDel).append(aHasDialog.GetSvIdlString( SvHash_HasDialog() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aMenuConfig )
{
- ( aOut += aDel ) += aMenuConfig.GetSvIdlString( SvHash_MenuConfig() );
- aDel = ", ";
+ aOut.append(aDel).append(aMenuConfig.GetSvIdlString( SvHash_MenuConfig() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aToolBoxConfig )
{
- ( aOut += aDel ) += aToolBoxConfig.GetSvIdlString( SvHash_ToolBoxConfig() );
- aDel = ", ";
+ aOut.append(aDel).append(aToolBoxConfig.GetSvIdlString( SvHash_ToolBoxConfig() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aStatusBarConfig )
{
- ( aOut += aDel ) += aStatusBarConfig.GetSvIdlString( SvHash_StatusBarConfig() );
- aDel = ", ";
+ aOut.append(aDel).append(aStatusBarConfig.GetSvIdlString( SvHash_StatusBarConfig() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aAccelConfig )
{
- ( aOut += aDel ) += aAccelConfig.GetSvIdlString( SvHash_AccelConfig() );
- aDel = ", ";
+ aOut.append(aDel).append(aAccelConfig.GetSvIdlString( SvHash_AccelConfig() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aFastCall )
{
- ( aOut += aDel ) += aFastCall.GetSvIdlString( SvHash_FastCall() );
- aDel = ", ";
+ aOut.append(aDel).append(aFastCall.GetSvIdlString( SvHash_FastCall() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aContainer )
{
- ( aOut += aDel ) += aContainer.GetSvIdlString( SvHash_Container() );
- aDel = ", ";
+ aOut.append(aDel).append(aContainer.GetSvIdlString( SvHash_Container() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aImageRotation )
{
- ( aOut += aDel ) += aImageRotation.GetSvIdlString( SvHash_ImageRotation() );
- aDel = ", ";
+ aOut.append(aDel).append(aImageRotation.GetSvIdlString( SvHash_ImageRotation() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
if( aImageReflection )
{
- ( aOut += aDel ) += aImageReflection.GetSvIdlString( SvHash_ImageReflection() );
- aDel = ", ";
+ aOut.append(aDel).append(aImageReflection.GetSvIdlString( SvHash_ImageReflection() ));
+ aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
}
- if( aOut.Len() )
+ if( aOut.getLength() )
{
WriteTab( rOutStm, nTab );
- rOutStm << aOut.GetBuffer() << endl;
+ rOutStm << aOut.getStr() << endl;
}
}
@@ -929,7 +931,7 @@ void SvMetaSlot::Write( SvIdlDataBase & rBase,
}
-void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
+void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
SvIdlDataBase& rBase)
{
// get insert position through binary search in slotlist
@@ -1008,14 +1010,14 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
{
// create SlotId
SvMetaEnumValue *enumValue = pEnum->GetObject(n);
- ByteString aValName = enumValue->GetName().getString();
+ rtl::OString aValName = enumValue->GetName().getString();
rtl::OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
aBuf.append(GetSlotId().getString());
aBuf.append('_');
- aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
+ aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
rtl::OString aSId = aBuf.makeStringAndClear();
@@ -1081,7 +1083,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
}
-static ByteString MakeSlotName( SvStringHashEntry * pEntry )
+static rtl::OString MakeSlotName( SvStringHashEntry * pEntry )
{
rtl::OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
aName.append(pEntry->GetName());
@@ -1161,9 +1163,9 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
rOutStm << "// Slot Nr. "
<< rtl::OString::valueOf(static_cast<sal_Int32>(nListPos)).getStr()
<< " : ";
- ByteString aSlotIdValue(rtl::OString::valueOf(static_cast<sal_Int32>(
+ rtl::OString aSlotIdValue(rtl::OString::valueOf(static_cast<sal_Int32>(
GetSlotId().GetValue())));
- rOutStm << aSlotIdValue.GetBuffer() << endl;
+ rOutStm << aSlotIdValue.getStr() << endl;
WriteTab( rOutStm, 1 );
if( bIsEnumSlot )
rOutStm << "SFX_NEW_SLOT_ENUM( ";
@@ -1284,49 +1286,49 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
// write flags
if( GetHasCoreId() )
- rOutStm << MakeSlotName( SvHash_HasCoreId() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_HasCoreId() ).getStr() << '|';
if( GetCachable() )
- rOutStm << MakeSlotName( SvHash_Cachable() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Cachable() ).getStr() << '|';
if( GetVolatile() )
- rOutStm << MakeSlotName( SvHash_Volatile() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Volatile() ).getStr() << '|';
if( GetToggle() )
- rOutStm << MakeSlotName( SvHash_Toggle() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Toggle() ).getStr() << '|';
if( GetAutoUpdate() )
- rOutStm << MakeSlotName( SvHash_AutoUpdate() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_AutoUpdate() ).getStr() << '|';
if( GetSynchron() )
- rOutStm << MakeSlotName( SvHash_Synchron() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Synchron() ).getStr() << '|';
if( GetAsynchron() )
- rOutStm << MakeSlotName( SvHash_Asynchron() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Asynchron() ).getStr() << '|';
if( GetRecordPerItem() )
- rOutStm << MakeSlotName( SvHash_RecordPerItem() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_RecordPerItem() ).getStr() << '|';
if( GetRecordPerSet() )
- rOutStm << MakeSlotName( SvHash_RecordPerSet() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_RecordPerSet() ).getStr() << '|';
if( GetRecordManual() )
- rOutStm << MakeSlotName( SvHash_RecordManual() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_RecordManual() ).getStr() << '|';
if( GetNoRecord() )
- rOutStm << MakeSlotName( SvHash_NoRecord() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_NoRecord() ).getStr() << '|';
if( GetRecordAbsolute() )
- rOutStm << MakeSlotName( SvHash_RecordAbsolute() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_RecordAbsolute() ).getStr() << '|';
if( GetHasDialog() )
- rOutStm << MakeSlotName( SvHash_HasDialog() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_HasDialog() ).getStr() << '|';
if( GetMenuConfig() )
- rOutStm << MakeSlotName( SvHash_MenuConfig() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_MenuConfig() ).getStr() << '|';
if( GetToolBoxConfig() )
- rOutStm << MakeSlotName( SvHash_ToolBoxConfig() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_ToolBoxConfig() ).getStr() << '|';
if( GetStatusBarConfig() )
- rOutStm << MakeSlotName( SvHash_StatusBarConfig() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_StatusBarConfig() ).getStr() << '|';
if( GetAccelConfig() )
- rOutStm << MakeSlotName( SvHash_AccelConfig() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_AccelConfig() ).getStr() << '|';
if( GetFastCall() )
- rOutStm << MakeSlotName( SvHash_FastCall() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_FastCall() ).getStr() << '|';
if( GetContainer() )
- rOutStm << MakeSlotName( SvHash_Container() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_Container() ).getStr() << '|';
if ( GetReadOnlyDoc() )
- rOutStm << MakeSlotName( SvHash_ReadOnlyDoc() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_ReadOnlyDoc() ).getStr() << '|';
if( GetImageRotation() )
- rOutStm << MakeSlotName( SvHash_ImageRotation() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_ImageRotation() ).getStr() << '|';
if( GetImageReflection() )
- rOutStm << MakeSlotName( SvHash_ImageReflection() ).GetBuffer() << '|';
+ rOutStm << MakeSlotName( SvHash_ImageReflection() ).getStr() << '|';
rOutStm << '0';
rOutStm << ',' << endl;
@@ -1508,17 +1510,17 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
<< endl << '{' << endl;
WriteTab( rOutStm, 1 );
- ByteString aStr = GetConfigName().getString();
- if( !aStr.Len() )
+ rtl::OString aStr = GetConfigName().getString();
+ if( aStr.isEmpty() )
aStr = GetName().getString();
- rOutStm << "SlotName = \"" << aStr.GetBuffer() << "\";" << endl;
+ rOutStm << "SlotName = \"" << aStr.getStr() << "\";" << endl;
aStr = GetHelpText().getString();
- if( aStr.Len() )
+ if( !aStr.isEmpty() )
{
WriteTab( rOutStm, 1 );
- rOutStm << "HelpText = \"" << aStr.GetBuffer() << "\";" << endl;
+ rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl;
}
rOutStm << "};" << endl;
@@ -1529,14 +1531,14 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
{
for( sal_uLong n = 0; n < pEnum->Count(); n++ )
{
- ByteString aValName = pEnum->GetObject( n )->GetName().getString();
+ rtl::OString aValName = pEnum->GetObject( n )->GetName().getString();
rtl::OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
aBuf.append(GetSlotId().getString());
aBuf.append('_');
- aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
+ aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
rtl::OString aSId = aBuf.makeStringAndClear();
@@ -1556,13 +1558,13 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
<< endl << '{' << endl;
WriteTab( rOutStm, 1 );
- rOutStm << "SlotName = \"" << aValName.GetBuffer() << "\";" << endl;
+ rOutStm << "SlotName = \"" << aValName.getStr() << "\";" << endl;
- ByteString aStr = GetHelpText().getString();
- if( aStr.Len() )
+ rtl::OString aStr = GetHelpText().getString();
+ if (!aStr.isEmpty())
{
WriteTab( rOutStm, 1 );
- rOutStm << "HelpText = \"" << aStr.GetBuffer() << "\";" << endl;
+ rOutStm << "HelpText = \"" << aStr.getStr() << "\";" << endl;
}
rOutStm << "};" << endl;
}
@@ -1585,9 +1587,9 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
if( GetPseudoSlots() && pEnum )
{
- for( sal_uLong n = 0; n < pEnum->Count(); n++ )
+ for( sal_uLong n = 0; n < pEnum->Count(); ++n )
{
- ByteString aValName = pEnum->GetObject( n )->GetName().getString();
+ rtl::OString aValName = pEnum->GetObject( n )->GetName().getString();
rtl::OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
@@ -1595,7 +1597,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
else
aBuf.append(GetSlotId().getString());
aBuf.append('_');
- aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
+ aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
rtl::OString aSId = aBuf.makeStringAndClear();
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index da182b5..080a9e1 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -469,13 +469,13 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, 3 );
rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
- ByteString aParserStr;
+ rtl::OString aParserStr;
if( pBaseType->GetType() == TYPE_METHOD || bSet )
aParserStr = pBaseType->GetParserString();
- if( aParserStr.Len() )
+ if( !aParserStr.isEmpty() )
{
rOutStm << '\"';
- rOutStm << aParserStr.GetBuffer();
+ rOutStm << aParserStr.getStr();
rOutStm << "\", ";
}
else
@@ -496,11 +496,11 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
else
rOutStm << '0';
- if( aParserStr.Len() )
+ if( !aParserStr.isEmpty() )
{
rOutStm << ", ";
if( IsMethod() )
- pBaseType->WriteParamNames( rBase, rOutStm, ByteString() );
+ pBaseType->WriteParamNames( rBase, rOutStm, rtl::OString() );
else if( bSet )
pBaseType->WriteParamNames( rBase, rOutStm, GetName().getString() );
}
@@ -590,10 +590,8 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( !bVariable && IsMethod() )
{
- ByteString name;
- name += rBase.aIFaceName;
- name += GetName().getString();
- const char * pName = name.GetBuffer();
+ rtl::OString name = rBase.aIFaceName + GetName().getString();
+ const char * pName = name.getStr();
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
rOutStm << ' ' << pName;
@@ -614,7 +612,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
else
{
- ByteString name = GetName().getString();
+ rtl::OString name = GetName().getString();
sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if ( !bReadonly && !IsMethod() )
@@ -623,11 +621,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
rOutStm << "void ";
rOutStm << rBase.aIFaceName.getStr()
- << "Set" << name.GetBuffer() << "( " << C_PREF
+ << "Set" << name.getStr() << "( " << C_PREF
<< "Object h" << rBase.aIFaceName.getStr() << ", " << endl;
WriteTab( rOutStm, nTab+1 );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
- rOutStm << ' ' << name.GetBuffer() << " )";
+ rOutStm << ' ' << name.getStr() << " )";
if( nT == WRITE_C_HEADER )
rOutStm << ';' << endl << endl;
else
@@ -639,7 +637,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
rOutStm << ' ';
rOutStm << rBase.aIFaceName.getStr()
- << "Get" << name.GetBuffer() << "( " << C_PREF
+ << "Get" << name.getStr() << "( " << C_PREF
<< "Object h" << rBase.aIFaceName.getStr() << " )";
if( nT == WRITE_C_HEADER )
rOutStm << ';' << endl << endl;
@@ -738,7 +736,7 @@ sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
}
}
-void SvMetaAttribute::Insert (SvSlotElementList&, const ByteString &, SvIdlDataBase&)
+void SvMetaAttribute::Insert (SvSlotElementList&, const rtl::OString&, SvIdlDataBase&)
{
}
@@ -1011,7 +1009,7 @@ const rtl::OString& SvMetaType::GetCName() const
return ((SvMetaType *)GetRef())->GetCName();
}
-sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
{
aSvName.setString(rName);
aSbxName.setString(rName);
@@ -1254,27 +1252,27 @@ void SvMetaType::WriteHeaderSvIdl( SvIdlDataBase & rBase,
case TYPE_CLASS:
{
if( IsShell() )
- rOutStm << SvHash_shell()->GetName().GetBuffer();
+ rOutStm << SvHash_shell()->GetName().getStr();
else
- rOutStm << SvHash_interface()->GetName().GetBuffer();
+ rOutStm << SvHash_interface()->GetName().getStr();
rOutStm << ' ' << GetName().getString().getStr();
}
break;
case TYPE_STRUCT:
{
- rOutStm << SvHash_struct()->GetName().GetBuffer()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list