[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/bastypes.cxx |    4 ++--
 basctl/source/inc/sbxitem.hxx       |   24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit e007d3f3b93235be8dfd328db6cf38475acb49a7
Author: August Sodora <augsod at gmail.com>
Date:   Wed Nov 30 01:41:45 2011 -0500

    String->OUString

diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 91d2576..4dcc710 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -886,7 +886,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
     return pItem;
 }
 
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const String& aLibName, const String& aName, sal_uInt16 nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, sal_uInt16 nType )
     :SfxPoolItem( nWhich_ )
     ,m_aDocument(rDocument)
     ,m_aLibName(aLibName)
@@ -895,7 +895,7 @@ SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const Stri
 {
 }
 
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, sal_uInt16 nType )
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString& aMethodName, sal_uInt16 nType )
     :SfxPoolItem( nWhich_ )
     ,m_aDocument(rDocument)
     ,m_aLibName(aLibName)
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index d1efe51..94a8b51 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -38,19 +38,18 @@ const sal_uInt16 BASICIDE_TYPE_MODULE   =   3;
 const sal_uInt16 BASICIDE_TYPE_DIALOG   =   4;
 const sal_uInt16 BASICIDE_TYPE_METHOD   =   5;
 
-
 class SbxItem : public SfxPoolItem
 {
     ScriptDocument          m_aDocument;
-    String                  m_aLibName;
-    String                  m_aName;
-    String                  m_aMethodName;
+    ::rtl::OUString         m_aLibName;
+    ::rtl::OUString         m_aName;
+    ::rtl::OUString         m_aMethodName;
     sal_uInt16                  m_nType;
 
 public:
     TYPEINFO();
-    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, sal_uInt16 nType );
-    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, sal_uInt16 nType );
+    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, sal_uInt16 nType );
+    SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString& aMethodName, sal_uInt16 nType );
     SbxItem( const SbxItem& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -60,20 +59,19 @@ public:
                             GetDocument() const { return m_aDocument; }
     void                    SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
 
-    const String&           GetLibName() const { return m_aLibName; }
-    void                    SetLibName( const String& aLibName ) { m_aLibName = aLibName; }
+    const ::rtl::OUString&  GetLibName() const { return m_aLibName; }
+    void                    SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; }
 
-    const String&           GetName() const { return m_aName; }
-    void                    SetName( const String& aName ) { m_aName = aName; }
+    const ::rtl::OUString&  GetName() const { return m_aName; }
+    void                    SetName( const ::rtl::OUString& aName ) { m_aName = aName; }
 
-    const String&           GetMethodName() const { return m_aMethodName; }
-    void                    SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; }
+    const ::rtl::OUString&  GetMethodName() const { return m_aMethodName; }
+    void                    SetMethodName( const ::rtl::OUString& aMethodName ) { m_aMethodName = aMethodName; }
 
     sal_uInt16                  GetType() const { return m_nType; }
     void                    SetType( sal_uInt16 nType ) { m_nType = nType; }
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */