diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 17:05:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 17:05:42 +0000 |
| commit | 18cf2ccd24740facefc006603a5fc77e51f7d2cc (patch) | |
| tree | b74c9361571cd7628e466f88f86607bf878acf67 /basic/inc | |
| parent | 5bac8101407c3c17ae0217f13c9f5f509cb5314b (diff) | |
Revert "Replace String with rtl::OUString"
You can't hope to change *some* virtual methods of a hierarchy and
leave others untouched, they all have to be changed together.
This reverts commit 9f46bee92be38f2d59295cabd9f1fdb149708153.
Diffstat (limited to 'basic/inc')
| -rwxr-xr-x | basic/inc/basic/sbdef.hxx | 3 | ||||
| -rwxr-xr-x | basic/inc/basic/sbuno.hxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index 43d35d011b5c..85218a34965f 100755 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -31,7 +31,6 @@ #include <basic/sbxdef.hxx> #include <svl/svarray.hxx> -#include <rtl/ustring.hxx> #define _BASIC_TEXTPORTIONS @@ -77,7 +76,7 @@ String getBasicTypeName( SbxDataType eType ); // important for SbUnoObj instances // implementation: basic/source/classes/sbunoobj.cxx class SbxObject; -::rtl::OUString getBasicObjectTypeName( SbxObject* pObj ); +String getBasicObjectTypeName( SbxObject* pObj ); // Allows Basic IDE to set watch mode to suppress errors // implementation: basic/source/runtime/runtime.cxx diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx index faeb99ef2160..0539246e071b 100755 --- a/basic/inc/basic/sbuno.hxx +++ b/basic/inc/basic/sbuno.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} // Returns a SbxObject that wrapps an Uno Interface // Implementation in basic/source/classes/sbunoobj.cxx -SbxObjectRef GetSbUnoObject( const ::rtl::OUString& aName, const com::sun::star::uno::Any& aUnoObj_ ); +SbxObjectRef GetSbUnoObject( const String& aName, const com::sun::star::uno::Any& aUnoObj_ ); // Force creation of all properties for debugging void createAllObjectProperties( SbxObject* pObj ); |