ByteString->rtl::OString

7 files changed, 51 insertions, 51 deletions

diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index d1ebeeff87d3..22253b9379c6 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -95,7 +95,7 @@ public:
 
 class RscNameTable;
 
-sal_uInt32 GetLangId( const ByteString& alang);
+sal_uInt32 GetLangId( const rtl::OString& rLang);
 
 class RscLangEnum : public RscEnum
 {
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index ffe61c3c7df0..2a5f606f4067 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -63,7 +63,7 @@ struct RscSysEntry
 {
     sal_uInt32      nKey;
     sal_uInt32      nRscTyp;
-    ByteString  aFileName;
+    rtl::OString    aFileName;
     sal_uInt32      nTyp;
     sal_uInt32      nRefId;
 };
@@ -73,15 +73,15 @@ typedef ::std::vector< RscSysEntry* > RscSysList;
 class RscTypCont
 {
     CharSet             nSourceCharSet;
-    sal_uInt32              nMachineId;         // Globaler Maschinentyp
+    sal_uInt32          nMachineId;         // Globaler Maschinentyp
     RSCBYTEORDER_TYPE   nByteOrder;         // Intel oder
-    ByteString          aLanguage;          // output language
+    rtl::OString        aLanguage;          // output language
     std::vector< sal_uInt32 > aLangFallbacks;   // language fallback list (entry 0 is language itself)
-    ByteString          aSearchPath;        // Suchen der Bitmap, Icon, Pointer
-    ByteString          aSysSearchPath;     // aSearchPath plus language specific paths
-    sal_uInt32              nUniqueId;          // eindeutiger Id fuer Systemresourcen
-    sal_uLong               nFilePos;           // Position in der Datei ( MTF )
-    sal_uInt32              nPMId;              // eindeutiger Id fuer PM-Rseourcefile
+    rtl::OString        aSearchPath;        // Suchen der Bitmap, Icon, Pointer
+    rtl::OString        aSysSearchPath;     // aSearchPath plus language specific paths
+    sal_uInt32          nUniqueId;          // eindeutiger Id fuer Systemresourcen
+    sal_uLong           nFilePos;           // Position in der Datei ( MTF )
+    sal_uInt32          nPMId;              // eindeutiger Id fuer PM-Rseourcefile
                                             // muss groesser als RSC_VERSIONCONTROL_ID sein
     RscTop  *           pRoot;              // Zeiger auf die Wurzel vom Typenbaum
     RSCINST             aVersion;           // Versionskontrollinstanz
@@ -301,7 +301,7 @@ public:
     std::map<sal_uInt64, sal_uLong> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
                                        //(unter PM), oder eine Dateiposition (MTF)
 
-    RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags );
+    RscTypCont( RscError *, RSCBYTEORDER_TYPE, const rtl::OString& rSearchPath, sal_uInt32 nFlags );
     ~RscTypCont();
 
     Atom AddLanguage( const char* );
@@ -326,9 +326,9 @@ public:
         nSourceCharSet = aCharSet;
         return aOld;
     }
-    void            SetSearchPath( const ByteString & rStr) { aSearchPath = rStr; }
-    ByteString      GetSearchPath() const { return aSearchPath; }
-    void            SetSysSearchPath( const ByteString& rStr ) { aSysSearchPath = rStr; }
+    void            SetSearchPath( const rtl::OString& rStr) { aSearchPath = rStr; }
+    rtl::OString    GetSearchPath() const { return aSearchPath; }
+    void            SetSysSearchPath( const rtl::OString& rStr ) { aSysSearchPath = rStr; }
     void        InsertType( RscTop * pType )
                 {
                     aBaseLst.push_back( pType );
@@ -345,7 +345,7 @@ public:
                           CharSet nCharSet, sal_Bool bName = sal_True );
     ERRTYPE     WriteHxx( FILE * fOutput, sal_uLong nFileKey);
     ERRTYPE     WriteCxx( FILE * fOutput, sal_uLong nFileKey,
-                          const ByteString & rHxxName );
+                          const rtl::OString& rHxxName );
     void        WriteSyntax( FILE * fOutput );
     void        WriteRcCtor( FILE * fOutput );
     sal_uInt32      PutTranslatorKey( sal_uInt64 nKey );
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index e516b018f6a9..ed9a9bd76078 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -105,7 +105,7 @@ public:
 
     static void    SetNames( sal_Bool bSet = sal_True );
     operator         sal_Int32() const;   // Gibt Nummer zurueck
-    ByteString     GetName()  const;   // Gibt den Namen des Defines zurueck
+    rtl::OString GetName()  const;   // Gibt den Namen des Defines zurueck
     sal_Bool    operator <  ( const RscId& rRscId ) const;
     sal_Bool    operator >  ( const RscId& rRscId ) const;
     sal_Bool    operator == ( const RscId& rRscId ) const;
@@ -130,16 +130,16 @@ friend class RscId;
     RscExpression * pExp;       // Ausdruck
 protected:
 
-            RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
+            RscDefine( sal_uLong lFileKey, const rtl::OString& rDefName,
                        sal_Int32 lDefId );
-            RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
+            RscDefine( sal_uLong lFileKey, const rtl::OString& rDefName,
                        RscExpression * pExpression );
             ~RscDefine();
     void    IncRef(){ nRefCount++; }
     sal_uInt32  GetRefCount() const    { return nRefCount; }
     void    DecRef();
     void    DefineToNumber();
-    void    SetName( const ByteString & rNewName ){ aName = rNewName; }
+    void    SetName(const rtl::OString& rNewName) { m_aName = rNewName; }
 
     using StringNode::Search;
 public:
@@ -147,7 +147,7 @@ public:
     sal_uLong       GetFileKey() const { return lFileKey; }
     sal_Bool        Evaluate();
     sal_Int32       GetNumber() const  { return lId;      }
-    ByteString  GetMacro();
+    rtl::OString    GetMacro();
 };
 
 typedef ::std::vector< RscDefine* > RscSubDefList;
@@ -158,9 +158,9 @@ friend class RscFileTab;
 private:
     RscSubDefList   maList;
                 // pExpression wird auf jedenfall Eigentum der Liste
-    RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
+    RscDefine * New( sal_uLong lFileKey, const rtl::OString& rDefName,
                      sal_Int32 lDefId, size_t lPos );
-    RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
+    RscDefine * New( sal_uLong lFileKey, const rtl::OString& rDefName,
                      RscExpression * pExpression, size_t lPos );
     sal_Bool        Remove();
     size_t      GetPos( RscDefine* item ) {
@@ -184,7 +184,7 @@ public:
                                RscExpType aRE );
                 ~RscExpression();
     sal_Bool        Evaluate( sal_Int32 * pValue );
-    ByteString  GetMacro();
+    rtl::OString GetMacro();
 };
 
 /********************** R S C F I L E ************************************/
@@ -254,9 +254,9 @@ public:
     sal_Bool        TestDef( sal_uLong lFileKey, size_t lPos,
                          const RscExpression * pExpDec );
 
-    RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+    RscDefine * NewDef( sal_uLong lKey, const rtl::OString& rDefName,
                         sal_Int32 lId, sal_uLong lPos );
-    RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+    RscDefine * NewDef( sal_uLong lKey, const rtl::OString& rDefName,
                         RscExpression *, sal_uLong lPos );
 
            // Alle Defines die in dieser Datei Definiert sind loeschen
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 1f79a3e8206a..7a14792dd101 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -54,14 +54,14 @@ public:
     rtl::OString        aPath;          // Liste der Pfade
     RSCBYTEORDER_TYPE   nByteOrder;
     unsigned short      nCommands;      // Steuerbits
-    ByteString          aOutputLst;     // Name der List-Ausgabedatei
-    ByteString          aOutputSrs;     // Name der Srs-Ausgabedatei
-    ByteString          aOutputSrc;     // Name der Src-Ausgabedatei
-    ByteString          aOutputRcCtor;  // Name der Ctor-Ausgabedatei
-    ByteString          aOutputCxx;     // Name der Cxx-Ausgabedatei
-    ByteString          aOutputHxx;     // Name der Hxx-Ausgabedatei
-    ByteString          aTouchFile;     // create this file when done in rsc2
-    ByteString          aILDir;
+    rtl::OString        aOutputLst;     // Name der List-Ausgabedatei
+    rtl::OString        aOutputSrs;     // Name der Srs-Ausgabedatei
+    rtl::OString        aOutputSrc;     // Name der Src-Ausgabedatei
+    rtl::OString        aOutputRcCtor;  // Name der Ctor-Ausgabedatei
+    rtl::OString        aOutputCxx;     // Name der Cxx-Ausgabedatei
+    rtl::OString        aOutputHxx;     // Name der Hxx-Ausgabedatei
+    rtl::OString        aTouchFile;     // create this file when done in rsc2
+    rtl::OString        aILDir;
 
     struct OutputFile
     {
@@ -88,13 +88,13 @@ struct WriteRcContext;
 class RscCompiler
 {
 private:
-    ByteString      aTmpOutputHxx;  // Name der TempHxx-Ausgabedatei
-    ByteString      aTmpOutputCxx;  // Name der TempCxx-Ausgabedatei
-    ByteString      aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei
-    ByteString      aTmpOutputSrc;  // Name der TempSrc-Ausgabedatei
+    rtl::OString    aTmpOutputHxx;  // Name der TempHxx-Ausgabedatei
+    rtl::OString    aTmpOutputCxx;  // Name der TempCxx-Ausgabedatei
+    rtl::OString    aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei
+    rtl::OString    aTmpOutputSrc;  // Name der TempSrc-Ausgabedatei
 
     void            CreateResFile( const char * pRc );
-    void            Append( const ByteString& rOutputSrs, const ByteString& rTmpFile );
+    void            Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile );
 
     bool            GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                        const WriteRcContext& rContext,
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 7694af3b06b0..c326b1ce7161 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -48,10 +48,10 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
 #define ALIGNED_SIZE( nSize )                               \
             (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
 /******************* F u n c t i o n   F o r w a r d s *******************/
-ByteString GetTmpFileName();
-sal_Bool Append( ByteString aDestFile, ByteString aSourceFile );
-sal_Bool Append( FILE * fDest, ByteString aSourceFile );
-ByteString OutputFile( ByteString aInput, const char * ext );
+rtl::OString GetTmpFileName();
+sal_Bool Append(const rtl::OString &rDestFile, const rtl::OString &rSourceFile);
+sal_Bool Append(FILE * fDest, rtl::OString &raSourceFile);
+rtl::OString OutputFile(const rtl::OString &rInput, const char * ext);
 char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
                      sal_uInt32 nArgc );
 void RscExit( sal_uInt32 nExit );
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 77e32041ac8b..6b627b1eed16 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -57,9 +57,9 @@ protected:
                             RscTop * pSuperCl = NULL );
 
 public:
-    ByteString      aCallPar1;      // Klassenaufruf ohne Typen bis ResId
-    ByteString      aCallPar2;      // Klassenaufruf ohne Typen ab ResId
-    ByteString      aCallParType;   // Klassenaufruf mit Typen
+    rtl::OString    aCallPar1;      // Klassenaufruf ohne Typen bis ResId
+    rtl::OString    aCallPar2;      // Klassenaufruf ohne Typen ab ResId
+    rtl::OString    aCallParType;   // Klassenaufruf mit Typen
 
             void    SetSuperClass( RscTop * pClass )
                     {
@@ -74,10 +74,10 @@ public:
             sal_Bool    InHierarchy( RscTop * pClass );
             sal_Bool    IsCodeWriteable() const
                     {
-                        return( 0 != aCallParType.Len() );
+                        return( 0 != aCallParType.getLength() );
                     }
-            void    SetCallPar( const ByteString & rPar1, const ByteString & rPar2,
-                                const ByteString & rParType );
+            void    SetCallPar( const rtl::OString& rPar1, const rtl::OString& rPar2,
+                                const rtl::OString& rParType );
             void    SetRefClass( RscTop * pRef ) { pRefClass = pRef; }
             RscTop* GetRefClass() const { return pRefClass; }
     virtual RSCCLASS_TYPE GetClassType() const = 0;
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 8f94b509615d..b882b33afa44 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -104,14 +104,14 @@ class StringNode : public NameNode
 protected:
     using NameNode::Search;
 
-    ByteString      aName;
+    rtl::OString m_aName;
 
 public:
-                    StringNode(){};
-                    StringNode( const ByteString & rStr ) { aName = rStr; }
+    StringNode() {}
+    StringNode(const rtl::OString& rStr) { m_aName = rStr; }
 
     StringNode*     Search( const char * ) const;
-    ByteString      GetName() const { return aName; }
+    rtl::OString    GetName() const { return m_aName; }
 };
 
 #endif // _RSCTREE_HXX