diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-01 23:31:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-06 10:33:04 +0000 |
| commit | cd676159ca49756549fa81b29caf77a805cb4a5e (patch) | |
| tree | eae9e14a9dfe2085dd9d0da39c008b6f076d9feb /rsc/inc | |
| parent | 73a395cdc7d3ad802182a470c799720307ed408e (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'rsc/inc')
| -rw-r--r-- | rsc/inc/rscdef.hxx | 18 | ||||
| -rw-r--r-- | rsc/inc/rsctools.hxx | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 4e2ff5b9f40a..e516b018f6a9 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -206,8 +206,8 @@ public: sal_Bool bLoaded; // Ist die Datei geladen sal_Bool bScanned; // Wurde Datei nach Inclide abgesucht sal_Bool bDirty; // Dirty-Flag - ByteString aFileName; // Name der Datei - ByteString aPathName; // Pfad und Name der Datei + rtl::OString aFileName; // Name der Datei + rtl::OString aPathName; // Pfad und Name der Datei RscDefineList aDefLst; // Liste der Defines RscDependList aDepLst; // List of Depend @@ -234,15 +234,19 @@ public: void Remove( RscDefine * pDef ); }; -class RscFileTab : public RscSubFileTab { +class RscFileTab : public RscSubFileTab +{ RscDefTree aDefTree; - sal_uLong Find( const ByteString & rName ); + sal_uLong Find(const rtl::OString& rName); public: RscFileTab(); ~RscFileTab(); RscDefine * FindDef( const char * ); - RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); } + RscDefine * FindDef(const rtl::OString& rStr) + { + return FindDef(rStr.getStr()); + } sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); sal_Bool TestDef( sal_uLong lFileKey, size_t lPos, @@ -257,8 +261,8 @@ public: // Alle Defines die in dieser Datei Definiert sind loeschen void DeleteFileContext( sal_uLong lKey ); - sal_uLong NewCodeFile( const rtl::OString& rName ); - sal_uLong NewIncFile( const ByteString & rName, const ByteString & rPath ); + sal_uLong NewCodeFile(const rtl::OString& rName); + sal_uLong NewIncFile(const rtl::OString& rName, const rtl::OString& rPath); RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); } }; diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index 5792c1de8cff..7694af3b06b0 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -63,7 +63,7 @@ char* rsc_strdup( const char* ); /****************** C L A S S E S ****************************************/ -typedef ::std::vector< ByteString* > RscStrList; +typedef ::std::vector< rtl::OString* > RscStrList; /*********** R s c C h a r ***********************************************/ class RscChar |