From a4cbcf2fc567393cd954d0fcc8ea0ce7d859b59f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Feb 2012 21:36:11 +0100 Subject: Reduced tools/string usage further --- l10ntools/inc/gsicheck.hxx | 4 +-- l10ntools/inc/tagtest.hxx | 37 ++++++++++---------- l10ntools/inc/xmlparse.hxx | 61 ++++++++++++++------------------ l10ntools/inc/xrmmerge.hxx | 87 ++++++++++++++++++++++------------------------ 4 files changed, 89 insertions(+), 100 deletions(-) (limited to 'l10ntools/inc') diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx index 3a6fc547d670..eaab60042d8d 100644 --- a/l10ntools/inc/gsicheck.hxx +++ b/l10ntools/inc/gsicheck.hxx @@ -71,7 +71,7 @@ public: rtl::OString const GetQuickHelpText() const { return aQuickHelpText; } rtl::OString const GetTitle() const { return aTitle; } - void SetUText( String &aNew ) { aText = rtl::OUStringToOString(aNew, RTL_TEXTENCODING_UTF8); ReassembleLine(); } + void SetUText( rtl::OUString const &aNew ) { aText = rtl::OUStringToOString(aNew, RTL_TEXTENCODING_UTF8); ReassembleLine(); } void SetText( rtl::OString const &aNew ) { aText = aNew; ReassembleLine(); } void SetQuickHelpText( rtl::OString const &aNew ) { aQuickHelpText = aNew; ReassembleLine(); } void SetTitle( rtl::OString const &aNew ) { aTitle = aNew; ReassembleLine(); } @@ -109,7 +109,7 @@ private: sal_Bool bHasBlockError; - sal_Bool IsUTF8( const rtl::OString &aTestee, sal_Bool bFixTags, sal_uInt16 &nErrorPos, rtl::OString &aErrorMsg, sal_Bool &bHasBeenFixed, rtl::OString &aFixed ) const; + sal_Bool IsUTF8( const rtl::OString &aTestee, sal_Bool bFixTags, sal_Int32 &nErrorPos, rtl::OString &aErrorMsg, sal_Bool &bHasBeenFixed, rtl::OString &aFixed ) const; sal_Bool TestUTF8( GSILine* pTestee, sal_Bool bFixTags ); sal_Bool HasSuspiciousChars( GSILine* pTestee, GSILine* pSource ); diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index a3d916506ecb..b77e260d3a4f 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -29,7 +29,6 @@ #ifndef _TAGTEST_HXX_ #define _TAGTEST_HXX_ -#include #include #include @@ -44,14 +43,14 @@ typedef ::std::vector< ParserMessage* > Impl_ParserMessageList; class ParserMessageList; -typedef boost::unordered_map StringHashMap; +typedef boost::unordered_map StringHashMap; class TokenInfo { private: void SplitTag( ParserMessageList &rErrorList ); - String aTagName; + rtl::OUString aTagName; StringHashMap aProperties; sal_Bool bClosed; // tag is closed sal_Bool bCloseTag; // tag is close Tag @@ -63,29 +62,29 @@ private: public: - String aTokenString; + rtl::OUString aTokenString; TokenId nId; sal_uInt16 nPos; // Position in String TokenInfo():bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( 0 ){;} explicit TokenInfo( TokenId pnId, sal_uInt16 nP ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),nId( pnId ),nPos(nP){;} -explicit TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),aTokenString( paStr ),nId( pnId ),nPos(nP) {;} -explicit TokenInfo( TokenId pnId, sal_uInt16 nP, String paStr, ParserMessageList &rErrorList ); + explicit TokenInfo( TokenId pnId, sal_uInt16 nP, rtl::OUString const & paStr ):bClosed(sal_False),bCloseTag(sal_False),bIsBroken(sal_False),bHasBeenFixed(sal_False),bDone(sal_False),aTokenString( paStr ),nId( pnId ),nPos(nP) {;} + explicit TokenInfo( TokenId pnId, sal_uInt16 nP, rtl::OUString const & paStr, ParserMessageList &rErrorList ); - String GetTagName() const; + rtl::OUString GetTagName() const; - String MakeTag() const; + rtl::OUString MakeTag() const; /** Is the property to be ignored or does it have the default value anyways **/ - sal_Bool IsPropertyRelevant( const rtl::OString &rName, const String &rValue ) const; - sal_Bool IsPropertyValueValid( const rtl::OString &rName, const String &rValue ) const; + sal_Bool IsPropertyRelevant( const rtl::OString &rName, const rtl::OUString &rValue ) const; + sal_Bool IsPropertyValueValid( const rtl::OString &rName, const rtl::OUString &rValue ) const; /** Does the property contain the same value for all languages e.g.: the href in a link tag **/ - sal_Bool IsPropertyInvariant( const rtl::OString &rName, const String &rValue ) const; + sal_Bool IsPropertyInvariant( const rtl::OString &rName, const rtl::OUString &rValue ) const; /** a subset of IsPropertyInvariant but containing only those that are fixable we dont wat to fix e.g.: ahelp :: visibility @@ -284,19 +283,19 @@ class SimpleParser { private: sal_uInt16 nPos; - String aSource; - String aLastToken; + rtl::OUString aSource; + rtl::OUString aLastToken; TokenList aTokenList; TokenInfo aNextTag; // to store closetag in case of combined tags like
- String GetNextTokenString( ParserMessageList &rErrorList, sal_uInt16 &rTokeStartPos ); + rtl::OUString GetNextTokenString( ParserMessageList &rErrorList, sal_uInt16 &rTokeStartPos ); public: SimpleParser(); - void Parse( String PaSource ); + void Parse( rtl::OUString const & PaSource ); TokenInfo GetNextToken( ParserMessageList &rErrorList ); - static String GetLexem( TokenInfo const &aToken ); + static rtl::OUString GetLexem( TokenInfo const &aToken ); TokenList& GetTokenList(){ return aTokenList; } }; @@ -328,7 +327,7 @@ class TokenParser public: TokenParser(); - void Parse( const String &aCode, ParserMessageList* pList ); + void Parse( const rtl::OUString &aCode, ParserMessageList* pList ); TokenList& GetTokenList(){ return aParser.GetTokenList(); } }; @@ -340,7 +339,7 @@ private: ParserMessageList aCompareWarningList; void CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags ); sal_Bool IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens ); - String aFixedTestee; + rtl::OUString aFixedTestee; public: void CheckReference( GSILine *aReference ); void CheckTestee( GSILine *aTestee, sal_Bool bHasSourceLine, sal_Bool bFixTags ); @@ -348,7 +347,7 @@ public: ParserMessageList& GetCompareWarnings(){ return aCompareWarningList; } sal_Bool HasCompareWarnings(){ return ( !aCompareWarningList.empty() ); } - String GetFixedTestee(){ return aFixedTestee; } + rtl::OUString GetFixedTestee(){ return aFixedTestee; } }; #endif diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 3b3e4baa9108..e24f8e6df790 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include "export.hxx" #include "xmlutil.hxx" @@ -224,23 +223,20 @@ public: virtual sal_uInt16 GetNodeType(); /// returns file name - const String &GetName() { return sFileName; } - void SetName( const String &rFilename ) { sFileName = rFilename; } - void SetFullName( const String &rFullFilename ) { sFullName = rFullFilename; } + rtl::OUString GetName() { return sFileName; } + void SetName( const rtl::OUString &rFilename ) { sFileName = rFilename; } + void SetFullName( const rtl::OUString &rFullFilename ) { sFullName = rFullFilename; } const std::vector getOrder(){ return order; } protected: // writes a string as UTF8 with dos line ends to a given stream - void WriteString( ofstream &rStream, const String &sString ); - - // quotes the given text for writing to a file - void QuotHTML( String &rString ); + void WriteString( ofstream &rStream, const rtl::OUString &sString ); void InsertL10NElement( XMLElement* pElement); // DATA - String sFileName; - String sFullName; + rtl::OUString sFileName; + rtl::OUString sFullName; const rtl::OString ID, OLDREF, XML_LANG; @@ -256,13 +252,10 @@ class XMLUtil{ public: /// Quot the XML characters and replace \n \t - static void QuotHTML( String &rString ); + static void QuotHTML( rtl::OUString &rString ); /// UnQuot the XML characters and restore \n \t - static void UnQuotHTML ( String &rString ); -private: - static void UnQuotData( String &rString ); - static void UnQuotTags( String &rString ); + static void UnQuotHTML ( rtl::OUString &rString ); }; @@ -274,7 +267,7 @@ private: class XMLElement : public XMLParentNode { private: - String sElementName; + rtl::OUString sElementName; XMLAttributeList *pAttributes; rtl::OString project, filename, @@ -290,7 +283,7 @@ public: /// create a element node XMLElement(){} XMLElement( - const String &rName, // the element name + const rtl::OUString &rName, // the element name XMLParentNode *Parent // parent node of this element ): XMLParentNode( Parent ), sElementName( rName ), @@ -312,15 +305,15 @@ public: virtual sal_uInt16 GetNodeType(); /// returns element name - const String &GetName() { return sElementName; } + rtl::OUString GetName() { return sElementName; } /// returns list of attributes of this element XMLAttributeList *GetAttributeList() { return pAttributes; } /// adds a new attribute to this element, typically used by parser - void AddAttribute( const String &rAttribute, const String &rValue ); + void AddAttribute( const rtl::OUString &rAttribute, const rtl::OUString &rValue ); - void ChangeLanguageTag( const String &rValue ); + void ChangeLanguageTag( const rtl::OUString &rValue ); // Return a ASCII String representation of this object OString ToOString(); @@ -359,18 +352,18 @@ public: class XMLData : public XMLChildNode { private: - String sData; + rtl::OUString sData; bool isNewCreated; public: /// create a data node XMLData( - const String &rData, // the initial data + const rtl::OUString &rData, // the initial data XMLParentNode *Parent // the parent node of this data, typically a element node ) : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( false ){} XMLData( - const String &rData, // the initial data + const rtl::OUString &rData, // the initial data XMLParentNode *Parent, // the parent node of this data, typically a element node bool newCreated ) @@ -382,12 +375,12 @@ public: virtual sal_uInt16 GetNodeType(); /// returns the data - const String &GetData() { return sData; } + rtl::OUString GetData() { return sData; } bool isNew() { return isNewCreated; } /// adds new character data to the existing one void AddData( - const String &rData // the new data + const rtl::OUString &rData // the new data ); @@ -401,12 +394,12 @@ public: class XMLComment : public XMLChildNode { private: - String sComment; + rtl::OUString sComment; public: /// create a comment node XMLComment( - const String &rComment, // the comment + const rtl::OUString &rComment, // the comment XMLParentNode *Parent // the parent node of this comemnt, typically a element node ) : XMLChildNode( Parent ), sComment( rComment ) {} @@ -418,7 +411,7 @@ public: XMLComment& operator=(const XMLComment& obj); /// returns the comment - const String &GetComment() { return sComment; } + rtl::OUString GetComment() { return sComment; } }; //------------------------------------------------------------------------- @@ -428,12 +421,12 @@ public: class XMLDefault : public XMLChildNode { private: - String sDefault; + rtl::OUString sDefault; public: /// create a comment node XMLDefault( - const String &rDefault, // the comment + const rtl::OUString &rDefault, // the comment XMLParentNode *Parent // the parent node of this comemnt, typically a element node ) : XMLChildNode( Parent ), sDefault( rDefault ) {} @@ -446,7 +439,7 @@ public: virtual sal_uInt16 GetNodeType(); /// returns the comment - const String &GetDefault() { return sDefault; } + rtl::OUString GetDefault() { return sDefault; } }; //------------------------------------------------------------------------- @@ -457,7 +450,7 @@ struct XMLError { XML_Error eCode; // the error code sal_uLong nLine; // error line number sal_uLong nColumn; // error column number - String sMessage; // readable error message + rtl::OUString sMessage; // readable error message }; //------------------------------------------------------------------------- @@ -498,8 +491,8 @@ public: /// parse a file, returns NULL on criticall errors XMLFile *Execute( - const String &rFullFileName, - const String &rFileName, // the file name + const rtl::OUString &rFullFileName, + const rtl::OUString &rFileName, // the file name XMLFile *pXMLFileIn // the XMLFile ); diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx index 17233b3be9a0..bcf82e405cb1 100644 --- a/l10ntools/inc/xrmmerge.hxx +++ b/l10ntools/inc/xrmmerge.hxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// global includes -#include - // // XRMResParser // @@ -36,42 +33,42 @@ class XRMResParser { private: - ByteString sGID; - ByteString sLID; + rtl::OString sGID; + rtl::OString sLID; sal_Bool bError; sal_Bool bText; bool sLocalized; - ByteString sCurrentOpenTag; - ByteString sCurrentCloseTag; - ByteString sCurrentText; + rtl::OString sCurrentOpenTag; + rtl::OString sCurrentCloseTag; + rtl::OString sCurrentText; std::vector aLanguages; protected: - ByteString GetAttribute( const ByteString &rToken, const ByteString &rAttribute ); - void Error( const ByteString &rError ); + rtl::OString GetAttribute( const rtl::OString &rToken, const rtl::OString &rAttribute ); + void Error( const rtl::OString &rError ); - virtual void Output( const ByteString& rOutput )=0; + virtual void Output( const rtl::OString& rOutput )=0; virtual void WorkOnDesc( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText )=0; virtual void WorkOnText( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText )=0; virtual void EndOfText( - const ByteString &rOpenTag, - const ByteString &rCloseTag + const rtl::OString &rOpenTag, + const rtl::OString &rCloseTag )=0; - ByteString GetGID() { return sGID; } - ByteString GetLID() { return sLID; } + rtl::OString GetGID() { return sGID; } + rtl::OString GetLID() { return sLID; } - void ConvertStringToDBFormat( ByteString &rString ); - void ConvertStringToXMLFormat( ByteString &rString ); + void ConvertStringToDBFormat( rtl::OString &rString ); + void ConvertStringToXMLFormat( rtl::OString &rString ); public: XRMResParser(); @@ -94,7 +91,7 @@ private: protected: SvFileStream *pOutputStream; public: - XRMResOutputParser ( const ByteString &rOutputFile ); + XRMResOutputParser ( const rtl::OString &rOutputFile ); virtual ~XRMResOutputParser(); }; @@ -106,30 +103,30 @@ class XRMResExport : public XRMResOutputParser { private: ResData *pResData; - ByteString sPrj; - ByteString sPath; + rtl::OString sPrj; + rtl::OString sPath; std::vector aLanguages; protected: void WorkOnDesc( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText ); void WorkOnText( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText ); void EndOfText( - const ByteString &rOpenTag, - const ByteString &rCloseTag + const rtl::OString &rOpenTag, + const rtl::OString &rCloseTag ); - void Output( const ByteString& rOutput ); + void Output( const rtl::OString& rOutput ); public: XRMResExport( - const ByteString &rOutputFile, - const ByteString &rProject, - const ByteString &rFilePath + const rtl::OString &rOutputFile, + const rtl::OString &rProject, + const rtl::OString &rFilePath ); virtual ~XRMResExport(); }; @@ -142,29 +139,29 @@ class XRMResMerge : public XRMResOutputParser { private: MergeDataFile *pMergeDataFile; - ByteString sFilename; + rtl::OString sFilename; ResData *pResData; std::vector aLanguages; protected: void WorkOnDesc( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText ); void WorkOnText( - const ByteString &rOpenTag, - ByteString &rText + const rtl::OString &rOpenTag, + rtl::OString &rText ); void EndOfText( - const ByteString &rOpenTag, - const ByteString &rCloseTag + const rtl::OString &rOpenTag, + const rtl::OString &rCloseTag ); - void Output( const ByteString& rOutput ); + void Output( const rtl::OString& rOutput ); public: XRMResMerge( - const ByteString &rMergeSource, - const ByteString &rOutputFile, - ByteString &rFilename + const rtl::OString &rMergeSource, + const rtl::OString &rOutputFile, + const rtl::OString &rFilename ); virtual ~XRMResMerge(); }; -- cgit