diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-19 11:53:41 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-20 07:03:51 +0000 |
commit | baffe9bd291da266ea731afd8c801696d8575e17 (patch) | |
tree | 724154de78aef1dcc17dccbb353ee8f225d011e2 /include | |
parent | f4688de63ec5a6957a619e247b0d84118b9f6851 (diff) |
convert com::sun::star->css in include/basic
Change-Id: I40d092d1ae1391ce99d01a7e0c6cd0432a2696ca
Reviewed-on: https://gerrit.libreoffice.org/19457
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/basic/basicmanagerrepository.hxx | 4 | ||||
-rw-r--r-- | include/basic/basmgr.hxx | 25 | ||||
-rw-r--r-- | include/basic/modsizeexceeded.hxx | 28 | ||||
-rw-r--r-- | include/basic/sbmod.hxx | 6 | ||||
-rw-r--r-- | include/basic/sbstar.hxx | 6 | ||||
-rw-r--r-- | include/basic/sbuno.hxx | 8 | ||||
-rw-r--r-- | include/basic/sbxvar.hxx | 6 | ||||
-rw-r--r-- | include/basic/vbahelper.hxx | 6 |
8 files changed, 44 insertions, 45 deletions
diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx index 5c03991f09fb..60c9afec1561 100644 --- a/include/basic/basicmanagerrepository.hxx +++ b/include/basic/basicmanagerrepository.hxx @@ -51,7 +51,7 @@ namespace basic decide to add global variables to it, or otherwise initialize it. */ virtual void onBasicManagerCreated( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxForDocument, + const css::uno::Reference< css::frame::XModel >& _rxForDocument, BasicManager& _rBasicManager ) = 0; @@ -92,7 +92,7 @@ namespace basic as it's closed, the associated BasicManager is deleted. */ static BasicManager* getDocumentBasicManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocumentModel + const css::uno::Reference< css::frame::XModel >& _rxDocumentModel ); /** returns the application-wide BasicManager diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index 97a7e9916597..c8bbb2d35a07 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -27,7 +27,7 @@ #include <vector> // Basic XML Import/Export -BASIC_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::script::XStarBasicAccess > +BASIC_DLLPUBLIC css::uno::Reference< css::script::XStarBasicAccess > getStarBasicAccess( BasicManager* pMgr ); class SotStorage; @@ -76,8 +76,8 @@ protected: struct LibraryContainerInfo { - ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer > mxScriptCont; - ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer > mxDialogCont; + css::uno::Reference< css::script::XPersistentLibraryContainer > mxScriptCont; + css::uno::Reference< css::script::XPersistentLibraryContainer > mxDialogCont; OldBasicPassword* mpOldBasicPassword; LibraryContainerInfo() @@ -87,8 +87,8 @@ struct LibraryContainerInfo LibraryContainerInfo ( - com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer > xScriptCont, - com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer > xDialogCont, + css::uno::Reference< css::script::XPersistentLibraryContainer > xScriptCont, + css::uno::Reference< css::script::XPersistentLibraryContainer > xDialogCont, OldBasicPassword* pOldBasicPassword ) : mxScriptCont( xScriptCont ) @@ -167,9 +167,9 @@ public: */ void SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ); - const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >& + const css::uno::Reference< css::script::XPersistentLibraryContainer >& GetDialogLibraryContainer() const; - const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >& + const css::uno::Reference< css::script::XPersistentLibraryContainer >& GetScriptLibraryContainer() const; bool LoadLib( sal_uInt16 nLib ); @@ -185,17 +185,17 @@ public: If a constant with this name already existed before, its value is changed, and the old constant is returned. If it does not yet exist, it is newly created, and inserted into the basic library. */ - ::com::sun::star::uno::Any - SetGlobalUNOConstant( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rValue ); + css::uno::Any + SetGlobalUNOConstant( const sal_Char* _pAsciiName, const css::uno::Any& _rValue ); /** retrieves a global constant in the basic library, referring to some UNO object, returns true if a value is found ( value is in aOut ) false otherwise. */ - bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut ); + bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, css::uno::Any& aOut ); /** determines whether there are password-protected modules whose size exceedes the legacy module size @param _out_rModuleNames takes the names of modules whose size exceeds the legacy limit */ - bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& _out_rModuleNames ); + bool LegacyPsswdBinaryLimitExceeded( css::uno::Sequence< OUString >& _out_rModuleNames ); bool HasExeCode( const OUString& ); /// determines whether the Basic Manager has a given macro, given by fully qualified name bool HasMacro( OUString const& i_fullyQualifiedName ) const; @@ -213,8 +213,7 @@ private: BASIC_DLLPRIVATE bool HasLib( const OUString& rName ) const; BASIC_DLLPRIVATE StarBASIC* CreateLibForLibContainer( const OUString& rLibName, - const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >& - xScriptCont ); + const css::uno::Reference< css::script::XLibraryContainer >& xScriptCont ); // For XML import/export: BASIC_DLLPRIVATE StarBASIC* CreateLib( const OUString& rLibName ); BASIC_DLLPRIVATE StarBASIC* CreateLib( const OUString& rLibName, const OUString& Password, diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx index 8e511d24945e..1ddec377af8d 100644 --- a/include/basic/modsizeexceeded.hxx +++ b/include/basic/modsizeexceeded.hxx @@ -24,29 +24,29 @@ #include <cppuhelper/implbase1.hxx> #include <basic/basicdllapi.h> -class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< css::task::XInteractionRequest > { - // C++ interface - public: - ModuleSizeExceeded( const com::sun::star::uno::Sequence<OUString>& sModules ); +// C++ interface +public: + ModuleSizeExceeded( const css::uno::Sequence<OUString>& sModules ); bool isAbort() const; bool isApprove() const; - // UNO interface - public: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override { return m_lContinuations; } - com::sun::star::uno::Any SAL_CALL getRequest() throw( com::sun::star::uno::RuntimeException, std::exception ) override +// UNO interface +public: + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override { return m_lContinuations; } + css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override { return m_aRequest; } - // member - private: - com::sun::star::uno::Any m_aRequest; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_lContinuations; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > m_xAbort; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation> m_xApprove; +// member +private: + css::uno::Any m_aRequest; + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_lContinuations; + css::uno::Reference< css::task::XInteractionContinuation > m_xAbort; + css::uno::Reference< css::task::XInteractionContinuation> m_xApprove; }; #endif diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index a8a529768698..e68fd646dfce 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -60,7 +60,7 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject SbModule(const SbModule&) = delete; SbModule& operator=(const SbModule&) = delete; protected: - com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper; + css::uno::Reference< css::script::XInvocation > mxWrapper; OUString aOUSource; OUString aComment; SbiImage* pImage; // the Image @@ -129,8 +129,8 @@ public: bool isProxyModule() { return bIsProxyModule; } void AddVarName( const OUString& aName ); void RemoveVars(); - ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > GetUnoModule(); - bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); + css::uno::Reference< css::script::XInvocation > GetUnoModule(); + bool createCOMWrapperForIface( css::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); SbxArrayRef GetMethods() { return pMethods;} static OUString GetKeywordCase( const OUString& sKeyword ); diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 5232c5ee3959..2e924c074a68 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -105,7 +105,7 @@ public: // Compiler-Interface SbModule* MakeModule( const OUString& rName, const OUString& rSrc ); SbModule* MakeModule32( const OUString& rName, const OUString& rSrc ); - SbModule* MakeModule32( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, const OUString& rSrc ); + SbModule* MakeModule32( const OUString& rName, const css::script::ModuleInfo& mInfo, const OUString& rSrc ); static bool Compile( SbModule* ); static void Stop(); static void Error( SbError ); @@ -161,11 +161,11 @@ public: SbxObjectRef getRTL() { return pRtl; } bool IsDocBasic() { return bDocBasic; } SbxVariable* VBAFind( const OUString& rName, SbxClassType t ); - bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut ); + bool GetUNOConstant( const sal_Char* _pAsciiName, css::uno::Any& aOut ); void QuitAndExitApplication(); bool IsQuitApplication() { return bQuit; }; - static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + static css::uno::Reference< css::frame::XModel > GetModelFromBasic( SbxObject* pBasic ); static void DetachAllDocBasicItems(); diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx index 03fb8cac81b6..e0f485e2c3c8 100644 --- a/include/basic/sbuno.hxx +++ b/include/basic/sbuno.hxx @@ -30,16 +30,16 @@ 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 -BASIC_DLLPUBLIC SbxObjectRef GetSbUnoObject( const OUString& aName, const com::sun::star::uno::Any& aUnoObj_ ); +BASIC_DLLPUBLIC SbxObjectRef GetSbUnoObject( const OUString& aName, const css::uno::Any& aUnoObj_ ); // Force creation of all properties for debugging BASIC_DLLPUBLIC void createAllObjectProperties( SbxObject* pObj ); BASIC_DLLPUBLIC void SetSbUnoObjectDfltPropName( SbxObject* pObj ); -BASIC_DLLPUBLIC ::com::sun::star::uno::Any sbxToUnoValue( const SbxValue* pVar ); -BASIC_DLLPUBLIC ::com::sun::star::uno::Any sbxToUnoValue( const SbxValue* pVar, const ::com::sun::star::uno::Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL ); +BASIC_DLLPUBLIC css::uno::Any sbxToUnoValue( const SbxValue* pVar ); +BASIC_DLLPUBLIC css::uno::Any sbxToUnoValue( const SbxValue* pVar, const css::uno::Type& rType, css::beans::Property* pUnoProperty = NULL ); -BASIC_DLLPUBLIC void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue ); +BASIC_DLLPUBLIC void unoToSbxValue( SbxVariable* pVar, const css::uno::Any& aValue ); #endif diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index be35aeddebfc..c237be0930e6 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -175,9 +175,9 @@ public: bool PutNull(); // Special methods - bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ); + bool PutDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ); bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove - bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ) const; + bool fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const; bool PutCurrency( const sal_Int64& ); // Interface for CDbl in Basic static SbxError ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false ); @@ -330,7 +330,7 @@ public: const OUString& GetDeclareClassName(); void SetDeclareClassName( const OUString& ); - void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener, + void SetComListener( css::uno::Reference< css::uno::XInterface > xComListener, StarBASIC* pParentBasic ); void ClearComListener(); diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx index a4572fc96f30..d6773bb01831 100644 --- a/include/basic/vbahelper.hxx +++ b/include/basic/vbahelper.hxx @@ -48,7 +48,7 @@ namespace vba { Passing true will lock all controllers, passing false will unlock them. */ BASIC_DLLPUBLIC void lockControllersOfAllDocuments( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, bool bLockControllers ); @@ -69,7 +69,7 @@ BASIC_DLLPUBLIC void lockControllersOfAllDocuments( passing false will disable them. */ BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, bool bEnableWindows ); @@ -85,7 +85,7 @@ BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments( The new working directory. */ BASIC_DLLPUBLIC void registerCurrentDirectory( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, const OUString& rPath ); |