summaryrefslogtreecommitdiff
path: root/basic/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/inc')
-rw-r--r--basic/source/inc/buffer.hxx7
-rw-r--r--basic/source/inc/errobject.hxx4
-rw-r--r--basic/source/inc/expr.hxx18
-rw-r--r--basic/source/inc/image.hxx39
-rw-r--r--basic/source/inc/namecont.hxx174
-rw-r--r--basic/source/inc/parser.hxx4
-rw-r--r--basic/source/inc/runtime.hxx30
-rw-r--r--basic/source/inc/sbintern.hxx14
-rw-r--r--basic/source/inc/sbjsmeth.hxx2
-rw-r--r--basic/source/inc/sbjsmod.hxx2
-rw-r--r--basic/source/inc/sbunoobj.hxx72
-rw-r--r--basic/source/inc/stdobj.hxx4
-rw-r--r--basic/source/inc/symtbl.hxx69
13 files changed, 218 insertions, 221 deletions
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index 08a1f2f5f2df..5ac631a71e12 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -19,9 +19,8 @@
#ifndef _BUFFER_HXX
#define _BUFFER_HXX
-
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
-#include <tools/string.hxx>
class SbiParser;
@@ -32,13 +31,13 @@ class SbiBuffer {
sal_uInt32 nOff;
sal_uInt32 nSize;
short nInc;
- bool Check( sal_uInt16 );
+ bool Check( sal_Int32 );
public:
SbiBuffer( SbiParser*, short ); // increment
~SbiBuffer();
void Patch( sal_uInt32, sal_uInt32 );
void Chain( sal_uInt32 );
- bool operator += (const String&); // save basic-string
+ bool operator += (const OUString&); // save basic-string
bool operator += (sal_Int8); // save character
bool operator += (sal_Int16); // save integer
bool operator += (sal_uInt8); // save character
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index db4433268ee9..2c59e478cd7e 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -28,7 +28,7 @@ class SbxErrObject : public SbUnoObject
class ErrObject* m_pErrObject;
com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
- SbxErrObject( const String& aName_, const com::sun::star::uno::Any& aUnoObj_ );
+ SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ );
~SbxErrObject();
class ErrObject* getImplErrObject( void )
@@ -38,7 +38,7 @@ public:
static SbxVariableRef getErrObject();
static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
- void setNumberAndDescription( ::sal_Int32 _number, const ::rtl::OUString& _description )
+ void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
throw (com::sun::star::uno::RuntimeException);
};
#endif
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 92a67b907aed..0b9eb229a795 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -46,7 +46,7 @@ struct SbVar {
struct KeywordSymbolInfo
{
- ::rtl::OUString m_aKeywordSymbol;
+ OUString m_aKeywordSymbol;
SbxDataType m_eSbxDataType;
SbiToken m_eTok;
};
@@ -94,7 +94,7 @@ class SbiExprNode { // operators (and operands)
double nVal; // numeric value
SbVar aVar; // or variable
};
- String aStrVal; // #i59791/#i45570 Store string directly
+ OUString aStrVal; // #i59791/#i45570 Store string directly
SbiExprNode* pLeft; // right branch
SbiExprNode* pRight; // right branch (NULL for unary ops)
SbiExprNode* pWithParent; // node, whose member is "this per with"
@@ -118,7 +118,7 @@ class SbiExprNode { // operators (and operands)
public:
SbiExprNode( void );
SbiExprNode( SbiParser*, double, SbxDataType );
- SbiExprNode( SbiParser*, const String& );
+ SbiExprNode( SbiParser*, const OUString& );
SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL );
SbiExprNode( SbiParser*, SbiExprNode*, SbiToken, SbiExprNode* );
SbiExprNode( SbiParser*, SbiExprNode*, sal_uInt16 ); // #120061 TypeOf
@@ -141,7 +141,7 @@ public:
SbiSymDef* GetRealVar(); // last variable in x.y.z
SbiExprNode* GetRealNode(); // last node in x.y.z
short GetDepth(); // compute a tree's depth
- const String& GetString() { return aStrVal; }
+ const OUString& GetString() { return aStrVal; }
short GetNumber() { return (short)nVal; }
SbiExprList* GetParameters() { return aVar.pPar; }
SbiExprListVector* GetMoreParameters() { return aVar.pvMorePar; }
@@ -156,7 +156,7 @@ class SbiExpression {
friend class SbiParameters;
friend class SbiDimList;
protected:
- String aArgName;
+ OUString aArgName;
SbiParser* pParser;
SbiExpression* pNext; // link at parameter lists
SbiExprNode* pExpr; // expression tree
@@ -187,7 +187,7 @@ public:
SbiExpression( SbiParser*, double, SbxDataType = SbxDOUBLE );
SbiExpression( SbiParser*, const SbiSymDef&, SbiExprList* = NULL );
~SbiExpression();
- String& GetName() { return aArgName; }
+ OUString& GetName() { return aArgName; }
void SetBased() { bBased = true; }
bool IsBased() { return bBased; }
void SetByVal() { bByVal = true; }
@@ -198,7 +198,7 @@ public:
bool IsVariable() { return pExpr->IsVariable(); }
bool IsLvalue() { return pExpr->IsLvalue(); }
bool IsIntConstant() { return pExpr->IsIntConst(); }
- const String& GetString() { return pExpr->GetString(); }
+ const OUString& GetString() { return pExpr->GetString(); }
SbiSymDef* GetVar() { return pExpr->GetVar(); }
SbiSymDef* GetRealVar() { return pExpr->GetRealVar(); }
SbiExprNode* GetExprNode() { return pExpr; }
@@ -209,12 +209,12 @@ public:
class SbiConstExpression : public SbiExpression {
double nVal;
- String aVal;
+ OUString aVal;
SbxDataType eType;
public: // numeric constant
SbiConstExpression( SbiParser* );
SbxDataType GetType() { return eType; }
- const String& GetString() { return aVal; }
+ const OUString& GetString() { return aVal; }
double GetValue() { return nVal; }
short GetShortValue();
};
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 96474ad78ca1..42d19f97b675 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -32,32 +32,32 @@ class SbiImage {
SbxArrayRef rTypes; // User defined types
SbxArrayRef rEnums; // Enum types
- sal_uInt32* pStringOff; // StringId-Offsets
+ sal_uInt32* pStringOff; // StringId-Offsets
sal_Unicode* pStrings; // StringPool
char* pCode; // Code-Image
char* pLegacyPCode; // Code-Image
bool bError;
- sal_uInt16 nFlags;
+ sal_uInt16 nFlags;
short nStrings;
- sal_uInt32 nStringSize;
- sal_uInt32 nCodeSize;
- sal_uInt16 nLegacyCodeSize;
- sal_uInt16 nDimBase; // OPTION BASE value
+ sal_uInt32 nStringSize;
+ sal_uInt32 nCodeSize;
+ sal_uInt16 nLegacyCodeSize;
+ sal_uInt16 nDimBase; // OPTION BASE value
rtl_TextEncoding eCharSet;
// temporary management-variable:
short nStringIdx;
- sal_uInt32 nStringOff; // current Pos in the stringbuffer
+ sal_uInt32 nStringOff; // current Pos in the stringbuffer
// routines for the compiler:
void MakeStrings( short ); // establish StringPool
- void AddString( const String& );
+ void AddString( const OUString& );
void AddCode( char*, sal_uInt32 );
void AddType(SbxObject *);
void AddEnum(SbxObject *);
public:
- String aName; // macro name
- ::rtl::OUString aOUSource; // source code
- String aComment;
+ OUString aName; // macro name
+ OUString aOUSource; // source code
+ OUString aComment;
bool bInit;
bool bFirstInit;
@@ -71,21 +71,20 @@ public:
bool IsError() { return bError; }
const char* GetCode() const { return pCode; }
- sal_uInt32 GetCodeSize() const { return nCodeSize; }
- ::rtl::OUString& GetSource32() { return aOUSource; }
- sal_uInt16 GetBase() const { return nDimBase; }
- String GetString( short nId ) const;
- const SbxObject* FindType (String aTypeName) const;
+ sal_uInt32 GetCodeSize() const { return nCodeSize; }
+ OUString& GetSource32() { return aOUSource; }
+ sal_uInt16 GetBase() const { return nDimBase; }
+ OUString GetString( short nId ) const;
+ const SbxObject* FindType (OUString aTypeName) const;
SbxArrayRef GetEnums() { return rEnums; }
void SetFlag( sal_uInt16 n ) { nFlags |= n; }
- sal_uInt16 GetFlag( sal_uInt16 n ) const { return nFlags & n; }
- sal_uInt16 CalcLegacyOffset( sal_Int32 nOffset );
- sal_uInt32 CalcNewOffset( sal_Int16 nOffset );
+ sal_uInt16 GetFlag( sal_uInt16 n ) const { return nFlags & n; }
+ sal_uInt16 CalcLegacyOffset( sal_Int32 nOffset );
+ sal_uInt32 CalcNewOffset( sal_Int16 nOffset );
void ReleaseLegacyBuffer();
bool ExceedsLegacyLimits();
-
};
#define SBIMG_EXPLICIT 0x0001 // OPTION EXPLICIT is active
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index bfb867d3b360..5213510493fe 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -71,10 +71,10 @@ typedef ::cppu::WeakImplHelper3<
class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
{
- typedef boost::unordered_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap;
+ typedef boost::unordered_map < OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap;
NameContainerNameMap mHashMap;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > mNames;
+ ::com::sun::star::uno::Sequence< OUString > mNames;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > mValues;
sal_Int32 mnElementCount;
@@ -103,29 +103,29 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// Methods XNameReplace
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+ virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// Methods XNameContainer
- virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+ virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+ virtual void SAL_CALL removeByName( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -216,7 +216,7 @@ class SfxLibraryContainer : public SfxLibraryContainer_BASE, public ::utl::OEven
VBAScriptListenerContainer maVBAScriptListeners;
sal_Int32 mnRunningVBAScripts;
sal_Bool mbVBACompat;
- rtl::OUString msProjectName;
+ OUString msProjectName;
protected:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > mxSFI;
@@ -231,12 +231,12 @@ protected:
bool mbOldInfoFormat;
bool mbOasis2OOoFormat;
- ::rtl::OUString maInitialDocumentURL;
- ::rtl::OUString maInfoFileName;
- ::rtl::OUString maOldInfoFileName;
- ::rtl::OUString maLibElementFileExtension;
- ::rtl::OUString maLibraryPath;
- ::rtl::OUString maLibrariesDir;
+ OUString maInitialDocumentURL;
+ OUString maInfoFileName;
+ OUString maOldInfoFileName;
+ OUString maLibElementFileExtension;
+ OUString maLibraryPath;
+ OUString maLibrariesDir;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > mxStorage;
BasicManager* mpBasMgr;
@@ -252,14 +252,14 @@ protected:
} meInitMode;
void implStoreLibrary( SfxLibrary* pLib,
- const ::rtl::OUString& aName,
+ const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
// New variant for library export
void implStoreLibrary( SfxLibrary* pLib,
- const ::rtl::OUString& aName,
+ const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
- const ::rtl::OUString& aTargetURL,
+ const OUString& aTargetURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
@@ -269,27 +269,27 @@ protected:
// New variant for library export
void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
- const ::rtl::OUString& aTargetURL,
+ const OUString& aTargetURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI );
bool implLoadLibraryIndexFile( SfxLibrary* pLib,
::xmlscript::LibDescriptor& rLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
- const ::rtl::OUString& aIndexFileName );
+ const OUString& aIndexFileName );
void implImportLibDescriptor( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib );
// Methods to distinguish between deffirent library types
- virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName ) = 0;
+ virtual SfxLibrary* SAL_CALL implCreateLibrary( const OUString& aName ) = 0;
virtual SfxLibrary* SAL_CALL implCreateLibraryLink
- ( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL,
- const ::rtl::OUString& StorageURL, sal_Bool ReadOnly ) = 0;
+ ( const OUString& aName, const OUString& aLibInfoFileURL,
+ const OUString& StorageURL, sal_Bool ReadOnly ) = 0;
virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) = 0;
virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const = 0;
virtual void SAL_CALL writeLibraryElement
(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
- const ::rtl::OUString& aElementName,
+ const OUString& aElementName,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput
)
throw(::com::sun::star::uno::Exception) = 0;
@@ -297,22 +297,22 @@ protected:
virtual ::com::sun::star::uno::Any SAL_CALL importLibraryElement
(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& xLibrary,
- const ::rtl::OUString& aElementName,
- const ::rtl::OUString& aFile,
+ const OUString& aElementName,
+ const OUString& aFile,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xElementStream ) = 0;
- virtual void SAL_CALL importFromOldStorage( const ::rtl::OUString& aFile ) = 0;
+ virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) = 0;
// Password encryption
- virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName,
+ virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
// New variant for library export
- virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName,
+ virtual sal_Bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
- const ::rtl::OUString& aTargetURL,
+ const OUString& aTargetURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler );
- virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& Name,
+ virtual sal_Bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
sal_Bool bVerifyPasswordOnly=false )
throw(::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -327,9 +327,9 @@ protected:
// Interface to get the BasicManager (Hack for password implementation)
BasicManager* getBasicManager( void );
- ::rtl::OUString createAppLibraryFolder( SfxLibrary* pLib, const ::rtl::OUString& aName );
+ OUString createAppLibraryFolder( SfxLibrary* pLib, const OUString& aName );
- void init( const ::rtl::OUString& rInitialDocumentURL,
+ void init( const OUString& rInitialDocumentURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage );
virtual const sal_Char* SAL_CALL getInfoFileName() const = 0;
@@ -340,21 +340,21 @@ protected:
// Handle maLibInfoFileURL and maStorageURL correctly
void checkStorageURL
(
- const ::rtl::OUString& aSourceURL,
- ::rtl::OUString& aLibInfoFileURL,
- ::rtl::OUString& aStorageURL,
- ::rtl::OUString& aUnexpandedStorageURL
+ const OUString& aSourceURL,
+ OUString& aLibInfoFileURL,
+ OUString& aStorageURL,
+ OUString& aUnexpandedStorageURL
);
- ::rtl::OUString expand_url( const ::rtl::OUString& url )
+ OUString expand_url( const OUString& url )
throw(::com::sun::star::uno::RuntimeException);
- SfxLibrary* getImplLib( const String& rLibraryName );
+ SfxLibrary* getImplLib( const OUString& rLibraryName );
void storeLibraries_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
bool bComplete );
- void SAL_CALL initializeFromDocumentURL( const ::rtl::OUString& _rInitialDocumentURL );
+ void SAL_CALL initializeFromDocumentURL( const OUString& _rInitialDocumentURL );
void SAL_CALL initializeFromDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& _rxDocument );
// OEventListenerAdapter
@@ -364,7 +364,7 @@ protected:
virtual void SAL_CALL disposing();
private:
- void init_Impl( const ::rtl::OUString& rInitialDocumentURL,
+ void init_Impl( const OUString& rInitialDocumentURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage );
void implScanExtensions( void );
@@ -391,13 +391,13 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// Members XStorageBasedLibraryContainer
@@ -413,53 +413,53 @@ public:
// Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer)
virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//Methods XLibraryContainer3
- virtual ::rtl::OUString SAL_CALL getOriginalLibraryLinkURL( const ::rtl::OUString& Name )
+ virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
// Methods XLibraryContainer2 (base of XPersistentLibraryContainer)
- virtual sal_Bool SAL_CALL isLibraryLink( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name )
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLibraryLinkURL( const ::rtl::OUString& Name )
+ virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isLibraryReadOnly( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name )
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLibraryReadOnly( const ::rtl::OUString& Name, sal_Bool bReadOnly )
+ virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL renameLibrary( const ::rtl::OUString& Name, const ::rtl::OUString& NewName )
+ virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName )
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException);
// Methods XLibraryContainer (base of XLibraryContainer2)
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL
- createLibrary( const ::rtl::OUString& Name )
+ createLibrary( const OUString& Name )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL createLibraryLink
- ( const ::rtl::OUString& Name, const ::rtl::OUString& StorageURL, sal_Bool ReadOnly )
+ ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeLibrary( const ::rtl::OUString& Name )
+ virtual void SAL_CALL removeLibrary( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isLibraryLoaded( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL loadLibrary( const ::rtl::OUString& Name )
+ virtual void SAL_CALL loadLibrary( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -471,19 +471,19 @@ public:
::com::sun::star::uno::RuntimeException);
// Methods XLibraryContainerPassword
- virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const ::rtl::OUString& Name )
+ virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL verifyLibraryPassword( const ::rtl::OUString& Name, const ::rtl::OUString& Password )
+ virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL changeLibraryPassword( const ::rtl::OUString& Name,
- const ::rtl::OUString& OldPassword, const ::rtl::OUString& NewPassword )
+ virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
+ const OUString& OldPassword, const OUString& NewPassword )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
@@ -497,24 +497,24 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// Methods XLibraryContainerExport
- virtual void SAL_CALL exportLibrary( const ::rtl::OUString& Name, const ::rtl::OUString& URL,
+ virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
throw (::com::sun::star::uno::Exception,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
// Methods XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException) = 0;
// Methods XVBACompatibility
virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException) { return msProjectName; }
- virtual void SAL_CALL setProjectName( const ::rtl::OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException) { return msProjectName; }
+ virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getRunningVBAScripts()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVBAScriptListener(
@@ -523,7 +523,7 @@ public:
virtual void SAL_CALL removeVBAScriptListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const ::rtl::OUString& rModuleName )
+ virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
throw (::com::sun::star::uno::RuntimeException);
};
@@ -571,11 +571,11 @@ class SfxLibrary
private:
- ::rtl::OUString maLibElementFileExtension;
- ::rtl::OUString maLibInfoFileURL;
- ::rtl::OUString maStorageURL;
- ::rtl::OUString maUnexpandedStorageURL;
- ::rtl::OUString maOriginalStorageURL;
+ OUString maLibElementFileExtension;
+ OUString maLibInfoFileURL;
+ OUString maStorageURL;
+ OUString maUnexpandedStorageURL;
+ OUString maOriginalStorageURL;
sal_Bool mbLink;
sal_Bool mbReadOnly;
@@ -585,7 +585,7 @@ private:
sal_Bool mbPasswordProtected;
sal_Bool mbPasswordVerified;
bool mbDoc50Password;
- ::rtl::OUString maPassword;
+ OUString maPassword;
bool mbSharedIndexFile;
bool mbExtension;
@@ -594,8 +594,8 @@ private:
// Provide modify state including resources
virtual sal_Bool isModified( void ) = 0;
virtual void storeResources( void ) = 0;
- virtual void storeResourcesAsURL( const ::rtl::OUString& URL, const ::rtl::OUString& NewName ) = 0;
- virtual void storeResourcesToURL( const ::rtl::OUString& URL,
+ virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) = 0;
+ virtual void storeResourcesToURL( const OUString& URL,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) = 0;
virtual void storeResourcesToStorage( const ::com::sun::star::uno::Reference
< ::com::sun::star::embed::XStorage >& xStorage ) = 0;
@@ -614,7 +614,7 @@ private:
void impl_checkLoaded();
private:
- void impl_removeWithoutChecks( const ::rtl::OUString& _rElementName );
+ void impl_removeWithoutChecks( const OUString& _rElementName );
public:
SfxLibrary(
@@ -628,8 +628,8 @@ public:
const ::com::sun::star::uno::Type& aType,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >& xSFI,
- const ::rtl::OUString& aLibInfoFileURL,
- const ::rtl::OUString&
+ const OUString& aLibInfoFileURL,
+ const OUString&
aStorageURL,
sal_Bool ReadOnly
);
@@ -646,29 +646,29 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// Methods XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// Methods XNameReplace
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+ virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// Methods XNameContainer
- virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+ virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+ virtual void SAL_CALL removeByName( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -697,7 +697,7 @@ public:
public:
struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } };
- void removeElementWithoutChecks( const ::rtl::OUString& _rElementName, LibraryContainerAccess )
+ void removeElementWithoutChecks( const OUString& _rElementName, LibraryContainerAccess )
{
impl_removeWithoutChecks( _rElementName );
}
@@ -736,7 +736,7 @@ class ScriptExtensionIterator
{
public:
ScriptExtensionIterator( void );
- rtl::OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
+ OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
protected:
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 68dd9f18f39a..d6c14a6b27ee 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -26,7 +26,7 @@
#include <vector>
-typedef ::std::vector< String > StringVector;
+typedef ::std::vector< OUString > StringVector;
struct SbiParseStack;
@@ -82,7 +82,7 @@ public:
SbiExprNode* GetWithVar();
// from 31.3.1996, search symbol in the runtime-library
- SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType );
+ SbiSymDef* CheckRTLForSym( const OUString& rSym, SbxDataType eType );
void AddConstants( void );
bool HasGlobalCode();
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 005f262b81b8..fd5313775ded 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -112,7 +112,7 @@ public:
sal_Int16 nDirFlags;
short nCurDirPos;
- String sFullNameToBeChecked;
+ OUString sFullNameToBeChecked;
WildCard* pWildCard;
Sequence< ::rtl::OUString > aDirSeq;
@@ -148,10 +148,10 @@ class SbiInstance
sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
SbError nErr;
- OUString aErrorMsg; // last error message for $ARG
- sal_uInt16 nErl; // current error line
- sal_Bool bReschedule; // Flag: sal_True = Reschedule in main loop
- sal_Bool bCompatibility; // Flag: sal_True = VBA runtime compatibility mode
+ OUString aErrorMsg; // last error message for $ARG
+ sal_Int32 nErl; // current error line
+ sal_Bool bReschedule; // Flag: sal_True = Reschedule in main loop
+ sal_Bool bCompatibility; // Flag: sal_True = VBA runtime compatibility mode
ComponentVector_t ComponentVector;
public:
@@ -178,7 +178,7 @@ public:
void Stop();
SbError GetErr() { return nErr; }
OUString GetErrorMsg() { return aErrorMsg; }
- xub_StrLen GetErl() { return nErl; }
+ sal_Int32 GetErl() { return nErl; }
void EnableReschedule( sal_Bool bEnable ) { bReschedule = bEnable; }
sal_Bool IsReschedule( void ) { return bReschedule; }
void EnableCompatibility( sal_Bool bEnable ) { bCompatibility = bEnable; }
@@ -257,7 +257,7 @@ class SbiRuntime
const sal_uInt8* pRestart; // restart-address
const sal_uInt8* pErrCode; // restart-adresse RESUME NEXT
const sal_uInt8* pErrStmnt; // Restart-Adresse RESUMT 0
- String aLibName; // Lib-name for declare-call
+ OUString aLibName; // Lib-name for declare-call
SbxArrayRef refParams; // current procedure parameters
SbxArrayRef refLocals; // local variable
SbxArrayRef refArgv;
@@ -329,12 +329,12 @@ class SbiRuntime
void SetParameters( SbxArray* );
// HAS TO BE IMPLEMENTED SOME TIME
- void DllCall( const String&, const String&, SbxArray*, SbxDataType, bool );
+ void DllCall( const OUString&, const OUString&, SbxArray*, SbxDataType, bool );
// #56204 swap out DIM-functionality into help method (step0.cxx)
void DimImpl( SbxVariableRef refVar );
- bool implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass );
+ bool implIsClass( SbxObject* pObj, const OUString& aClass );
void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
@@ -366,7 +366,7 @@ class SbiRuntime
void StepGOSUB( sal_uInt32 ), StepRETURN( sal_uInt32 );
void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ), StepERRHDL( sal_uInt32 );
void StepRESUME( sal_uInt32 ), StepSETCLASS( sal_uInt32 ), StepVBASETCLASS( sal_uInt32 ), StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
- bool checkClass_Impl( const SbxVariableRef& refVal, const ::rtl::OUString& aClass, bool bRaiseErrors, bool bDefault = true );
+ bool checkClass_Impl( const SbxVariableRef& refVal, const OUString& aClass, bool bRaiseErrors, bool bDefault = true );
void StepCLOSE( sal_uInt32 ), StepPRCHAR( sal_uInt32 ), StepARGTYP( sal_uInt32 );
// all opcodes with two operands
void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 );
@@ -389,7 +389,7 @@ public:
void SetVBAEnabled( bool bEnabled );
sal_uInt16 GetImageFlag( sal_uInt16 n ) const;
sal_uInt16 GetBase();
- xub_StrLen nLine,nCol1,nCol2;
+ sal_Int32 nLine,nCol1,nCol2;
SbiRuntime* pNext; // Stack-Chain
SbiRuntime( SbModule*, SbMethod*, sal_uInt32 );
@@ -451,20 +451,20 @@ bool hasUno( void );
// Converts possibly relative paths to absolute paths
// according to the setting done by ChDir/ChDrive
// (Implemented in methods.cxx)
-String getFullPath( const String& aRelPath );
+OUString getFullPath( const OUString& aRelPath );
// Implementation of StepRENAME with UCB
// (Implemented in methods.cxx, so step0.cxx
// has not to be infected with UNO)
-void implStepRenameUCB( const String& aSource, const String& aDest );
+void implStepRenameUCB( const OUString& aSource, const OUString& aDest );
//*** OSL file access ***
// #87427 OSL need File URLs, so map to getFullPath
-inline String getFullPathUNC( const String& aRelPath )
+inline OUString getFullPathUNC( const OUString& aRelPath )
{
return getFullPath( aRelPath );
}
-void implStepRenameOSL( const String& aSource, const String& aDest );
+void implStepRenameOSL( const OUString& aSource, const OUString& aDest );
bool IsBaseIndexOne();
#endif
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a4ff91f6d268..7dfd011f8385 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -40,10 +40,10 @@ class SbiFactory : public SbxFactory
{
public:
virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
- virtual SbxObject* CreateObject( const rtl::OUString& );
+ virtual SbxObject* CreateObject( const OUString& );
};
-typedef ::std::vector< String > StringVector;
+typedef ::std::vector< OUString > StringVector;
struct SbClassData
{
@@ -73,9 +73,9 @@ public:
void RemoveClassModule( SbModule* pClassModule );
virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
- virtual SbxObject* CreateObject( const rtl::OUString& );
+ virtual SbxObject* CreateObject( const OUString& );
- SbModule* FindClass( const String& rClassName );
+ SbModule* FindClass( const OUString& rClassName );
};
struct SbiGlobals
@@ -93,12 +93,12 @@ struct SbiGlobals
Link aErrHdl; // global error handler
Link aBreakHdl; // global break handler
SbError nCode;
- xub_StrLen nLine;
- xub_StrLen nCol1,nCol2; // from... to...
+ sal_Int32 nLine;
+ sal_Int32 nCol1,nCol2; // from... to...
bool bCompiler; // flag for compiler error
bool bGlobalInitErr;
bool bRunInit; // true, if RunInit active from the Basic
- String aErrMsg; // buffer for GetErrorText()
+ OUString aErrMsg; // buffer for GetErrorText()
::utl::TransliterationWrapper* pTransliterationWrapper; // For StrComp
bool bBlockCompilerError;
BasicManager* pAppBasMgr;
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index e53473a16b7e..acfe8aa711f0 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -30,7 +30,7 @@
class SbJScriptMethod : public SbMethod
{
public:
- SbJScriptMethod( const String&, SbxDataType, SbModule* );
+ SbJScriptMethod( const OUString&, SbxDataType, SbModule* );
virtual ~SbJScriptMethod();
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2);
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 5149df447853..02c100aa6070 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -33,7 +33,7 @@ class SbJScriptModule : public SbModule
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
TYPEINFO();
- SbJScriptModule( const String& ); // hand through
+ SbJScriptModule( const OUString& ); // hand through
};
#endif
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index ab0f43901099..a90197e73409 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -49,7 +49,7 @@ public:
sal_Int32 getPos() const { return mnPos; }
typelib_TypeDescription* getTD() const { return mpTD; }
- rtl::OUString getTypeName() const;
+ OUString getTypeName() const;
com::sun::star::uno::Any& getRootAnyRef() { return maAny; };
com::sun::star::uno::TypeClass getTypeClass() const;
@@ -65,29 +65,29 @@ class SbUnoStructRefObject: public SbxObject
{
struct caseLessComp
{
- bool operator() (const ::rtl::OUString& rProp, const ::rtl::OUString& rOtherProp ) const
+ bool operator() (const OUString& rProp, const OUString& rOtherProp ) const
{
return rProp.toAsciiUpperCase().compareTo( rOtherProp.toAsciiUpperCase() ) < 0;
}
};
- typedef ::std::map< rtl::OUString, StructRefInfo*, caseLessComp > StructFieldInfo;
+ typedef ::std::map< OUString, StructRefInfo*, caseLessComp > StructFieldInfo;
StructFieldInfo maFields;
StructRefInfo maMemberInfo;
bool mbMemberCacheInit;
void implCreateAll();
void implCreateDbgProperties();
void initMemberCache();
- rtl::OUString Impl_DumpProperties();
- rtl::OUString getDbgObjectName();
+ OUString Impl_DumpProperties();
+ OUString getDbgObjectName();
public:
TYPEINFO();
- StructRefInfo getStructMember( const rtl::OUString& rMember );
+ StructRefInfo getStructMember( const OUString& rMember );
StructRefInfo getStructInfo() { return maMemberInfo; }
- SbUnoStructRefObject( const ::rtl::OUString& aName_, const StructRefInfo& rMemberInfo );
+ SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
~SbUnoStructRefObject();
// Find overloaded to support e. g. NameAccess
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
// Force creation of all properties for debugging
void createAllProperties( void )
@@ -118,16 +118,16 @@ class SbUnoObject: public SbxObject
void implCreateAll( void );
public:
- static bool getDefaultPropName( SbUnoObject* pUnoObj, ::rtl::OUString& sDfltProp );
+ static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
TYPEINFO();
- SbUnoObject( const ::rtl::OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
+ SbUnoObject( const OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
~SbUnoObject();
// #76470 do introspection on demand
void doIntrospection( void );
// Find overloaded to support e. g. NameAccess
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
// Force creation of all properties for debugging
void createAllProperties( void )
@@ -168,7 +168,7 @@ class SbUnoMethod : public SbxMethod
public:
TYPEINFO();
- SbUnoMethod( const rtl::OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
+ SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
bool bInvocation,
bool bDirect = false );
virtual ~SbUnoMethod();
@@ -201,7 +201,7 @@ class SbUnoProperty : public SbxProperty
public:
TYPEINFO();
- SbUnoProperty( const rtl::OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
+ SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
bool isUnoStruct() { return mbUnoStruct; }
@@ -215,7 +215,7 @@ class SbUnoFactory : public SbxFactory
{
public:
virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
- virtual SbxObject* CreateObject( const rtl::OUString& );
+ virtual SbxObject* CreateObject( const OUString& );
};
// wrapper for an uno-class
@@ -225,16 +225,16 @@ class SbUnoClass : public SbxObject
public:
TYPEINFO();
- SbUnoClass( const String& aName_ )
+ SbUnoClass( const OUString& aName_ )
: SbxObject( aName_ )
{}
- SbUnoClass( const String& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& xClass_ )
+ SbUnoClass( const OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& xClass_ )
: SbxObject( aName_ )
, m_xClass( xClass_ )
{}
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; }
@@ -245,31 +245,31 @@ SV_DECL_IMPL_REF(SbUnoClass);
// function to find a global identifier in
// the UnoScope and to wrap it for Sbx
-SbUnoClass* findUnoClass( const ::rtl::OUString& rName );
+SbUnoClass* findUnoClass( const OUString& rName );
// Wrapper for UNO Service
class SbUnoService : public SbxObject
{
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc;
- bool m_bNeedsInit;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 > m_xServiceTypeDesc;
+ bool m_bNeedsInit;
public:
TYPEINFO();
- SbUnoService( const String& aName_,
+ SbUnoService( const OUString& aName_,
const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
: SbxObject( aName_ )
, m_xServiceTypeDesc( xServiceTypeDesc )
, m_bNeedsInit( true )
{}
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
};
SV_DECL_IMPL_REF(SbUnoService);
-SbUnoService* findUnoService( const ::rtl::OUString& rName );
+SbUnoService* findUnoService( const OUString& rName );
void clearUnoServiceCtors( void );
@@ -286,7 +286,7 @@ class SbUnoServiceCtor : public SbxMethod
public:
TYPEINFO();
- SbUnoServiceCtor( const::rtl::OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
+ SbUnoServiceCtor( const OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
virtual ~SbUnoServiceCtor();
virtual SbxInfo* GetInfo();
@@ -302,14 +302,14 @@ class SbUnoSingleton : public SbxObject
public:
TYPEINFO();
- SbUnoSingleton( const ::rtl::OUString& aName_,
+ SbUnoSingleton( const OUString& aName_,
const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
};
SV_DECL_IMPL_REF(SbUnoSingleton);
-SbUnoSingleton* findUnoSingleton( const ::rtl::OUString& rName );
+SbUnoSingleton* findUnoSingleton( const OUString& rName );
// #105565 Special Object to wrap a strongly typed Uno Any
@@ -319,7 +319,7 @@ class SbUnoAnyObject: public SbxObject
public:
SbUnoAnyObject( const ::com::sun::star::uno::Any& rVal )
- : SbxObject( String() )
+ : SbxObject( OUString() )
, mVal( rVal )
{}
@@ -335,14 +335,14 @@ public:
class AutomationNamedArgsSbxArray : public SbxArray
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > maNameSeq;
+ ::com::sun::star::uno::Sequence< OUString > maNameSeq;
public:
TYPEINFO();
AutomationNamedArgsSbxArray( sal_Int32 nSeqSize )
: maNameSeq( nSeqSize )
{}
- ::com::sun::star::uno::Sequence< ::rtl::OUString >& getNames( void )
+ ::com::sun::star::uno::Sequence< OUString >& getNames( void )
{ return maNameSeq; }
};
@@ -379,21 +379,21 @@ class BasicCollection : public SbxObject
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
sal_Int32 implGetIndex( SbxVariable* pIndexVar );
- sal_Int32 implGetIndexForName( const String& rName );
+ sal_Int32 implGetIndexForName( const OUString& rName );
void CollAdd( SbxArray* pPar_ );
void CollItem( SbxArray* pPar_ );
void CollRemove( SbxArray* pPar_ );
public:
TYPEINFO();
- BasicCollection( const rtl::OUString& rClassname );
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ BasicCollection( const OUString& rClassname );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
virtual void Clear();
};
-typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
+typedef boost::unordered_map< OUString, ::com::sun::star::uno::Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
-typedef std::vector< rtl::OUString > VBAConstantsVector;
+typedef std::vector< OUString > VBAConstantsVector;
class VBAConstantHelper
{
@@ -407,8 +407,8 @@ private:
void init();
public:
static VBAConstantHelper& instance();
- SbxVariable* getVBAConstant( const ::rtl::OUString& rName );
- bool isVBAConstantType( const ::rtl::OUString& rName );
+ SbxVariable* getVBAConstant( const OUString& rName );
+ bool isVBAConstantType( const OUString& rName );
};
#endif
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 324cdf242a86..12935f78d688 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -35,8 +35,8 @@ class SbiStdObject : public SbxObject
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
public:
- SbiStdObject( const String&, StarBASIC* );
- virtual SbxVariable* Find( const rtl::OUString&, SbxClassType );
+ SbiStdObject( const OUString&, StarBASIC* );
+ virtual SbxVariable* Find( const OUString&, SbxClassType );
virtual void SetModified( sal_Bool );
};
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 87d329c99809..fa7309e0467c 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -34,8 +34,8 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, SbRTL };
// makes sure that they don't exist twice.
class SbiStringPool {
- const rtl::OUString aEmpty;
- std::vector<rtl::OUString> aData;
+ const OUString aEmpty;
+ std::vector<OUString> aData;
SbiParser* pParser;
public:
SbiStringPool( SbiParser* );
@@ -43,9 +43,9 @@ public:
sal_uInt32 GetSize() const { return aData.size(); }
// From 8.4.1999: default changed to true because of #64236 -
// change it back to false when the bug is cleanly removed.
- short Add( const rtl::OUString&, bool=true );
+ short Add( const OUString&, bool=true );
short Add( double, SbxDataType );
- const rtl::OUString& Find( sal_uInt32 ) const;
+ const OUString& Find( sal_uInt32 ) const;
SbiParser* GetParser() { return pParser; }
};
@@ -78,16 +78,16 @@ public:
void SetScope( SbiSymScope s ) { eScope = s; }
SbiParser* GetParser() { return pParser; }
- SbiSymDef* AddSym( const String& );
- SbiProcDef* AddProc( const String& );
+ SbiSymDef* AddSym( const OUString& );
+ SbiProcDef* AddProc( const OUString& );
void Add( SbiSymDef* );
- SbiSymDef* Find( const String& ) const; // variable name
+ SbiSymDef* Find( const OUString& ) const; // variable name
SbiSymDef* FindId( sal_uInt16 ) const;
SbiSymDef* Get( sal_uInt16 ) const; // find variable per position
SbiSymDef* First(), *Next(); // iterators
- sal_uInt32 Define( const String& );
- sal_uInt32 Reference( const String& );
+ sal_uInt32 Define( const OUString& );
+ sal_uInt32 Reference( const OUString& );
void CheckRefs();
};
@@ -95,7 +95,7 @@ public:
class SbiSymDef { // general symbol entry
friend class SbiSymPool;
protected:
- String aName;
+ OUString aName;
SbxDataType eType;
SbiSymPool* pIn; // parent pool
SbiSymPool* pPool; // pool for sub-elements
@@ -119,21 +119,21 @@ protected:
sal_uInt16 nDefaultId; // Symbol number of default value
short nFixedStringLength; // String length in: Dim foo As String*Length
public:
- SbiSymDef( const String& );
+ SbiSymDef( const OUString& );
virtual ~SbiSymDef();
virtual SbiProcDef* GetProcDef();
virtual SbiConstDef* GetConstDef();
SbxDataType GetType() const { return eType; }
virtual void SetType( SbxDataType );
- const String& GetName();
+ const OUString& GetName();
SbiSymScope GetScope() const;
- sal_uInt16 GetProcId() const{ return nProcId; }
- sal_uInt32 GetAddr() const { return nChain; }
- sal_uInt16 GetId() const { return nId; }
- sal_uInt16 GetTypeId() const{ return nTypeId; }
+ sal_uInt16 GetProcId() const{ return nProcId; }
+ sal_uInt32 GetAddr() const { return nChain; }
+ sal_uInt16 GetId() const { return nId; }
+ sal_uInt16 GetTypeId() const{ return nTypeId; }
void SetTypeId( sal_uInt16 n ) { nTypeId = n; eType = SbxOBJECT; }
- sal_uInt16 GetPos() const { return nPos; }
+ sal_uInt16 GetPos() const { return nPos; }
void SetLen( short n ){ nLen = n; }
short GetLen() const { return nLen; }
void SetDims( short n ) { nDims = n; }
@@ -143,14 +143,13 @@ public:
void SetParamArray() { bParamArray = true; }
void SetWithEvents() { bWithEvents = true; }
void SetWithBrackets(){ bWithBrackets = true; }
- void SetByVal( bool bByVal_ = true )
- { bByVal = bByVal_; }
+ void SetByVal( bool bByVal_ = true ) { bByVal = bByVal_; }
void SetStatic( bool bAsStatic = true ) { bStatic = bAsStatic; }
void SetNew() { bNew = true; }
void SetDefinedAs() { bAs = true; }
void SetGlobal(bool b){ bGlobal = b; }
void SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
- sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
+ sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
bool IsOptional() const{ return bOpt; }
bool IsParamArray() const{ return bParamArray; }
bool IsWithEvents() const{ return bWithEvents; }
@@ -175,36 +174,36 @@ private:
class SbiProcDef : public SbiSymDef { // procedure definition (from basic):
SbiSymPool aParams;
SbiSymPool aLabels; // local jump targets
- String aLibName;
- String aAlias;
+ OUString aLibName;
+ OUString aAlias;
sal_uInt16 nLine1, nLine2; // line area
PropertyMode mePropMode; // Marks if this is a property procedure and which
- String maPropName; // Property name if property procedure (!= proc name)
+ OUString maPropName; // Property name if property procedure (!= proc name)
bool bCdecl : 1; // true: CDECL given
bool bPublic : 1; // true: proc is PUBLIC
bool mbProcDecl : 1; // true: instanciated by SbiParser::ProcDecl
public:
- SbiProcDef( SbiParser*, const String&, bool bProcDecl=false );
+ SbiProcDef( SbiParser*, const OUString&, bool bProcDecl=false );
virtual ~SbiProcDef();
virtual SbiProcDef* GetProcDef();
virtual void SetType( SbxDataType );
SbiSymPool& GetParams() { return aParams; }
SbiSymPool& GetLabels() { return aLabels; }
SbiSymPool& GetLocals() { return GetPool();}
- String& GetLib() { return aLibName; }
- String& GetAlias() { return aAlias; }
+ OUString& GetLib() { return aLibName; }
+ OUString& GetAlias() { return aAlias; }
void SetPublic( bool b ) { bPublic = b; }
bool IsPublic() const { return bPublic; }
void SetCdecl( bool b = true) { bCdecl = b; }
bool IsCdecl() const { return bCdecl; }
bool IsUsedForProcDecl() const { return mbProcDecl; }
- void SetLine1( sal_uInt16 n ) { nLine1 = n; }
- sal_uInt16 GetLine1() const { return nLine1; }
- void SetLine2( sal_uInt16 n ) { nLine2 = n; }
- sal_uInt16 GetLine2() const { return nLine2; }
+ void SetLine1( sal_uInt16 n ) { nLine1 = n; }
+ sal_uInt16 GetLine1() const { return nLine1; }
+ void SetLine2( sal_uInt16 n ) { nLine2 = n; }
+ sal_uInt16 GetLine2() const { return nLine2; }
PropertyMode getPropertyMode() { return mePropMode; }
void setPropertyMode( PropertyMode ePropMode );
- const String& GetPropName() { return maPropName; }
+ const OUString& GetPropName() { return maPropName; }
// Match with a forward-declaration. The parameter names are
// compared and the forward declaration is replaced by this
@@ -218,15 +217,15 @@ private:
class SbiConstDef : public SbiSymDef
{
double nVal;
- String aVal;
+ OUString aVal;
public:
- SbiConstDef( const String& );
+ SbiConstDef( const OUString& );
virtual ~SbiConstDef();
virtual SbiConstDef* GetConstDef();
void Set( double, SbxDataType );
- void Set( const String& );
+ void Set( const OUString& );
double GetValue() { return nVal; }
- const String& GetString() { return aVal; }
+ const OUString& GetString() { return aVal; }
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 21:28:53 +0000