convert IDL module from String to OUString

Change-Id: Idf8e0e02ee2fde23959a281cc6ffa1a43ee7f239

4 files changed, 20 insertions, 20 deletions

diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 23a646f4fad3..c82211dc7906 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -24,7 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 
-typedef ::std::vector< String* > StringList;
+typedef ::std::vector< OUString > StringList;
 typedef ::std::vector< OString* > ByteStringList;
 
 class SvCommand
@@ -35,8 +35,8 @@ public:
     OUString    aListFile;
     OUString    aSlotMapFile;
     OUString    aSfxItemFile;
-    String      aPath;
-    String      aTargetFile;
+    OUString    aPath;
+    OUString    aTargetFile;
     OUString    aHelpIdFile;
     OUString    aCSVFile;
     OUString    aExportFile;
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 1702ed77618f..15e87f29da87 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -56,10 +56,10 @@ public:
 class SvIdlDataBase
 {
     sal_Bool                        bExport;
-    String                      aExportFile;
+    OUString                    aExportFile;
     sal_uInt32                  nUniqueId;
     sal_uInt32                  nVerbosity;
-    String                      aDataBaseFile;
+    OUString                    aDataBaseFile;
     SvPersistStream             aPersStream;
     StringList                  aIdFileList;
     SvStringHashTable *         pIdTable;
@@ -73,7 +73,7 @@ class SvIdlDataBase
 protected:
     ::std::set< OUString > m_DepFiles;
     SvMetaObjectMemberStack     aContextStack;
-    String                      aPath;
+    OUString                    aPath;
     SvIdlError                  aError;
     void WriteReset()
     {
@@ -100,15 +100,15 @@ public:
     OString            aIFaceName;
     SvNumberIdentifier      aStructSlotId;
 
-    void                    StartNewFile( const String& rName );
-    void                    SetExportFile( const String& rName )
+    void                    StartNewFile( const OUString& rName );
+    void                    SetExportFile( const OUString& rName )
                             { aExportFile = rName; }
     void                    AppendAttr( SvMetaAttribute *pSlot );
     const SvIdlError &      GetError() const { return aError; }
     void                    SetError( const SvIdlError & r )
                             { aError = r; }
 
-    const String &            GetPath() const { return aPath; }
+    const OUString &        GetPath() const { return aPath; }
     SvMetaObjectMemberStack & GetStack()      { return aContextStack; }
 
     void                    Write(const OString& rText);
@@ -131,7 +131,7 @@ public:
     sal_uInt32              GetUniqueId() { return ++nUniqueId; }
     sal_Bool                FindId( const OString& rIdName, sal_uLong * pVal );
     sal_Bool                InsertId( const OString& rIdName, sal_uLong nVal );
-    sal_Bool                    ReadIdFile( const String & rFileName );
+    sal_Bool                ReadIdFile( const OUString & rFileName );
 
     SvMetaType *            FindType( const OString& rName );
     static SvMetaType *     FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -141,7 +141,7 @@ public:
                                             SvMetaType * pType = NULL );
     SvMetaAttribute *       SearchKnownAttr( const SvNumberIdentifier& );
     SvMetaClass *           ReadKnownClass( SvTokenStream & rInStm );
-    void AddDepFile(String const& rFileName);
+    void AddDepFile(OUString const& rFileName);
     bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
 };
 
@@ -150,7 +150,7 @@ class SvIdlWorkingBase : public SvIdlDataBase
 public:
                 explicit SvIdlWorkingBase( const SvCommand& rCmd );
 
-    sal_Bool        ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath );
+    sal_Bool        ReadSvIdl( SvTokenStream &, sal_Bool bImported, const OUString & rPath );
     sal_Bool        WriteSvIdl( SvStream & );
 
     sal_Bool        WriteSfx( SvStream & );
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 7dd36f4e530e..238f5b904d20 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -130,7 +130,7 @@ class SvTokenStream
 
     SvFileStream *  pInStream;
     SvStream &      rInStream;
-    String          aFileName;
+    OUString        aFileName;
     boost::ptr_vector<SvToken> aTokList;
     boost::ptr_vector<SvToken>::iterator pCurToken;
 
@@ -165,12 +165,12 @@ class SvTokenStream
                         }
                     }
 public:
-                    SvTokenStream( const String & rFileName );
-                    SvTokenStream( SvStream & rInStream, const String & rFileName );
+                    SvTokenStream( const OUString & rFileName );
+                    SvTokenStream( SvStream & rInStream, const OUString & rFileName );
                     ~SvTokenStream();
 
-    const String &  GetFileName() const { return aFileName; }
-    SvStream &      GetStream() { return rInStream; }
+    const OUString &  GetFileName() const { return aFileName; }
+    SvStream &        GetStream() { return rInStream; }
 
     void            SetTabSize( sal_uInt16 nTabSizeP )
                     { nTabSize = nTabSizeP; }
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 7d42b7559b27..d11d2caf420a 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -38,7 +38,7 @@ class SvMetaModule : public SvMetaExtern
     SvMetaTypeMemberList        aTypeList;
     SvMetaAttributeMemberList   aAttrList;
 // browser
-    String                  aIdlFileName;
+    OUString                aIdlFileName;
     SvString                aHelpFileName;
     SvString                aSlotIdFile;
     SvString                aTypeLibFile;
@@ -58,7 +58,7 @@ public:
                         SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
                         SvMetaModule();
 
-    const String &      GetIdlFileName() const { return aIdlFileName; }
+    const OUString &    GetIdlFileName() const { return aIdlFileName; }
     const OString& GetModulePrefix() const { return aModulePrefix.getString(); }
 
     virtual sal_Bool    SetName( const OString& rName, SvIdlDataBase * = NULL  );
@@ -70,7 +70,7 @@ public:
     const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
     const SvMetaClassMemberList & GetClassList() const { return aClassList; }
 
-                        SvMetaModule( const String & rIdlFileName,
+                        SvMetaModule( const OUString & rIdlFileName,
                                       sal_Bool bImported );
 
     sal_Bool                FillNextName( SvGlobalName * );