diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-26 17:14:48 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-26 18:01:51 +0200 |
commit | 1e83da9aedda51aaef7e105187ae9a6a385f15d3 (patch) | |
tree | 26f15cfd49b4124d9b523506c31fc46419ca6490 /basic | |
parent | 3a390f36e8931e50009438f992ed0e4cdb02cca4 (diff) |
some more namespace cleanup
Change-Id: Ib1e80d717f199db8f8ac4181d4377a86d88e3244
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/errobject.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 1 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 | ||||
-rw-r--r-- | basic/source/inc/runtime.hxx | 8 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/methods1.cxx | 3 |
6 files changed, 9 insertions, 9 deletions
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index f1c9b71e0dcb..7cfce56eff4a 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -173,7 +173,7 @@ void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const u } // SbxErrObject -SbxErrObject::SbxErrObject( const OUString& rName, const Any& rUnoObj ) +SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj ) : SbUnoObject( rName, rUnoObj ) , m_pErrObject( NULL ) { diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 7154e1ee47b9..09746adfe131 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -57,6 +57,7 @@ TYPEINIT1(StarBASIC,SbxObject) #define RTLNAME "@SBRTL" // i#i68894# using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; using com::sun::star::uno::UNO_QUERY; diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index a48bffca4ba9..28d10e290b01 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::reflection; using namespace com::sun::star::beans; using namespace com::sun::star::script; - +using namespace com::sun::star::uno; #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/awt/DialogProvider.hpp> diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index fd0911ad9ee4..0012debbc578 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -35,10 +35,6 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <unotools/localedatawrapper.hxx> -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::container; - class SbiInstance; // active StarBASIC process class SbiRuntime; // active StarBASIC procedure instance @@ -70,7 +66,7 @@ struct SbiForStack { // for/next stack: sal_Int32* pArrayCurIndices; sal_Int32* pArrayLowerBounds; sal_Int32* pArrayUpperBounds; - Reference< XEnumeration > xEnumeration; + css::uno::Reference< css::container::XEnumeration > xEnumeration; SbiForStack( void ) : pArrayCurIndices( NULL ) @@ -115,7 +111,7 @@ public: OUString sFullNameToBeChecked; WildCard* pWildCard; - Sequence< OUString > aDirSeq; + css::uno::Sequence< OUString > aDirSeq; SbiRTLData(); ~SbiRTLData(); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1e5fe154a866..9e1b3baa2656 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -57,6 +57,8 @@ using namespace comphelper; using namespace osl; using namespace com::sun::star; +using namespace com::sun::star::lang; +using namespace com::sun::star::uno; #include "date.hxx" #include "stdobj.hxx" diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index f9872b43616b..5847754cac22 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -55,9 +55,10 @@ #include <com/sun/star/sheet/XFunctionAccess.hpp> using namespace comphelper; +using namespace com::sun::star::i18n; +using namespace com::sun::star::lang; using namespace com::sun::star::sheet; using namespace com::sun::star::uno; -using namespace com::sun::star::i18n; void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL ); |