diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-27 14:20:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-28 09:22:34 +0200 |
| commit | 16246ed7b280f51a39a01ded24c0d7bd59d59365 (patch) | |
| tree | e506c24eeae16b384555f08818e0b62ba41e0285 /sc/inc | |
| parent | 5d3c37b99e8bfa9256f12015152439bf4e5ebbb4 (diff) | |
com::sun::star->css in sc
Change-Id: I7774890f46f9343e944e34db27af8bce3b1d0915
Diffstat (limited to 'sc/inc')
85 files changed, 4513 insertions, 4832 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index f7d3de4ba7ff..ebd1438f0d19 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { class ScMenuFloatingWindow; typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE; + css::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE; class ScAccessibleFilterMenu : public ScAccessibleContextBase, @@ -48,100 +48,97 @@ class ScAccessibleFilterMenu : { public: explicit ScAccessibleFilterMenu( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenu(); virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > + SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// XAccessibleContext virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) override; /// Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) override; /// XAccessibleSelection virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearAccessibleSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; /// XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; /// XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() + throw (css::uno::RuntimeException, std::exception) override; /// non-UNO methods @@ -154,10 +151,10 @@ protected: sal_Int32 getMenuItemCount() const; virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: bool isSelected() const; @@ -166,8 +163,8 @@ private: void updateStates(); private: - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > maMenuItems; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet; + ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > maMenuItems; + css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet; size_t mnMenuPos; VclPtr<ScMenuFloatingWindow> mpWindow; diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index 4758864be76e..3dd57799f1a8 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -29,7 +29,7 @@ class ScMenuFloatingWindow; typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE; + css::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE; class ScAccessibleFilterMenuItem : public ScAccessibleContextBase, @@ -37,50 +37,47 @@ class ScAccessibleFilterMenuItem : { public: explicit ScAccessibleFilterMenuItem( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, + ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenuItem(); /// XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// XAccessibleAction virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; /// XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; @@ -92,10 +89,10 @@ public: protected: virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: bool isSelected() const; @@ -103,7 +100,7 @@ private: void updateStateSet(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet; + css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet; VclPtr<ScMenuFloatingWindow> mpWindow; size_t mnMenuPos; diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index b010bc69dc49..b5149ea9788d 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -28,22 +28,22 @@ class ScAccessibleFilterTopWindow : public ScAccessibleFilterMenu { public: ScAccessibleFilterTopWindow( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - ScCheckListMenuWindow* pWin, const OUString& rName); + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, + ScCheckListMenuWindow* pWin, + const OUString& rName); virtual ~ScAccessibleFilterTopWindow(); // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Non-UNO Methods @@ -51,36 +51,35 @@ public: EDIT_SEARCH_BOX, LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN }; void setAccessibleChild( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible >& rAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& rAccessible, ChildControlType eType); private: /** The top menu part */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccMenu; /** Edit search box for searching field members */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccEditSearchBox; /** check list box for field member visibility */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccListBox; /** check box for toggling all field member's visibility. */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccToggleAll; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccSingleOnBtn; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccSingleOffBtn; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccOkBtn; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxAccCancelBtn; }; diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index 93c2b7e0ae54..162c011afc39 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -26,7 +26,7 @@ #include <set> /// Generic XAccessibleStateSet implementation. -class ScAccessibleStateSet : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleStateSet > +class ScAccessibleStateSet : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet > { public: ScAccessibleStateSet(); @@ -35,17 +35,17 @@ public: // XAccessibleStateSet virtual sal_Bool SAL_CALL isEmpty() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL contains(sal_Int16 nState) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL containsAll( - const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<sal_Int16>& aStateSet) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() + throw (css::uno::RuntimeException, std::exception) override; // Non-UNO Methods diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index 6cbe8b91d477..9cca48acbf58 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -30,10 +30,10 @@ private: public: ScAddInCfg(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; - com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) + css::uno::Sequence< css::uno::Any> + GetProperties(const css::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } using ConfigItem::GetNodeNames; diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index e2fc56ef3046..18174c4c09a4 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -85,13 +85,13 @@ private: OUString aUpperName; ///< for entering formulas OUString aUpperLocal; ///< for entering formulas OUString aDescription; - com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod> xFunction; - com::sun::star::uno::Any aObject; + css::uno::Reference< css::reflection::XIdlMethod> xFunction; + css::uno::Any aObject; long nArgCount; ScAddInArgDesc* pArgDescs; long nCallerPos; sal_uInt16 nCategory; - OString sHelpId; + OString sHelpId; mutable ::std::vector< LocalizedName > maCompNames; mutable bool bCompInitialized; @@ -99,9 +99,8 @@ public: ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, const OUString& rDesc, sal_uInt16 nCat, const OString&, - const com::sun::star::uno::Reference< - com::sun::star::reflection::XIdlMethod>& rFunc, - const com::sun::star::uno::Any& rO, + const css::uno::Reference< css::reflection::XIdlMethod>& rFunc, + const css::uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, long nCP ); ~ScUnoAddInFuncData(); @@ -110,9 +109,9 @@ public: const OUString& GetLocalName() const { return aLocalName; } const OUString& GetUpperName() const { return aUpperName; } const OUString& GetUpperLocal() const { return aUpperLocal; } - const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& GetFunction() const + const css::uno::Reference< css::reflection::XIdlMethod>& GetFunction() const { return xFunction; } - const com::sun::star::uno::Any& GetObject() const { return aObject; } + const css::uno::Any& GetObject() const { return aObject; } long GetArgumentCount() const { return nArgCount; } const ScAddInArgDesc* GetArguments() const { return pArgDescs; } long GetCallerPos() const { return nCallerPos; } @@ -123,8 +122,8 @@ public: const ::std::vector< LocalizedName >& GetCompNames() const; bool GetExcelName( LanguageType eDestLang, OUString& rRetExcelName ) const; - void SetFunction( const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rNewFunc, - const com::sun::star::uno::Any& rNewObj ); + void SetFunction( const css::uno::Reference< css::reflection::XIdlMethod>& rNewFunc, + const css::uno::Any& rNewObj ); void SetArguments( long nNewCount, const ScAddInArgDesc* pNewDescs ); void SetCallerPos( long nNewPos ); void SetCompNames( const ::std::vector< LocalizedName >& rNew ); @@ -142,10 +141,8 @@ private: void Initialize(); void ReadConfiguration(); - void ReadFromAddIn( const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& xInterface ); - void UpdateFromAddIn( const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& xInterface, + void ReadFromAddIn( const css::uno::Reference< css::uno::XInterface>& xInterface ); + void UpdateFromAddIn( const css::uno::Reference< css::uno::XInterface>& xInterface, const OUString& rServiceName ); void LoadComponent( const ScUnoAddInFuncData& rFuncData ); @@ -185,9 +182,9 @@ class ScUnoAddInCall { private: const ScUnoAddInFuncData* pFuncData; - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aArgs; - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xCaller; + css::uno::Sequence<css::uno::Any> aArgs; + css::uno::Sequence<css::uno::Any> aVarArg; + css::uno::Reference<css::uno::XInterface> xCaller; bool bValidCount; // result: sal_uInt16 nErrCode; @@ -195,10 +192,9 @@ private: double fValue; OUString aString; ScMatrixRef xMatrix; - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVarRes; + css::uno::Reference<css::sheet::XVolatileResult> xVarRes; - void ExecuteCallWithArgs( - com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rCallArgs); + void ExecuteCallWithArgs(css::uno::Sequence<css::uno::Any>& rCallArgs); public: // exact name @@ -207,17 +203,16 @@ public: ~ScUnoAddInCall(); bool NeedsCaller() const; - void SetCaller( const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& rInterface ); + void SetCaller( const css::uno::Reference<css::uno::XInterface>& rInterface ); void SetCallerFromObjectShell( SfxObjectShell* pSh ); bool ValidParamCount() { return bValidCount;} ScAddInArgumentType GetArgType( long nPos ); - void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); + void SetParam( long nPos, const css::uno::Any& rValue ); void ExecuteCall(); - void SetResult( const com::sun::star::uno::Any& rNewRes ); + void SetResult( const css::uno::Any& rNewRes ); sal_uInt16 GetErrCode() const { return nErrCode; } bool HasString() const { return bHasString; } @@ -226,7 +221,7 @@ public: double GetValue() const { return fValue; } const OUString& GetString() const { return aString; } ScMatrixRef GetMatrix() const { return xMatrix;} - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> + css::uno::Reference<css::sheet::XVolatileResult> GetVarRes() const { return xVarRes; } }; diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 71c21ffe295d..66a55f92355f 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -28,8 +28,8 @@ #include "address.hxx" class ScAddressConversionObj : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo >, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -48,53 +48,49 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 55b4c5b997f1..6919e180bf91 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -43,10 +43,10 @@ class ScAutoFormatObj; #define SC_AFMTOBJ_INVALID USHRT_MAX class ScAutoFormatsObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameContainer, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::lang::XServiceInfo > + css::container::XNameContainer, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo > { private: static ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); @@ -58,67 +58,67 @@ public: // XNameContainer 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, + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScAutoFormatObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XNamed, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo >, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::container::XNamed, + css::beans::XPropertySet, + css::lang::XUnoTunnel, + css::lang::XServiceInfo >, public SfxListener { private: @@ -138,88 +138,88 @@ public: void InitFormat( sal_uInt16 nNewIndex ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); }; class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo >, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -234,53 +234,49 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index edfc3b2894c9..d442bd56f8f7 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -33,18 +33,15 @@ #include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL +css::uno::Reference<css::uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory>& rSMgr ); -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL + const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); +css::uno::Reference<css::uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory>& rSMgr ); -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL + const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); +css::uno::Reference<css::uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory>& rSMgr ); + const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); // Calc document css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); @@ -75,9 +72,9 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_create const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); class ScSpreadsheetSettings : public cppu::WeakImplHelper< - com::sun::star::sheet::XGlobalSheetSettings, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo> + css::sheet::XGlobalSheetSettings, + css::beans::XPropertySet, + css::lang::XServiceInfo> { private: SfxItemPropertySet aPropSet; @@ -93,7 +90,7 @@ public: virtual ~ScSpreadsheetSettings(); static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XGlobalSheetSettings virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) override @@ -175,132 +172,127 @@ public: { setProperty("ReplaceCellsWarning", (bool)p1); } // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScRecentFunctionsObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XRecentFunctions, - com::sun::star::lang::XServiceInfo> + css::sheet::XRecentFunctions, + css::lang::XServiceInfo> { public: ScRecentFunctionsObj(); virtual ~ScRecentFunctionsObj(); // XRecentFunctions - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRecentFunctionIds( const ::com::sun::star::uno::Sequence< - sal_Int32 >& aRecentFunctionIds ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRecentFunctionIds( const css::uno::Sequence< sal_Int32 >& aRecentFunctionIds ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getMaxRecentFunctions() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScFunctionListObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XFunctionDescriptions, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XNameAccess, - com::sun::star::lang::XServiceInfo> + css::sheet::XFunctionDescriptions, + css::container::XEnumerationAccess, + css::container::XNameAccess, + css::lang::XServiceInfo> { public: ScFunctionListObj(); virtual ~ScFunctionListObj(); // XFunctionDescriptions - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getById( sal_Int32 nId ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 4620f3c7539a..8c014202af1b 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -124,13 +124,13 @@ class ScAppCfg : public ScAppOptions DECL_LINK_TYPED( MiscCommitHdl, ScLinkConfigItem&, void ); DECL_LINK_TYPED( CompatCommitHdl, ScLinkConfigItem&, void ); - static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetInputPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetRevisionPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetContentPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetSortListPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetMiscPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetCompatPropertyNames(); + static css::uno::Sequence<OUString> GetLayoutPropertyNames(); + static css::uno::Sequence<OUString> GetInputPropertyNames(); + static css::uno::Sequence<OUString> GetRevisionPropertyNames(); + static css::uno::Sequence<OUString> GetContentPropertyNames(); + static css::uno::Sequence<OUString> GetSortListPropertyNames(); + static css::uno::Sequence<OUString> GetMiscPropertyNames(); + static css::uno::Sequence<OUString> GetCompatPropertyNames(); public: ScAppCfg(); diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index afda84c55f14..f1a7d06ee181 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -53,7 +53,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) override; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 2d25408f2964..a1721ea85dca 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -122,8 +122,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; bool GetProtection() const { return bProtection; } bool SetProtection( bool bProtect); @@ -250,8 +250,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const EditTextObject* GetLeftArea() const { return pLeftArea; } const EditTextObject* GetCenterArea() const { return pCenterArea; } @@ -340,8 +340,8 @@ public: OUString& rText, const IntlWrapper* = 0 ) const override; - virtual bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rAny, sal_uInt8 nMemberId ) override; private: sal_uInt16 mnWidth; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index fd20a4459480..be3df6147ae0 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -126,15 +126,15 @@ typedef std::vector< css::uno::Reference< css::util::XModifyListener > > XModify class ScHelperFunctions { public: - static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct ); - static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine2& rStruct ); - static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder& rBorder ); - static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder2& rBorder ); - static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ); - static void FillBorderLine( com::sun::star::table::BorderLine2& rStruct, const ::editeng::SvxBorderLine* pLine ); - static void AssignTableBorderToAny( com::sun::star::uno::Any& rAny, + static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const css::table::BorderLine& rStruct ); + static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const css::table::BorderLine2& rStruct ); + static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const css::table::TableBorder& rBorder ); + static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const css::table::TableBorder2& rBorder ); + static void FillBorderLine( css::table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ); + static void FillBorderLine( css::table::BorderLine2& rStruct, const ::editeng::SvxBorderLine* pLine ); + static void AssignTableBorderToAny( css::uno::Any& rAny, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, bool bInvalidateHorVerDist = false ); - static void AssignTableBorder2ToAny( com::sun::star::uno::Any& rAny, + static void AssignTableBorder2ToAny( css::uno::Any& rAny, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, bool bInvalidateHorVerDist = false ); static void ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ); @@ -149,20 +149,20 @@ namespace ooo } } -class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet, - public com::sun::star::beans::XMultiPropertySet, - public com::sun::star::beans::XPropertyState, - public com::sun::star::sheet::XSheetOperation, - public com::sun::star::chart::XChartDataArray, - public com::sun::star::util::XIndent, - public com::sun::star::sheet::XCellRangesQuery, - public com::sun::star::sheet::XFormulaQuery, - public com::sun::star::util::XReplaceable, - public com::sun::star::util::XModifyBroadcaster, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XUnoTunnel, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::beans::XTolerantMultiPropertySet, +class SC_DLLPUBLIC ScCellRangesBase : public css::beans::XPropertySet, + public css::beans::XMultiPropertySet, + public css::beans::XPropertyState, + public css::sheet::XSheetOperation, + public css::chart::XChartDataArray, + public css::util::XIndent, + public css::sheet::XCellRangesQuery, + public css::sheet::XFormulaQuery, + public css::util::XReplaceable, + public css::util::XModifyBroadcaster, + public css::lang::XServiceInfo, + public css::lang::XUnoTunnel, + public css::lang::XTypeProvider, + public css::beans::XTolerantMultiPropertySet, public cppu::OWeakObject, public SfxListener { @@ -202,12 +202,11 @@ private: void ForgetMarkData(); void ForgetCurrentAttrs(); - com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> - QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare, + css::uno::Reference<css::sheet::XSheetCellRanges> + QueryDifferences_Impl(const css::table::CellAddress& aCompare, bool bColumnDiff); - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> - Find_Impl(const com::sun::star::uno::Reference< - com::sun::star::util::XSearchDescriptor>& xDesc, + css::uno::Reference<css::uno::XInterface> + Find_Impl(const css::uno::Reference<css::util::XSearchDescriptor>& xDesc, const ScAddress* pLastPos); protected: @@ -215,16 +214,16 @@ protected: // GetItemPropertyMap for derived classes must contain all entries, including base class virtual const SfxItemPropertyMap& GetItemPropertyMap(); - ::com::sun::star::beans::PropertyState GetOnePropertyState( + css::beans::PropertyState GetOnePropertyState( sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception); virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception); public: @@ -232,9 +231,8 @@ public: ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellRangesBase(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -257,250 +255,234 @@ public: bool IsCursorOnly() const { return bCursorOnly; } // XSheetOperation - virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) - throw(::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, + virtual double SAL_CALL computeFunction( css::sheet::GeneralFunction nFunction ) + throw(css::uno::Exception, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Sequence< css::uno::Any >& aValues ) + throw (css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL + getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; // XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL - setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL - getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL - getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL + setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Sequence< css::uno::Any >& aValues ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL + getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL + getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XIndent - virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL decrementIndent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL incrementIndent() throw(css::uno::RuntimeException, std::exception) override; // XChartData virtual void SAL_CALL addChartDataChangeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< + css::chart::XChartDataChangeEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getNotANumber() throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XChartDataArray - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< double > >& aData ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< - OUString >& aRowDescriptions ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< - OUString >& aColumnDescriptions ) - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) + throw(css::uno::RuntimeException, std::exception) override; // XCellRangesQuery - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryVisibleCells() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryEmptyCells() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryContentCells( sal_Int16 nContentFlags ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryFormulaCells( sal_Int32 nResultFlags ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryColumnDifferences( - const ::com::sun::star::table::CellAddress& aCompare ) - throw(::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& aCompare ) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryRowDifferences( - const ::com::sun::star::table::CellAddress& aCompare ) - throw(::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& aCompare ) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryIntersection( - const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, std::exception) override; // XFormulaQuery - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryDependents( sal_Bool bRecursive ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryPrecedents( sal_Bool bRecursive ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XSearchable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - findAll( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - findFirst( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - findNext( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xStartAt, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL + findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL + findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, + const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) override; // XReplaceable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL - createReplaceDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL + createReplaceDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) + throw(css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellRangesBase* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, - public com::sun::star::sheet::XSheetCellRangeContainer, - public com::sun::star::container::XNameContainer, - public com::sun::star::container::XEnumerationAccess + public css::sheet::XSheetCellRangeContainer, + public css::container::XNameContainer, + public css::container::XEnumerationAccess { private: struct Impl; @@ -512,118 +494,117 @@ public: ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellRangesObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; virtual void RefChanged() override; // XSheetCellRanges - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL + getCells() throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRangeAddressesAsString() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getRangeAddresses() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL + getRangeAddresses() throw(css::uno::RuntimeException, std::exception) override; // XSheetCellRangeContainer - virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, + virtual void SAL_CALL addRangeAddress( const css::table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& rRanges, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRangeAddress( const css::table::CellRangeAddress& rRange ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRangeAddresses( const css::uno::Sequence< + css::table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& rRanges ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRangeAddresses( const css::uno::Sequence< + css::table::CellRangeAddress >& rRanges ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XNameContainer 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, + const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, - public com::sun::star::sheet::XCellRangeAddressable, - public com::sun::star::sheet::XSheetCellRange, - public com::sun::star::sheet::XArrayFormulaRange, - public com::sun::star::sheet::XArrayFormulaTokens, - public com::sun::star::sheet::XCellRangeData, - public com::sun::star::sheet::XCellRangeFormula, - public com::sun::star::sheet::XMultipleOperation, - public com::sun::star::util::XMergeable, - public com::sun::star::sheet::XCellSeries, - public com::sun::star::table::XAutoFormattable, - public com::sun::star::util::XSortable, - public com::sun::star::sheet::XSheetFilterableEx, - public com::sun::star::sheet::XSubTotalCalculatable, - public com::sun::star::util::XImportable, - public com::sun::star::sheet::XCellFormatRangesSupplier, - public com::sun::star::sheet::XUniqueCellFormatRangesSupplier, - public com::sun::star::table::XColumnRowRange + public css::sheet::XCellRangeAddressable, + public css::sheet::XSheetCellRange, + public css::sheet::XArrayFormulaRange, + public css::sheet::XArrayFormulaTokens, + public css::sheet::XCellRangeData, + public css::sheet::XCellRangeFormula, + public css::sheet::XMultipleOperation, + public css::util::XMergeable, + public css::sheet::XCellSeries, + public css::table::XAutoFormattable, + public css::util::XSortable, + public css::sheet::XSheetFilterableEx, + public css::sheet::XSubTotalCalculatable, + public css::util::XImportable, + public css::sheet::XCellFormatRangesSupplier, + public css::sheet::XUniqueCellFormatRangesSupplier, + public css::table::XColumnRowRange { private: const SfxItemPropertySet* pRangePropSet; @@ -633,19 +614,19 @@ protected: const ScRange& GetRange() const { return aRange; } virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > + css::uno::Reference< css::table::XCell > GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); void SetArrayFormula_Impl( const OUString& rFormula, const OUString& rFormulaNmsp, @@ -657,184 +638,178 @@ public: virtual ~ScCellRangeObj(); // uses ObjectShell from document, if set (returns NULL otherwise) - static com::sun::star::uno::Reference<com::sun::star::table::XCellRange> + static css::uno::Reference<css::table::XCellRange> CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR ); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; virtual void RefChanged() override; // XCellRangeAddressable - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getRangeAddress() + throw(css::uno::RuntimeException, std::exception) override; // XSheetCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL + getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; // XArrayFormulaRange - virtual OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getArrayFormula() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setArrayFormula( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XArrayFormulaTokens - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getArrayTokens() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getArrayTokens() + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArrayTokens( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArrayTokens( const css::uno::Sequence< + css::sheet::FormulaToken >& aTokens ) + throw (css::uno::RuntimeException, std::exception) override; // XCellRangeData - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > > SAL_CALL getDataArray() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > >& aArray ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) + throw(css::uno::RuntimeException, std::exception) override; // XCellRangeFormula - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getFormulaArray() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< OUString > >& aArray ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormulaArray( const css::uno::Sequence< css::uno::Sequence< OUString > >& aArray ) + throw (css::uno::RuntimeException, std::exception) override; // XMultipleOperation virtual void SAL_CALL setTableOperation( - const ::com::sun::star::table::CellRangeAddress& aFormulaRange, - ::com::sun::star::sheet::TableOperationMode nMode, - const ::com::sun::star::table::CellAddress& aColumnCell, - const ::com::sun::star::table::CellAddress& aRowCell ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aFormulaRange, + css::sheet::TableOperationMode nMode, + const css::table::CellAddress& aColumnCell, + const css::table::CellAddress& aRowCell ) + throw(css::uno::RuntimeException, std::exception) override; // XMergeable - virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIsMerged() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL merge( sal_Bool bMerge ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsMerged() throw(css::uno::RuntimeException, std::exception) override; // XCellSeries - virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, - ::com::sun::star::sheet::FillMode nFillMode, - ::com::sun::star::sheet::FillDateMode nFillDateMode, + virtual void SAL_CALL fillSeries( css::sheet::FillDirection nFillDirection, + css::sheet::FillMode nFillMode, + css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL fillAuto( css::sheet::FillDirection nFillDirection, sal_Int32 nSourceCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XAutoFormattable virtual void SAL_CALL autoFormat( const OUString& aName ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - createSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + createSortDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL sort( const css::uno::Sequence< + css::beans::PropertyValue >& xDescriptor ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetFilterableEx - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL - createFilterDescriptorByObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSheetFilterable >& xObject ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL + createFilterDescriptorByObject( const css::uno::Reference< + css::sheet::XSheetFilterable >& xObject ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetFilterable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL + virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSheetFilterDescriptor >& xDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL filter( const css::uno::Reference< + css::sheet::XSheetFilterDescriptor >& xDescriptor ) + throw(css::uno::RuntimeException, std::exception) override; // XSubTotalCalculatable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL + virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL createSubTotalDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applySubTotals(const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSubTotalDescriptor >& xDescriptor, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL applySubTotals(const css::uno::Reference< css::sheet::XSubTotalDescriptor >& xDescriptor, sal_Bool bReplace) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSubTotals() throw(css::uno::RuntimeException, std::exception) override; // XImportable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createImportDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doImport( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw(css::uno::RuntimeException, std::exception) override; // XCellFormatRangesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override; // XUniqueCellFormatRangesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getUniqueCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getUniqueCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override; // XColumnRowRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL - getColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL - getRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL + getColumns() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableRows > SAL_CALL + getRows() throw(css::uno::RuntimeException, std::exception) override; // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::table::XCellRange > getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); // XPropertySet override due to Range-Properties - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; //! really derive cell from range? class SC_DLLPUBLIC ScCellObj : public ScCellRangeObj, - public com::sun::star::text::XText, - public com::sun::star::container::XEnumerationAccess, - public com::sun::star::table::XCell2, - public com::sun::star::sheet::XFormulaTokens, - public com::sun::star::sheet::XCellAddressable, - public com::sun::star::sheet::XSheetAnnotationAnchor, - public com::sun::star::text::XTextFieldsSupplier, - public com::sun::star::document::XActionLockable + public css::text::XText, + public css::container::XEnumerationAccess, + public css::table::XCell2, + public css::sheet::XFormulaTokens, + public css::sheet::XCellAddressable, + public css::sheet::XSheetAnnotationAnchor, + public css::text::XTextFieldsSupplier, + public css::document::XActionLockable { private: rtl::Reference<SvxUnoText> mxUnoText; @@ -848,18 +823,18 @@ private: void SetString_Impl(const OUString& rString, bool bInterpret, bool bEnglish); double GetValue_Impl() const; void SetValue_Impl(double fValue); - com::sun::star::table::CellContentType GetResultType_Impl(); + css::table::CellContentType GetResultType_Impl(); protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; public: static const SvxItemPropertySet* GetEditPropertySet(); @@ -868,9 +843,8 @@ public: ScCellObj(ScDocShell* pDocSh, const ScAddress& rP); virtual ~ScCellObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -885,138 +859,131 @@ public: void InputEnglishString( const OUString& rText ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent, + virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, + const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursorByRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XCell - virtual OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaResult( double nValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaString( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellContentType SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getError() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellContentType SAL_CALL getType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getError() throw(css::uno::RuntimeException, std::exception) override; // XFormulaTokens - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) + throw (css::uno::RuntimeException, std::exception) override; // XCellAddressable - virtual ::com::sun::star::table::CellAddress SAL_CALL getCellAddress() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getCellAddress() + throw(css::uno::RuntimeException, std::exception) override; // XSheetAnnotationAnchor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetAnnotation > SAL_CALL - getAnnotation() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL + getAnnotation() throw(css::uno::RuntimeException, std::exception) override; // XTextFieldsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL + getTextFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet override due to cell properties - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; }; class ScTableSheetObj : public ScCellRangeObj, - public com::sun::star::sheet::XSpreadsheet, - public com::sun::star::container::XNamed, - public com::sun::star::sheet::XSheetPageBreak, - public com::sun::star::sheet::XCellRangeMovement, - public com::sun::star::table::XTableChartsSupplier, - public com::sun::star::sheet::XDataPilotTablesSupplier, - public com::sun::star::sheet::XScenariosSupplier, - public com::sun::star::sheet::XSheetAnnotationsSupplier, - public com::sun::star::drawing::XDrawPageSupplier, - public com::sun::star::sheet::XPrintAreas, - public com::sun::star::sheet::XSheetLinkable, - public com::sun::star::sheet::XSheetAuditing, - public com::sun::star::sheet::XSheetOutline, - public com::sun::star::util::XProtectable, - public com::sun::star::sheet::XScenario, - public com::sun::star::sheet::XScenarioEnhanced, - public com::sun::star::sheet::XExternalSheetName, - public com::sun::star::document::XEventsSupplier + public css::sheet::XSpreadsheet, + public css::container::XNamed, + public css::sheet::XSheetPageBreak, + public css::sheet::XCellRangeMovement, + public css::table::XTableChartsSupplier, + public css::sheet::XDataPilotTablesSupplier, + public css::sheet::XScenariosSupplier, + public css::sheet::XSheetAnnotationsSupplier, + public css::drawing::XDrawPageSupplier, + public css::sheet::XPrintAreas, + public css::sheet::XSheetLinkable, + public css::sheet::XSheetAuditing, + public css::sheet::XSheetOutline, + public css::util::XProtectable, + public css::sheet::XScenario, + public css::sheet::XScenarioEnhanced, + public css::sheet::XExternalSheetName, + public css::document::XEventsSupplier { friend class ScTableSheetsObj; // for insertByName() @@ -1029,13 +996,13 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; public: @@ -1044,227 +1011,226 @@ public: void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XSpreadsheet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > - SAL_CALL createCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > SAL_CALL - createCursorByRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSheetCellRange >& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetCellCursor > + SAL_CALL createCursor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetCellCursor > SAL_CALL + createCursorByRange( const css::uno::Reference< + css::sheet::XSheetCellRange >& aRange ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL + getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; using ScCellRangeObj::getCellRangeByName; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XSheetPageBreak - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL - getColumnPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL - getRowPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL + getColumnPageBreaks() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL + getRowPageBreaks() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAllManualPageBreaks() throw(css::uno::RuntimeException, std::exception) override; // XCellRangeMovement - virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, - ::com::sun::star::sheet::CellInsertMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, - ::com::sun::star::sheet::CellDeleteMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, - const ::com::sun::star::table::CellRangeAddress& aSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, - const ::com::sun::star::table::CellRangeAddress& aSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertCells( const css::table::CellRangeAddress& aRange, + css::sheet::CellInsertMode nMode ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRange( const css::table::CellRangeAddress& aRange, + css::sheet::CellDeleteMode nMode ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveRange( const css::table::CellAddress& aDestination, + const css::table::CellRangeAddress& aSource ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL copyRange( const css::table::CellAddress& aDestination, + const css::table::CellRangeAddress& aSource ) + throw(css::uno::RuntimeException, std::exception) override; // XTableChartsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableCharts > SAL_CALL - getCharts() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableCharts > SAL_CALL + getCharts() throw(css::uno::RuntimeException, std::exception) override; // XDataPilotTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotTables > SAL_CALL - getDataPilotTables() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XDataPilotTables > SAL_CALL + getDataPilotTables() throw(css::uno::RuntimeException, std::exception) override; // XScenariosSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XScenarios > SAL_CALL - getScenarios() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XScenarios > SAL_CALL + getScenarios() throw(css::uno::RuntimeException, std::exception) override; // XSheetAnnotationsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetAnnotations > SAL_CALL - getAnnotations() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL + getAnnotations() throw(css::uno::RuntimeException, std::exception) override; // XDrawPageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getDrawPage() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL + getDrawPage() throw(css::uno::RuntimeException, std::exception) override; // XPrintAreas - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getPrintAreas() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintAreas( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aPrintAreas ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL + getPrintAreas() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPrintAreas( const css::uno::Sequence< + css::table::CellRangeAddress >& aPrintAreas ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleColumns() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getTitleColumns() + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitleColumns( - const ::com::sun::star::table::CellRangeAddress& aTitleColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintTitleRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aTitleColumns ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintTitleRows() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleRows() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getTitleRows() + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitleRows( - const ::com::sun::star::table::CellRangeAddress& aTitleRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aTitleRows ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetLinkable - virtual ::com::sun::star::sheet::SheetLinkMode SAL_CALL getLinkMode() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::sheet::SheetLinkMode SAL_CALL getLinkMode() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkMode( css::sheet::SheetLinkMode nLinkMode ) + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkUrl() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLinkUrl( const OUString& aLinkUrl ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkSheetName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLinkSheetName( const OUString& aLinkSheetName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL link( const OUString& aUrl, const OUString& aSheetName, const OUString& aFilterName, const OUString& aFilterOptions, - ::com::sun::star::sheet::SheetLinkMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::sheet::SheetLinkMode nMode ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetAuditing - virtual sal_Bool SAL_CALL hideDependents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hidePrecedents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showDependents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showPrecedents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showErrors( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showInvalid() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hideDependents( const css::table::CellAddress& aPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hidePrecedents( const css::table::CellAddress& aPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showDependents( const css::table::CellAddress& aPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showPrecedents( const css::table::CellAddress& aPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showErrors( const css::table::CellAddress& aPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showInvalid() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearArrows() throw(css::uno::RuntimeException, std::exception) override; // XSheetOutline - virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, - ::com::sun::star::table::TableOrientation nOrientation ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL group( const css::table::CellRangeAddress& aRange, + css::table::TableOrientation nOrientation ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, - ::com::sun::star::table::TableOrientation nOrientation ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL ungroup( const css::table::CellRangeAddress& aRange, + css::table::TableOrientation nOrientation ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL autoOutline( const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearOutline() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL hideDetail( const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL showDetail( const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL showLevel( sal_Int16 nLevel, - ::com::sun::star::table::TableOrientation nOrientation ) - throw(::com::sun::star::uno::RuntimeException, + css::table::TableOrientation nOrientation ) + throw(css::uno::RuntimeException, std::exception) override; // XProtectable virtual void SAL_CALL protect( const OUString& aPassword ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unprotect( const OUString& aPassword ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override; // XScenario - virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsScenario() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getScenarioComment() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setScenarioComment( const OUString& aScenarioComment ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRanges( const css::uno::Sequence< + css::table::CellRangeAddress >& aRanges ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL apply() throw(css::uno::RuntimeException, std::exception) override; // XScenarioEnhanced - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL + virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL getRanges( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XExternalSheetName virtual void SAL_CALL setExternalName( const OUString& aUrl, const OUString& aSheetName ) - throw (::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet override due to sheet properties - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - static ScTableSheetObj* getImplementation(const css::uno::Reference< com::sun::star::uno::XInterface>& rObj); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static ScTableSheetObj* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableColumnObj : public ScCellRangeObj, - public com::sun::star::container::XNamed + public css::container::XNamed { private: const SfxItemPropertySet* pColPropSet; @@ -1272,48 +1238,48 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; public: ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab); virtual ~ScTableColumnObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet override due to column properties - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableRowObj : public ScCellRangeObj @@ -1324,13 +1290,13 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - ::com::sun::star::uno::Any& ) - throw(::com::sun::star::uno::RuntimeException, + css::uno::Any& ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; public: @@ -1338,22 +1304,22 @@ public: virtual ~ScTableRowObj(); // XPropertySet override due to row properties - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScCellsObj : public cppu::WeakImplHelper< - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumerationAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1367,26 +1333,26 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScCellsEnumeration : public cppu::WeakImplHelper< - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumeration, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1407,25 +1373,25 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScCellFormatsObj : public cppu::WeakImplHelper< - com::sun::star::container::XIndexAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo >, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1442,33 +1408,33 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScCellFormatsEnumeration : public cppu::WeakImplHelper< - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumeration, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1490,27 +1456,27 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; typedef std::vector< ScRangeList > ScMyRangeLists; class ScUniqueCellFormatsObj : public cppu::WeakImplHelper< - com::sun::star::container::XIndexAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo >, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1528,33 +1494,33 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper< - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumeration, + css::lang::XServiceInfo >, public SfxListener { private: @@ -1569,19 +1535,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index f360005906b7..1ab54d9a48af 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -57,11 +57,11 @@ class ScDocument; // DataProvider class ScChart2DataProvider : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::data::XDataProvider, - ::com::sun::star::chart2::data::XSheetDataProvider, - ::com::sun::star::chart2::data::XRangeXMLConversion, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo>, + css::chart2::data::XDataProvider, + css::chart2::data::XSheetDataProvider, + css::chart2::data::XRangeXMLConversion, + css::beans::XPropertySet, + css::lang::XServiceInfo>, SfxListener { public: @@ -72,114 +72,109 @@ public: // XDataProvider virtual sal_Bool SAL_CALL createDataSourcePossible( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::chart2::data::XDataSource > SAL_CALL createDataSource( + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< + css::beans::PropertyValue > SAL_CALL detectArguments( + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( + virtual css::uno::Reference< + css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() + throw (css::uno::RuntimeException, std::exception) override; // XSheetDataProvider virtual sal_Bool SAL_CALL createDataSequenceByFormulaTokensPossible( - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByFormulaTokens( - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) - throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; + throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) - throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; + throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL + getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const ::com::sun::star::uno::Any& rValue) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener>& xListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + rServiceName) throw( css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; private: @@ -191,8 +186,8 @@ private: // DataSource class ScChart2DataSource : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::data::XDataSource, - ::com::sun::star::lang::XServiceInfo>, + css::chart2::data::XDataSource, + css::lang::XServiceInfo>, SfxListener { public: @@ -202,29 +197,29 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataSource - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL - getDataSequences() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< + css::chart2::data::XLabeledDataSequence > > SAL_CALL + getDataSequences() throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + rServiceName) throw( css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; // implementation - void AddLabeledSequence(const com::sun::star::uno::Reference < com::sun::star::chart2::data::XLabeledDataSequence >& xNew); + void AddLabeledSequence(const css::uno::Reference < css::chart2::data::XLabeledDataSequence >& xNew); private: ScDocument* m_pDocument; - typedef std::list < com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > LabeledList; + typedef std::list < css::uno::Reference< css::chart2::data::XLabeledDataSequence > > LabeledList; LabeledList m_aLabeledSequences; }; @@ -232,138 +227,134 @@ private: // DataSequence class ScChart2DataSequence : public ::cppu::WeakImplHelper< - ::com::sun::star::chart2::data::XDataSequence, - ::com::sun::star::chart2::data::XTextualDataSequence, - ::com::sun::star::chart2::data::XNumericalDataSequence, - com::sun::star::chart2::XTimeBased, - ::com::sun::star::util::XCloneable, - ::com::sun::star::util::XModifyBroadcaster, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo>, + css::chart2::data::XDataSequence, + css::chart2::data::XTextualDataSequence, + css::chart2::data::XNumericalDataSequence, + css::chart2::XTimeBased, + css::util::XCloneable, + css::util::XModifyBroadcaster, + css::beans::XPropertySet, + css::lang::XServiceInfo>, SfxListener, boost::noncopyable { public: explicit ScChart2DataSequence( ScDocument* pDoc, - const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider >& xDP, + const css::uno::Reference< css::chart2::data::XDataProvider >& xDP, ::std::vector<ScTokenRef>&& rTokens, bool bIncludeHiddenCells ); virtual ~ScChart2DataSequence(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataSequence - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL generateLabel(::com::sun::star::chart2::data::LabelOrigin nOrigin) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > + SAL_CALL generateLabel(css::chart2::data::LabelOrigin nOrigin) + throw (css::uno::RuntimeException, std::exception) override; /** Get the number format key for the n-th data entry * If nIndex == -1, then you will get the number format key for the first non-empty entry */ virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; // XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; // XTimeBased - virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::beans::XPropertySetInfo> SAL_CALL + getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const ::com::sun::star::uno::Any& rValue) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener>& xListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener>& rListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() + throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + rServiceName) throw( css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::RuntimeException, std::exception) override; private: void setDataChangedHint(bool b); @@ -443,12 +434,12 @@ private: * numerical and textural data series if they turn out to be bottlenecks * under certain scenarios. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache; + css::uno::Sequence< css::uno::Any > m_aMixedDataCache; - ::com::sun::star::uno::Sequence<sal_Int32> m_aHiddenValues; + css::uno::Sequence<sal_Int32> m_aHiddenValues; // properties - ::com::sun::star::chart2::data::DataSequenceRole m_aRole; + css::chart2::data::DataSequenceRole m_aRole; bool m_bIncludeHiddenCells; // internals @@ -460,7 +451,7 @@ private: std::vector<ScTokenRef> m_aTokens; RangeIndexMapPtr m_pRangeIndices; ExtRefListenerPtr m_pExtRefListener; - com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; + css::uno::Reference < css::chart2::data::XDataProvider > m_xDataProvider; SfxItemPropertySet m_aPropSet; std::unique_ptr<HiddenRangeListener> m_pHiddenListener; diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index e51e9f02a35c..2b77c03e78e9 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -40,11 +40,11 @@ public: static sal_uInt16 DoUpdateAllCharts( ScDocument* pDoc ); static void AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab ); static void UpdateChartsOnDestinationPage( ScDocument* pDestDoc, const SCTAB nDestTab ); - static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartFromSdrObject( SdrObject* pObject ); - static void GetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, - ::com::sun::star::uno::Sequence< OUString >& rRanges ); - static void SetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, - const ::com::sun::star::uno::Sequence< OUString >& rRanges ); + static css::uno::Reference< css::chart2::XChartDocument > GetChartFromSdrObject( SdrObject* pObject ); + static void GetChartRanges( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc, + css::uno::Sequence< OUString >& rRanges ); + static void SetChartRanges( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc, + const css::uno::Sequence< OUString >& rRanges ); static void AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrObject* pObject ); static void FillProtectedChartRangesVector( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrPage* pPage ); diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 56a368fa5dbb..64ff7c7258be 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -83,10 +83,10 @@ public: const OUString& GetName() const { return maName;} - void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, - const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); - com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; - com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; + void SetUno( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& rListener, + const css::uno::Reference< css::chart::XChartData >& rSource ); + css::uno::Reference< css::chart::XChartDataChangeEventListener > GetUnoListener() const; + css::uno::Reference< css::chart::XChartData > GetUnoSource() const; bool IsUno() const { return (pUnoData != NULL); } @@ -179,8 +179,8 @@ public: bool bDirty = false ); // use FreeUnused only the way it's used in ScDocument::UpdateChartListenerCollection void FreeUnused(); - void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, - const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); + void FreeUno( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& rListener, + const css::uno::Reference< css::chart::XChartData >& rSource ); void StartTimer(); void UpdateDirtyCharts(); void SetDirty(); diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index e7680397568e..e679e2c965cd 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -37,12 +37,10 @@ public: ScChartLockGuard( ScDocument* pDoc ); virtual ~ScChartLockGuard(); - void AlsoLockThisChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + void AlsoLockThisChart( const css::uno::Reference< css::frame::XModel >& xModel ); private: - std::vector< ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XModel > > maChartModels; + std::vector< css::uno::WeakReference< css::frame::XModel > > maChartModels; ScChartLockGuard( const ScChartLockGuard& ) = delete; }; @@ -58,8 +56,7 @@ public: void StartOrContinueLocking(); void StopLocking(); - void AlsoLockThisChart( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xModel ); + void AlsoLockThisChart( const css::uno::Reference< css::frame::XModel >& xModel ); private: ScDocument* mpDoc; diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index dccf365d6b34..77e1bd053a36 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -40,10 +40,10 @@ class ScDocShell; class ScChartObj; class ScChartsObj : public cppu::WeakImplHelper< - com::sun::star::table::XTableCharts, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo >, + css::table::XTableCharts, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -61,55 +61,54 @@ public: // XTableCharts virtual void SAL_CALL addNewByName( const OUString& aName, - const ::com::sun::star::awt::Rectangle& aRect, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aRanges, + const css::awt::Rectangle& aRect, + const css::uno::Sequence< css::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::table::XTableChart, - ::com::sun::star::document::XEmbeddedObjectSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo > ScChartObj_Base; + css::table::XTableChart, + css::document::XEmbeddedObjectSupplier, + css::container::XNamed, + css::lang::XServiceInfo > ScChartObj_Base; typedef ::comphelper::OPropertyContainer ScChartObj_PBase; typedef ::comphelper::OPropertyArrayUsageHelper< ScChartObj > ScChartObj_PABase; @@ -131,11 +130,11 @@ private: protected: // ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -156,41 +155,40 @@ public: virtual void SAL_CALL disposing() override; // XTableChart - virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHasRowHeaders() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getRanges( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aRanges ) - throw(::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL + getRanges( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRanges( const css::uno::Sequence< css::table::CellRangeAddress >& aRanges ) + throw(css::uno::RuntimeException, std::exception) override; // XEmbeddedObjectSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL - getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL + getEmbeddedObject() throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index bb91165613f9..da827c8556df 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -876,7 +876,7 @@ class ScChangeTrack : public utl::ConfigurationListener static const SCROW nContentRowsPerSlot; static const SCSIZE nContentSlots; - com::sun::star::uno::Sequence< sal_Int8 > aProtectPass; + css::uno::Sequence< sal_Int8 > aProtectPass; ScChangeActionMap aMap; ScChangeActionMap aGeneratedMap; ScChangeActionMap aPasteCutMap; @@ -1184,9 +1184,9 @@ public: void SetActionMax(sal_uLong nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import - void SetProtection( const com::sun::star::uno::Sequence< sal_Int8 >& rPass ) + void SetProtection( const css::uno::Sequence< sal_Int8 >& rPass ) { aProtectPass = rPass; } - com::sun::star::uno::Sequence< sal_Int8 > GetProtection() const + css::uno::Sequence< sal_Int8 > GetProtection() const { return aProtectPass; } bool IsProtected() const { return aProtectPass.getLength() != 0; } diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 56cfe5971549..ca335593b7f2 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -216,7 +216,7 @@ public: const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, bool bFromRangeName ) const = 0; - virtual ::com::sun::star::i18n::ParseResult + virtual css::i18n::ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, const CharClass* pCharClass) const = 0; @@ -229,8 +229,7 @@ public: */ virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const ::com::sun::star::uno::Sequence< - com::sun::star::sheet::ExternalLinkInfo>* pExternalLinks ) const = 0; + const css::uno::Sequence< css::sheet::ExternalLinkInfo>* pExternalLinks ) const = 0; virtual OUString makeExternalNameStr( sal_uInt16 nFileId, const OUString& rFile, const OUString& rName ) const = 0; @@ -288,7 +287,7 @@ private: SvNumberFormatter* mpFormatter; // For CONV_XL_OOX, may be set via API by MOOXML filter. - com::sun::star::uno::Sequence<com::sun::star::sheet::ExternalLinkInfo> maExternalLinks; + css::uno::Sequence<css::sheet::ExternalLinkInfo> maExternalLinks; sal_Unicode cSymbol[MAXSTRLEN]; // current Symbol OUString aFormula; // formula source code @@ -418,8 +417,8 @@ public: /// Set external link info for ScAddress::CONV_XL_OOX. void SetExternalLinks( - const ::com::sun::star::uno::Sequence< - com::sun::star::sheet::ExternalLinkInfo>& rLinks ) + const css::uno::Sequence< + css::sheet::ExternalLinkInfo>& rLinks ) { maExternalLinks = rLinks; } @@ -460,7 +459,7 @@ private: virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const override; virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const override; virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, formula::FormulaGrammar::Grammar _eGrammar ) const override; - virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const override; + virtual void fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const override; virtual bool HandleExternalReference(const formula::FormulaToken& _aToken) override; virtual bool HandleRange() override; diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index 7a80b0291d0c..8cf6175bd9ee 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -29,8 +29,8 @@ class ScDocShell; class ScDocumentConfiguration : public cppu::WeakImplHelper< - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo>, + css::beans::XPropertySet, + css::lang::XServiceInfo>, public SfxListener { private: @@ -45,53 +45,49 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx index 7ea3212cd734..897479b8a244 100644 --- a/sc/inc/convuno.hxx +++ b/sc/inc/convuno.hxx @@ -31,49 +31,49 @@ class ScUnoConversion { public: - static LanguageType GetLanguage( const com::sun::star::lang::Locale& rLocale ); - static void FillLocale( com::sun::star::lang::Locale& rLocale, LanguageType eLang ); + static LanguageType GetLanguage( const css::lang::Locale& rLocale ); + static void FillLocale( css::lang::Locale& rLocale, LanguageType eLang ); // CellAddress -> ScAddress static inline void FillScAddress( ScAddress& rScAddress, - const ::com::sun::star::table::CellAddress& rApiAddress ); + const css::table::CellAddress& rApiAddress ); // ScAddress -> CellAddress static inline void FillApiAddress( - ::com::sun::star::table::CellAddress& rApiAddress, + css::table::CellAddress& rApiAddress, const ScAddress& rScAddress ); // CellRangeAddress -> ScRange static inline void FillScRange( ScRange& rScRange, - const ::com::sun::star::table::CellRangeAddress& rApiRange ); + const css::table::CellRangeAddress& rApiRange ); // ScRange -> CellRangeAddress static inline void FillApiRange( - ::com::sun::star::table::CellRangeAddress& rApiRange, + css::table::CellRangeAddress& rApiRange, const ScRange& rScRange ); // CellRangeAddress-Start -> CellAddress static inline void FillApiStartAddress( - ::com::sun::star::table::CellAddress& rApiAddress, - const ::com::sun::star::table::CellRangeAddress& rApiRange ); + css::table::CellAddress& rApiAddress, + const css::table::CellRangeAddress& rApiRange ); /** Returns true, if the passed ranges have at least one common cell. */ static inline bool Intersects( - const ::com::sun::star::table::CellRangeAddress& rApiARange1, - const ::com::sun::star::table::CellRangeAddress& rApiARange2 ); + const css::table::CellRangeAddress& rApiARange1, + const css::table::CellRangeAddress& rApiARange2 ); /** Returns true, if the passed range rApiInner is completely inside the passed range rApiOuter. */ static inline bool Contains( - const ::com::sun::star::table::CellRangeAddress& rApiOuter, - const ::com::sun::star::table::CellRangeAddress& rApiInner ); + const css::table::CellRangeAddress& rApiOuter, + const css::table::CellRangeAddress& rApiInner ); }; inline void ScUnoConversion::FillScAddress( ScAddress& rScAddress, - const ::com::sun::star::table::CellAddress& rApiAddress ) + const css::table::CellAddress& rApiAddress ) { rScAddress.Set( (SCCOL)rApiAddress.Column, (SCROW)rApiAddress.Row, (SCTAB)rApiAddress.Sheet ); } inline void ScUnoConversion::FillApiAddress( - ::com::sun::star::table::CellAddress& rApiAddress, + css::table::CellAddress& rApiAddress, const ScAddress& rScAddress ) { rApiAddress.Column = rScAddress.Col(); @@ -83,14 +83,14 @@ inline void ScUnoConversion::FillApiAddress( inline void ScUnoConversion::FillScRange( ScRange& rScRange, - const ::com::sun::star::table::CellRangeAddress& rApiRange ) + const css::table::CellRangeAddress& rApiRange ) { rScRange.aStart.Set( (SCCOL)rApiRange.StartColumn, (SCROW)rApiRange.StartRow, (SCTAB)rApiRange.Sheet ); rScRange.aEnd.Set( (SCCOL)rApiRange.EndColumn, (SCROW)rApiRange.EndRow, (SCTAB)rApiRange.Sheet ); } inline void ScUnoConversion::FillApiRange( - ::com::sun::star::table::CellRangeAddress& rApiRange, + css::table::CellRangeAddress& rApiRange, const ScRange& rScRange ) { rApiRange.StartColumn = rScRange.aStart.Col(); @@ -101,8 +101,8 @@ inline void ScUnoConversion::FillApiRange( } inline void ScUnoConversion::FillApiStartAddress( - ::com::sun::star::table::CellAddress& rApiAddress, - const ::com::sun::star::table::CellRangeAddress& rApiRange ) + css::table::CellAddress& rApiAddress, + const css::table::CellRangeAddress& rApiRange ) { rApiAddress.Column = rApiRange.StartColumn; rApiAddress.Row = rApiRange.StartRow; @@ -110,8 +110,8 @@ inline void ScUnoConversion::FillApiStartAddress( } inline bool ScUnoConversion::Intersects( - const ::com::sun::star::table::CellRangeAddress& rApiRange1, - const ::com::sun::star::table::CellRangeAddress& rApiRange2 ) + const css::table::CellRangeAddress& rApiRange1, + const css::table::CellRangeAddress& rApiRange2 ) { return (rApiRange1.Sheet == rApiRange2.Sheet) && (::std::max( rApiRange1.StartColumn, rApiRange2.StartColumn ) <= ::std::min( rApiRange1.EndColumn, rApiRange2.EndColumn )) && @@ -119,8 +119,8 @@ inline bool ScUnoConversion::Intersects( } inline bool ScUnoConversion::Contains( - const ::com::sun::star::table::CellRangeAddress& rApiOuter, - const ::com::sun::star::table::CellRangeAddress& rApiInner ) + const css::table::CellRangeAddress& rApiOuter, + const css::table::CellRangeAddress& rApiInner ) { return (rApiOuter.Sheet == rApiInner.Sheet) && (rApiOuter.StartColumn <= rApiInner.StartColumn) && (rApiInner.EndColumn <= rApiOuter.EndColumn) && @@ -128,8 +128,8 @@ inline bool ScUnoConversion::Contains( } inline bool operator==( - const ::com::sun::star::table::CellAddress& rApiAddress1, - const ::com::sun::star::table::CellAddress& rApiAddress2 ) + const css::table::CellAddress& rApiAddress1, + const css::table::CellAddress& rApiAddress2 ) { return (rApiAddress1.Column == rApiAddress2.Column) && @@ -138,8 +138,8 @@ inline bool operator==( } inline bool operator==( - const ::com::sun::star::table::CellRangeAddress& rApiRange1, - const ::com::sun::star::table::CellRangeAddress& rApiRange2 ) + const css::table::CellRangeAddress& rApiRange1, + const css::table::CellRangeAddress& rApiRange2 ) { return (rApiRange1.StartColumn == rApiRange2.StartColumn) && @@ -150,8 +150,8 @@ inline bool operator==( } inline bool operator!=( - const ::com::sun::star::table::CellRangeAddress& rApiRange1, - const ::com::sun::star::table::CellRangeAddress& rApiRange2 ) + const css::table::CellRangeAddress& rApiRange1, + const css::table::CellRangeAddress& rApiRange2 ) { return !(rApiRange1 == rApiRange2); } diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index 2a2fbe0ea838..b75717521bd5 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -26,77 +26,77 @@ #include <com/sun/star/sheet/XUsedAreaCursor.hpp> class ScCellCursorObj : public ScCellRangeObj, - public com::sun::star::sheet::XSheetCellCursor, - public com::sun::star::sheet::XUsedAreaCursor, - public com::sun::star::table::XCellCursor + public css::sheet::XSheetCellCursor, + public css::sheet::XUsedAreaCursor, + public css::table::XCellCursor { public: ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR); virtual ~ScCellCursorObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XSheetCellCursor - virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL collapseToCurrentRegion() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapseToCurrentArray() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL collapseToMergedArea() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL expandToEntireColumns() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL expandToEntireRows() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XUsedAreaCursor virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XCellCursor - virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStart() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoNext() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoPrevious() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XSheetCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL + getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; using ScCellRangeObj::getCellRangeByName; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 2e63d3c365a5..bc0ec6105977 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -70,20 +70,20 @@ class ScDataPilotItemObj; class ScDataPilotConversion { public: - static com::sun::star::sheet::GeneralFunction FirstFunc( sal_uInt16 nBits ); - static sal_uInt16 FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); + static css::sheet::GeneralFunction FirstFunc( sal_uInt16 nBits ); + static sal_uInt16 FunctionBit( css::sheet::GeneralFunction eFunc ); static void FillGroupInfo( - ::com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo, + css::sheet::DataPilotFieldGroupInfo& rInfo, const ScDPNumGroupInfo& rGroupInfo ); }; /** DataPilotTables collection per sheet. */ class ScDataPilotTablesObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XDataPilotTables, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo>, + css::sheet::XDataPilotTables, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo>, public SfxListener { private: @@ -100,59 +100,58 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataPilotTables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > SAL_CALL - createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XDataPilotDescriptor > SAL_CALL + createDataPilotDescriptor() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertNewByName( const OUString& aName, - const ::com::sun::star::table::CellAddress& aOutputAddress, - const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor ) - throw(::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& aOutputAddress, + const css::uno::Reference< css::sheet::XDataPilotDescriptor >& xDescriptor ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // ScDataPilotDescriptorBase is never instantiated directly -class ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor, - public com::sun::star::beans::XPropertySet, - public com::sun::star::sheet::XDataPilotDataLayoutFieldSupplier, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XUnoTunnel, - public com::sun::star::lang::XTypeProvider, +class ScDataPilotDescriptorBase : public css::sheet::XDataPilotDescriptor, + public css::beans::XPropertySet, + public css::sheet::XDataPilotDataLayoutFieldSupplier, + public css::lang::XServiceInfo, + public css::lang::XUnoTunnel, + public css::lang::XTypeProvider, public cppu::OWeakObject, public SfxListener { @@ -164,9 +163,9 @@ public: ScDataPilotDescriptorBase(ScDocShell* pDocSh); virtual ~ScDataPilotDescriptorBase(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -181,86 +180,82 @@ public: // XDataPilotDescriptor // getName, setName, getTag, setTag in derived classes - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getSourceRange() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourceRange( const ::com::sun::star::table::CellRangeAddress& aSourceRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getDataPilotFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getColumnFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getRowFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getPageFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getDataFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getHiddenFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getSourceRange() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceRange( const css::table::CellRangeAddress& aSourceRange ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL + getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getDataPilotFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getColumnFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getRowFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getPageFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getDataFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getHiddenFields() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XDataPilotDataLayoutFieldSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + virtual css::uno::Reference< css::sheet::XDataPilotField > SAL_CALL getDataLayoutField() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XDataPilotDescriptor>& rObj); // XTypeProvider (override in ScDataPilotTableObj) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo is in derived classes }; @@ -278,25 +273,25 @@ public: virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTag( const OUString& aTag ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScDataPilotTableObj : public ScDataPilotDescriptorBase, - public com::sun::star::sheet::XDataPilotTable2, - public com::sun::star::util::XModifyBroadcaster + public css::sheet::XDataPilotTable2, + public css::util::XModifyBroadcaster { private: SCTAB nTab; @@ -309,9 +304,8 @@ public: ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN); virtual ~ScDataPilotTableObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -321,56 +315,54 @@ public: virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTag( const OUString& aTag ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XDataPilotTable - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRange() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getOutputRange() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; // XDataPilotTable2 - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > - SAL_CALL getDrillDownData(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > + SAL_CALL getDrillDownData(const css::table::CellAddress& aAddr) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::sheet::DataPilotTablePositionData - SAL_CALL getPositionData(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::sheet::DataPilotTablePositionData + SAL_CALL getPositionData(const css::table::CellAddress& aAddr) + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertDrillDownSheet(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertDrillDownSheet(const css::table::CellAddress& aAddr) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider (override) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; struct ScFieldIdentifier @@ -406,7 +398,7 @@ protected: /** Returns the number of members for the field described by maFieldId. */ sal_Int32 GetMemberCount() const; /** Returns the collection of members for the field described by maFieldId. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > GetMembers() const; ScDocShell* GetDocShell() const; @@ -420,10 +412,10 @@ private: typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::container::XNameAccess, + css::lang::XServiceInfo > ScDataPilotFieldsObjImpl; @@ -436,59 +428,59 @@ public: explicit ScDataPilotFieldsObj( ScDataPilotDescriptorBase& rParent, - ::com::sun::star::sheet::DataPilotFieldOrientation eOrient ); + css::sheet::DataPilotFieldOrientation eOrient ); virtual ~ScDataPilotFieldsObj(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; ScDataPilotFieldObj* GetObjectByName_Impl( const OUString& rName ) const; private: - ::com::sun::star::uno::Any maOrient; /// Field orientation, no value = all fields. + css::uno::Any maOrient; /// Field orientation, no value = all fields. }; typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XNamed, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::sheet::XDataPilotField, - ::com::sun::star::sheet::XDataPilotFieldGrouping, - ::com::sun::star::lang::XServiceInfo + css::container::XNamed, + css::beans::XPropertySet, + css::sheet::XDataPilotField, + css::sheet::XDataPilotFieldGrouping, + css::lang::XServiceInfo > ScDataPilotFieldObjImpl; @@ -503,118 +495,113 @@ public: ScDataPilotFieldObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rIdent, - const ::com::sun::star::uno::Any& rOrient ); + const css::uno::Any& rOrient ); virtual ~ScDataPilotFieldObj(); // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& aName) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XDatePilotField - virtual com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> SAL_CALL - getItems() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL + getItems() throw (css::uno::RuntimeException, std::exception) override; // only called from property-functions: - com::sun::star::sheet::DataPilotFieldOrientation getOrientation() const; - void setOrientation(com::sun::star::sheet::DataPilotFieldOrientation Orientation); - com::sun::star::sheet::GeneralFunction getFunction() const; - void setFunction(com::sun::star::sheet::GeneralFunction Function); - com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction > getSubtotals() const; - void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); + css::sheet::DataPilotFieldOrientation getOrientation() const; + void setOrientation(css::sheet::DataPilotFieldOrientation Orientation); + css::sheet::GeneralFunction getFunction() const; + void setFunction(css::sheet::GeneralFunction Function); + css::uno::Sequence< css::sheet::GeneralFunction > getSubtotals() const; + void setSubtotals(const css::uno::Sequence< css::sheet::GeneralFunction >& rFunctions); static OUString getCurrentPage(); void setCurrentPage(const OUString& sPage); void setUseCurrentPage(bool bUse); - const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo(); - void setAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo* pInfo); - const com::sun::star::sheet::DataPilotFieldLayoutInfo* getLayoutInfo(); - void setLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo* pInfo); - const com::sun::star::sheet::DataPilotFieldReference* getReference(); - void setReference(const com::sun::star::sheet::DataPilotFieldReference* pInfo); - const com::sun::star::sheet::DataPilotFieldSortInfo* getSortInfo(); - void setSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo* pInfo); + const css::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo(); + void setAutoShowInfo(const css::sheet::DataPilotFieldAutoShowInfo* pInfo); + const css::sheet::DataPilotFieldLayoutInfo* getLayoutInfo(); + void setLayoutInfo(const css::sheet::DataPilotFieldLayoutInfo* pInfo); + const css::sheet::DataPilotFieldReference* getReference(); + void setReference(const css::sheet::DataPilotFieldReference* pInfo); + const css::sheet::DataPilotFieldSortInfo* getSortInfo(); + void setSortInfo(const css::sheet::DataPilotFieldSortInfo* pInfo); bool getShowEmpty() const; void setShowEmpty(bool bShow); bool getRepeatItemLabels() const; void setRepeatItemLabels(bool bShow); bool hasGroupInfo(); - com::sun::star::sheet::DataPilotFieldGroupInfo getGroupInfo(); - void setGroupInfo(const com::sun::star::sheet::DataPilotFieldGroupInfo* pInfo); + css::sheet::DataPilotFieldGroupInfo getGroupInfo(); + void setGroupInfo(const css::sheet::DataPilotFieldGroupInfo* pInfo); // XDataPilotFieldGrouping - static bool HasString(const com::sun::star::uno::Sequence< OUString >& aItems, const OUString& aString); - virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL - createNameGroup(const com::sun::star::uno::Sequence< OUString >& aItems) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, + static bool HasString(const css::uno::Sequence< OUString >& aItems, const OUString& aString); + virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL + createNameGroup(const css::uno::Sequence< OUString >& aItems) + throw (css::uno::RuntimeException, + css::lang::IllegalArgumentException, std::exception) override; - virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL - createDateGroup(const com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, + virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL + createDateGroup(const css::sheet::DataPilotFieldGroupInfo& rInfo) + throw (css::uno::RuntimeException, + css::lang::IllegalArgumentException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > + css::uno::Reference< css::container::XIndexAccess > mxItems; SfxItemPropertySet maPropSet; - ::com::sun::star::uno::Any maOrient; + css::uno::Any maOrient; }; typedef ::std::vector< OUString > ScFieldGroupMembers; @@ -629,10 +616,10 @@ typedef ::std::vector< ScFieldGroup > ScFieldGroups; typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XNameContainer, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XNameContainer, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo > ScDataPilotFieldGroupsObjImpl; @@ -649,62 +636,62 @@ public: virtual ~ScDataPilotFieldGroupsObj(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameContainer 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, std::exception) override; + const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // implementation - ScFieldGroup& getFieldGroup( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException); - void renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(::com::sun::star::uno::RuntimeException); + ScFieldGroup& getFieldGroup( const OUString& rName ) throw(css::uno::RuntimeException); + void renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(css::uno::RuntimeException); private: ScFieldGroups::iterator implFindByName( const OUString& rName ); @@ -715,11 +702,11 @@ private: typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XNameContainer, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo + css::container::XNameContainer, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::container::XNamed, + css::lang::XServiceInfo > ScDataPilotFieldGroupObjImpl; @@ -730,63 +717,63 @@ public: virtual ~ScDataPilotFieldGroupObj(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameContainer 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, std::exception) override; + const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldGroupsObj& mrParent; @@ -795,8 +782,8 @@ private: typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo + css::container::XNamed, + css::lang::XServiceInfo > ScDataPilotFieldGroupItemObjImpl; @@ -807,17 +794,17 @@ public: virtual ~ScDataPilotFieldGroupItemObj(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldGroupObj& mrParent; @@ -826,10 +813,10 @@ private: typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::container::XNameAccess, + css::lang::XServiceInfo > ScDataPilotItemsObjImpl; @@ -840,38 +827,38 @@ public: virtual ~ScDataPilotItemsObj(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; @@ -879,9 +866,9 @@ private: typedef ::cppu::WeakImplHelper < - ::com::sun::star::container::XNamed, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo + css::container::XNamed, + css::beans::XPropertySet, + css::lang::XServiceInfo > ScDataPilotItemObjImpl; @@ -896,60 +883,56 @@ public: virtual ~ScDataPilotItemObj(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: SfxItemPropertySet maPropSet; diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 5090969f8613..388b546cd4ac 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -62,7 +62,7 @@ typedef std::vector< css::uno::Reference< css::util::XRefreshListener > > XDBRef class ScDataUnoConversion { public: - static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); + static css::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); }; // ImportDescriptor is not available as Uno-Objekt any longer, only Property-Sequence @@ -72,9 +72,9 @@ class ScImportDescriptor public: static void FillImportParam( ScImportParam& rParam, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq ); + const css::uno::Sequence<css::beans::PropertyValue>& rSeq ); static void FillProperties( - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, + css::uno::Sequence<css::beans::PropertyValue>& rSeq, const ScImportParam& rParam ); static long GetPropertyCount() { return 4; } }; @@ -86,9 +86,9 @@ class ScSortDescriptor public: static void FillSortParam( ScSortParam& rParam, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq ); + const css::uno::Sequence<css::beans::PropertyValue>& rSeq ); static void FillProperties( - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, + css::uno::Sequence<css::beans::PropertyValue>& rSeq, const ScSortParam& rParam ); //! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus static long GetPropertyCount() @@ -103,12 +103,12 @@ public: // to uno, both look the same class ScSubTotalDescriptorBase : public cppu::WeakImplHelper< - com::sun::star::sheet::XSubTotalDescriptor, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo > + css::sheet::XSubTotalDescriptor, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::beans::XPropertySet, + css::lang::XUnoTunnel, + css::lang::XServiceInfo > { private: SfxItemPropertySet aPropSet; @@ -125,84 +125,78 @@ public: virtual void PutData( const ScSubTotalParam& rParam ) = 0; // XSubTotalDescriptor - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns, + virtual void SAL_CALL addNew( const css::uno::Sequence< css::sheet::SubTotalColumn >& aSubTotalColumns, sal_Int32 nGroupColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScSubTotalDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XSubTotalDescriptor>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // ScSubTotalDescriptor - dummy container to use with XImportTarget @@ -241,12 +235,12 @@ public: }; class ScSubTotalFieldObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XSubTotalField, - com::sun::star::lang::XServiceInfo > + css::sheet::XSubTotalField, + css::lang::XServiceInfo > { private: - com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor> xRef; - ScSubTotalDescriptorBase& rParent; + css::uno::Reference<css::sheet::XSubTotalDescriptor> xRef; + ScSubTotalDescriptorBase& rParent; sal_uInt16 nPos; public: @@ -254,27 +248,27 @@ public: virtual ~ScSubTotalFieldObj(); // XSubTotalField - virtual sal_Int32 SAL_CALL getGroupColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGroupColumn() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn > SAL_CALL - getSubTotalColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::SubTotalColumn > SAL_CALL + getSubTotalColumns() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSubTotalColumns( const css::uno::Sequence< + css::sheet::SubTotalColumn >& aSubTotalColumns ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScConsolidationDescriptor : public cppu::WeakImplHelper< - com::sun::star::sheet::XConsolidationDescriptor, - com::sun::star::lang::XServiceInfo > + css::sheet::XConsolidationDescriptor, + css::lang::XServiceInfo > { private: ScConsolidateParam aParam; @@ -287,37 +281,36 @@ public: const ScConsolidateParam& GetParam() const { return aParam; } // XConsolidationDescriptor - virtual ::com::sun::star::sheet::GeneralFunction SAL_CALL getFunction() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getSources( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aSources ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellAddress SAL_CALL getStartOutputPosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::sheet::GeneralFunction SAL_CALL getFunction() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFunction( css::sheet::GeneralFunction nFunction ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL + getSources( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSources( const css::uno::Sequence< css::table::CellRangeAddress >& aSources ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getStartOutputPosition() + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStartOutputPosition( - const ::com::sun::star::table::CellAddress& aStartOutputPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellAddress& aStartOutputPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseRowHeaders() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getInsertLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getInsertLinks() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // ScFilterDescriptorBase - base class for FilterDescriptor @@ -326,11 +319,11 @@ public: // to uno, all three look the same class ScFilterDescriptorBase : public cppu::WeakImplHelper< - com::sun::star::sheet::XSheetFilterDescriptor, - com::sun::star::sheet::XSheetFilterDescriptor2, - com::sun::star::sheet::XSheetFilterDescriptor3, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo >, + css::sheet::XSheetFilterDescriptor, + css::sheet::XSheetFilterDescriptor2, + css::sheet::XSheetFilterDescriptor3, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -349,74 +342,74 @@ public: virtual void PutData( const ScQueryParam& rParam ) = 0; // XSheetFilterDescriptor - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField > SAL_CALL - getFilterFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::TableFilterField >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::TableFilterField > SAL_CALL + getFilterFields() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFilterFields( const css::uno::Sequence< + css::sheet::TableFilterField >& aFilterFields ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetFilterDescriptor2 - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 > SAL_CALL - getFilterFields2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::TableFilterField2 >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::TableFilterField2 > SAL_CALL + getFilterFields2() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFilterFields2( const css::uno::Sequence< + css::sheet::TableFilterField2 >& aFilterFields ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetFilterDescriptor3 - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField3 > SAL_CALL - getFilterFields3() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilterFields3( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::TableFilterField3 >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::TableFilterField3 > SAL_CALL + getFilterFields3() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFilterFields3( const css::uno::Sequence< + css::sheet::TableFilterField3 >& aFilterFields ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // ScFilterDescriptor - dummy container to use with XFilterable @@ -472,12 +465,12 @@ public: }; class ScDatabaseRangeObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XDatabaseRange, - com::sun::star::util::XRefreshable, - com::sun::star::container::XNamed, - com::sun::star::sheet::XCellRangeReferrer, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo >, + css::sheet::XDatabaseRange, + css::util::XRefreshable, + css::container::XNamed, + css::sheet::XCellRangeReferrer, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -506,92 +499,92 @@ public: void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XDatabaseRange - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL - getSubTotalDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getImportDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getDataArea() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getSortDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL + getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL + getSubTotalDescriptor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getImportDescriptor() throw(css::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< + css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< + css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; // XCellRangeReferrer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL + getReferredCells() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScDatabaseRangesObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XDatabaseRanges, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo >, + css::sheet::XDatabaseRanges, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -608,48 +601,48 @@ public: // XDatabaseRanges virtual void SAL_CALL addNewByName( const OUString& aName, - const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XUnnamedDatabaseRanges>, + css::sheet::XUnnamedDatabaseRanges>, public SfxListener { private: @@ -662,16 +655,16 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XUnnamedDatabaseRanges - virtual void SAL_CALL setByTable( const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) - throw(::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::container::NoSuchElementException, std::exception ) override; + virtual void SAL_CALL setByTable( const css::table::CellRangeAddress& aRange ) + throw(css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) + throw(css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, + css::container::NoSuchElementException, std::exception ) override; virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; }; #endif diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index eeb1e169c396..fc0dfd303dc0 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -43,8 +43,8 @@ public: StrData(); }; static void PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, - const ::com::sun::star::uno::Reference< - ::com::sun::star::sdbc::XRow>& xRow, long nRowPos, + const css::uno::Reference< css::sdbc::XRow>& xRow, + long nRowPos, long nType, bool bCurrency, StrData* pStrData = NULL ); }; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 949d40070d96..db992ac8542e 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -65,7 +65,7 @@ private: class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { private: - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; public: @@ -73,7 +73,7 @@ public: void SetOptions( const ScDefaultsOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 10d9e7a44f17..07bfbfaadb34 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -30,9 +30,9 @@ class ScDocShell; class ScDocDefaultsObj : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::lang::XServiceInfo >, + css::beans::XPropertySet, + css::beans::XPropertyState, + css::lang::XServiceInfo >, public SfxListener { private: @@ -48,72 +48,67 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< - OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 288a5f0f5ce1..8d934f941a5c 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -35,25 +35,21 @@ class ScTabViewShell; typedef std::vector< css::uno::Reference< css::frame::XStatusListener > > XStatusListenerArr_Impl; class ScDispatchProviderInterceptor : public cppu::WeakImplHelper< - com::sun::star::frame::XDispatchProviderInterceptor, - com::sun::star::lang::XEventListener>, + css::frame::XDispatchProviderInterceptor, + css::lang::XEventListener>, public SfxListener { ScTabViewShell* pViewShell; /// the component which's dispatches we're intercepting - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted; + css::uno::Reference< css::frame::XDispatchProviderInterception> m_xIntercepted; /// chaining - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; + css::uno::Reference< css::frame::XDispatchProvider> m_xSlaveDispatcher; + css::uno::Reference< css::frame::XDispatchProvider> m_xMasterDispatcher; /// own dispatch - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch> m_xMyDispatch; + css::uno::Reference< css::frame::XDispatch> m_xMyDispatch; public: @@ -63,37 +59,35 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL + queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > > SAL_CALL - queryDispatches( const ::com::sun::star::uno::Sequence< - ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL + queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) + throw(css::uno::RuntimeException, std::exception) override; /// XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + getSlaveDispatchProvider() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< + css::frame::XDispatchProvider >& xNewDispatchProvider ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + getMasterDispatchProvider() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< + css::frame::XDispatchProvider >& xNewSupplier ) + throw(css::uno::RuntimeException, std::exception) override; /// XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException, std::exception) override; }; class ScDispatch : public cppu::WeakImplHelper< - com::sun::star::frame::XDispatch, - com::sun::star::view::XSelectionChangeListener >, + css::frame::XDispatch, + css::view::XSelectionChangeListener >, public SfxListener { ScTabViewShell* pViewShell; @@ -109,28 +103,25 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aArgs ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& xControl, - const ::com::sun::star::util::URL& aURL ) - throw(::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL dispatch( const css::util::URL& aURL, + const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, + const css::util::URL& aURL ) + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& xControl, - const ::com::sun::star::util::URL& aURL ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, + const css::util::URL& aURL ) + throw(css::uno::RuntimeException, std::exception) override; /// XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; /// XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index d8ff78517c40..8ab144d83e40 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -175,8 +175,8 @@ class ScDocCfg : public ScDocOptions DECL_LINK_TYPED( CalcCommitHdl, ScLinkConfigItem&, void ); DECL_LINK_TYPED( LayoutCommitHdl, ScLinkConfigItem&, void ); - static com::sun::star::uno::Sequence<OUString> GetCalcPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + static css::uno::Sequence<OUString> GetCalcPropertyNames(); + static css::uno::Sequence<OUString> GetLayoutPropertyNames(); public: ScDocCfg(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5f2406d497a4..db0f6d2d81a1 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -371,7 +371,7 @@ private: Idle aTrackIdle; - com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > + css::uno::Reference< css::script::vba::XVBAEventProcessor > mxVbaEvents; public: boost::ptr_vector< ScInterpreterTableOpParams > aTableOpList; // list of ScInterpreterTableOpParams currently in use @@ -398,10 +398,10 @@ private: sal_uInt16 nMacroInterpretLevel; // >0 if macro in interpreter sal_uInt16 nInterpreterTableOpLevel; // >0 if in interpreter TableOp sal_uInt16 nSrcVer; // file version (load/save) - SCROW nSrcMaxRow; // number of lines to load/save + SCROW nSrcMaxRow; // number of lines to load/save sal_uInt16 nFormulaTrackCount; - HardRecalcState eHardRecalcState; // off, temporary, eternal - SCTAB nVisibleTab; // for OLE etc., don't use inside ScDocument + HardRecalcState eHardRecalcState; // off, temporary, eternal + SCTAB nVisibleTab; // for OLE etc., don't use inside ScDocument ScLkUpdMode eLinkMode; @@ -588,7 +588,7 @@ public: SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); bool HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); + css::uno::Reference< css::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); void SetChartRanges( const OUString& rChartName, const std::vector< ScRangeList >& rRanges ); @@ -600,8 +600,8 @@ public: bool bColHeaders, bool bRowHeaders, bool bAdd ); void GetOldChartParameters( const OUString& rName, ScRangeList& rRanges, bool& rColHeaders, bool& rRowHeaders ); - ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XEmbeddedObject > + css::uno::Reference< + css::embed::XEmbeddedObject > FindOleObjectByName( const OUString& rName ); SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); @@ -1429,7 +1429,7 @@ public: const std::vector<sal_uInt32>& rIndex ) const; const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const; - SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); + SC_DLLPUBLIC const css::uno::Reference< css::i18n::XBreakIterator >& GetBreakIterator(); bool HasStringWeakCharacters( const OUString& rString ); SC_DLLPUBLIC SvtScriptType GetStringScriptType( const OUString& rString ); SC_DLLPUBLIC SvtScriptType GetCellScriptType( const ScAddress& rPos, sal_uLong nNumberFormat ); @@ -1610,8 +1610,8 @@ public: SC_DLLPUBLIC void SetColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual); void RemoveRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual); void RemoveColBreak(SCCOL nCol, SCTAB nTab, bool bPage, bool bManual); - ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const; + css::uno::Sequence< + css::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const; SC_DLLPUBLIC bool RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const; SC_DLLPUBLIC bool HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const; @@ -2063,9 +2063,9 @@ public: void AddUnoObject( SfxListener& rObject ); void RemoveUnoObject( SfxListener& rObject ); void BroadcastUno( const SfxHint &rHint ); - void AddUnoListenerCall( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& rListener, - const ::com::sun::star::lang::EventObject& rEvent ); + void AddUnoListenerCall( const css::uno::Reference< + css::util::XModifyListener >& rListener, + const css::lang::EventObject& rEvent ); void SetInLinkUpdate(bool bSet); // TableLink or AreaLink bool IsInLinkUpdate() const; // including DdeLink @@ -2091,9 +2091,9 @@ public: void SC_DLLPUBLIC GetSortParam( ScSortParam& rParam, SCTAB nTab ); void SC_DLLPUBLIC SetSortParam( ScSortParam& rParam, SCTAB nTab ); - inline void SetVbaEventProcessor( const com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor >& rxVbaEvents ) + inline void SetVbaEventProcessor( const css::uno::Reference< css::script::vba::XVBAEventProcessor >& rxVbaEvents ) { mxVbaEvents = rxVbaEvents; } - inline com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > + inline css::uno::Reference< css::script::vba::XVBAEventProcessor > GetVbaEventProcessor() const { return mxVbaEvents; } /** Should only be GRAM_PODF or GRAM_ODFF. */ diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 92cf89fa339e..3ee6e61e58ef 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -69,44 +69,44 @@ class ScSheetSaveData; class SC_DLLPUBLIC ScModelObj : public SfxBaseModel, public vcl::ITiledRenderable, - public com::sun::star::sheet::XSpreadsheetDocument, - public com::sun::star::document::XActionLockable, - public com::sun::star::sheet::XCalculatable, - public com::sun::star::util::XProtectable, - public com::sun::star::drawing::XDrawPagesSupplier, - public com::sun::star::sheet::XGoalSeek, - public com::sun::star::sheet::XConsolidatable, - public com::sun::star::sheet::XDocumentAuditing, - public com::sun::star::style::XStyleFamiliesSupplier, - public com::sun::star::view::XRenderable, - public com::sun::star::document::XLinkTargetSupplier, - public com::sun::star::beans::XPropertySet, + public css::sheet::XSpreadsheetDocument, + public css::document::XActionLockable, + public css::sheet::XCalculatable, + public css::util::XProtectable, + public css::drawing::XDrawPagesSupplier, + public css::sheet::XGoalSeek, + public css::sheet::XConsolidatable, + public css::sheet::XDocumentAuditing, + public css::style::XStyleFamiliesSupplier, + public css::view::XRenderable, + public css::document::XLinkTargetSupplier, + public css::beans::XPropertySet, public SvxUnoDrawMSFactory, ///< derived from XMultiServiceFactory - public com::sun::star::lang::XServiceInfo, - public ::com::sun::star::util::XChangesNotifier, - public com::sun::star::sheet::opencl::XOpenCLSelection + public css::lang::XServiceInfo, + public css::util::XChangesNotifier, + public css::sheet::opencl::XOpenCLSelection { private: SfxItemPropertySet aPropSet; ScDocShell* pDocShell; ScPrintFuncCache* pPrintFuncCache; ScPrintUIOptions* pPrinterOptions; - com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> xNumberAgg; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawGradTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawHatchTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawBitmapTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawTrGradTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawMarkerTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawDashTab; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xChartDataProv; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xObjProvider; + css::uno::Reference<css::uno::XAggregation> xNumberAgg; + css::uno::Reference<css::uno::XInterface> xDrawGradTab; + css::uno::Reference<css::uno::XInterface> xDrawHatchTab; + css::uno::Reference<css::uno::XInterface> xDrawBitmapTab; + css::uno::Reference<css::uno::XInterface> xDrawTrGradTab; + css::uno::Reference<css::uno::XInterface> xDrawMarkerTab; + css::uno::Reference<css::uno::XInterface> xDrawDashTab; + css::uno::Reference<css::uno::XInterface> xChartDataProv; + css::uno::Reference<css::uno::XInterface> xObjProvider; ::cppu::OInterfaceContainerHelper maChangesListeners; - bool FillRenderMarkData( const com::sun::star::uno::Any& aSelection, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions, + bool FillRenderMarkData( const css::uno::Any& aSelection, + const css::uno::Sequence< css::beans::PropertyValue >& rOptions, ScMarkData& rMark, ScPrintSelectionStatus& rStatus, OUString& rPagesStr ) const; - com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter(); + css::uno::Reference<css::uno::XAggregation> GetFormatter(); void HandleCalculateEvents(); css::uno::Reference<css::uno::XInterface> create( @@ -139,231 +139,217 @@ public: bool HasChangesListeners() const; void NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProperties = - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >() ); + const css::uno::Sequence< css::beans::PropertyValue >& rProperties = + css::uno::Sequence< css::beans::PropertyValue >() ); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSpreadsheetDocument - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheets > SAL_CALL - getSheets() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XSpreadsheets > SAL_CALL + getSheets() throw(css::uno::RuntimeException, std::exception) override; /// XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getStyleFamilies() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getStyleFamilies() throw(css::uno::RuntimeException, std::exception) override; /// XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, + const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, + const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, + const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; /// XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getLinks() throw(css::uno::RuntimeException, std::exception) override; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) override; /// XCalculatable - virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL calculate() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL calculateAll() throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XProtectable virtual void SAL_CALL protect( const OUString& aPassword ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unprotect( const OUString& aPassword ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override; /// XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL - getDrawPages() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL + getDrawPages() throw(css::uno::RuntimeException, std::exception) override; /// XGoalSeek - virtual ::com::sun::star::sheet::GoalResult SAL_CALL seekGoal( - const ::com::sun::star::table::CellAddress& aFormulaPosition, - const ::com::sun::star::table::CellAddress& aVariablePosition, + virtual css::sheet::GoalResult SAL_CALL seekGoal( + const css::table::CellAddress& aFormulaPosition, + const css::table::CellAddress& aVariablePosition, const OUString& aGoalValue ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// XConsolidatable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XConsolidationDescriptor > + virtual css::uno::Reference< css::sheet::XConsolidationDescriptor > SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL consolidate( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XConsolidationDescriptor >& xDescriptor ) - throw (::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL consolidate( const css::uno::Reference< css::sheet::XConsolidationDescriptor >& xDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; /// XDocumentAuditing - virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshArrows() throw(css::uno::RuntimeException, std::exception) override; /// XViewDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData( ) + throw (css::uno::RuntimeException, std::exception) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw(::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + throw(css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& Arguments ) - throw(::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) + throw(css::uno::Exception, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() + throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; /// XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScModelObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); /// XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; /// XChangesNotifier - virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XChangesListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XChangesListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // XOpenCLSelection virtual sal_Bool SAL_CALL isOpenCLEnabled() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disableAutomaticDeviceSelection() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getPlatformID() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getDeviceID() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< com::sun::star::sheet::opencl::OpenCLPlatform > + virtual css::uno::Sequence< css::sheet::opencl::OpenCLPlatform > SAL_CALL getOpenCLPlatforms() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableOpcodeSubsetTest() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disableOpcodeSubsetTest() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isOpcodeSubsetTested() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// @see vcl::ITiledRenderable::paintTile(). virtual void paintTile( VirtualDevice& rDevice, @@ -421,14 +407,14 @@ public: }; class ScDrawPagesObj : public cppu::WeakImplHelper< - com::sun::star::drawing::XDrawPages, - com::sun::star::lang::XServiceInfo>, + css::drawing::XDrawPages, + css::lang::XServiceInfo>, public SfxListener { private: ScDocShell* pDocShell; -::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > +css::uno::Reference< css::drawing::XDrawPage > GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: @@ -438,40 +424,39 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xPage ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableSheetsObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XSpreadsheets2, - com::sun::star::sheet::XCellRangesAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo>, + css::sheet::XSpreadsheets2, + css::sheet::XCellRangesAccess, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo>, public SfxListener { private: @@ -488,100 +473,99 @@ public: /// XSpreadsheets virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL copyByName( const OUString& aName, const OUString& aCopy, sal_Int16 nDestination ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; /// XSpreadsheets2 virtual sal_Int32 SAL_CALL importSheet( - const ::com::sun::star::uno::Reference < - ::com::sun::star::sheet::XSpreadsheetDocument > & xDocSrc, + const css::uno::Reference< css::sheet::XSpreadsheetDocument > & xDocSrc, const OUString& srcName, sal_Int32 nDestPosition) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; /// XCellRangesAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > > + virtual css::uno::Sequence < css::uno::Reference< css::table::XCellRange > > SAL_CALL getCellRangesByName( const OUString& aRange ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; /// XNameContainer 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableColumnsObj : public cppu::WeakImplHelper< - com::sun::star::table::XTableColumns, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XNameAccess, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo>, + css::table::XTableColumns, + css::container::XEnumerationAccess, + css::container::XNameAccess, + css::beans::XPropertySet, + css::lang::XServiceInfo>, public SfxListener { private: @@ -602,92 +586,88 @@ public: /// XTableColumns virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableRowsObj : public cppu::WeakImplHelper< - com::sun::star::table::XTableRows, - com::sun::star::container::XEnumerationAccess, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo>, + css::table::XTableRows, + css::container::XEnumerationAccess, + css::beans::XPropertySet, + css::lang::XServiceInfo>, public SfxListener { private: @@ -707,80 +687,75 @@ public: /// XTableRows virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper< - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo>, + css::beans::XPropertySet, + css::lang::XServiceInfo>, public SfxListener { private: @@ -792,59 +767,54 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScAnnotationsObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XSheetAnnotations, - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo>, + css::sheet::XSheetAnnotations, + css::container::XEnumerationAccess, + css::lang::XServiceInfo>, public SfxListener { private: @@ -861,44 +831,44 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSheetAnnotations - virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, + virtual void SAL_CALL insertNew( const css::table::CellAddress& aPosition, const OUString& aText ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScScenariosObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XScenarios, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo>, + css::sheet::XScenarios, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo>, public SfxListener { private: @@ -917,46 +887,45 @@ public: /// XScenarios virtual void SAL_CALL addNewByName( const OUString& aName, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::table::CellRangeAddress >& aRanges, + const css::uno::Sequence< css::table::CellRangeAddress >& aRanges, const OUString& aComment ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index 799c8c34b110..ebddcfe6e85f 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -142,7 +142,7 @@ public: /** * Return a group type identifier. The values correspond with - * com::sun::star::sheet::DataPilotFieldGroupBy constant values. + * css::sheet::DataPilotFieldGroupBy constant values. * * @param nDim 0-based dimension index. * diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index c3b9ff263309..6ed9a5167e15 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -137,7 +137,7 @@ public: result to rTabData. This method is used, for example, to generate a drill-down data table. */ void filterTable(const std::vector<Criterion>& rCriteria, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTabData, + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rTabData, const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims); static SCROW getOrder(long nDim, SCROW nIndex); diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 7c8548d770c2..a19caebcec26 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -166,7 +166,7 @@ public: virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) override; virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rData) override; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; virtual const ScDPFilteredCache& GetCacheTable() const override; virtual void ReloadCacheTable() override; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index dd0a3c973962..178c74253136 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -94,7 +94,7 @@ private: ScDPServiceDesc* pServDesc; // for external service std::shared_ptr<ScDPTableData> mpTableData; // cached data - com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource; + css::uno::Reference<css::sheet::XDimensionsSupplier> xSource; ScDPOutput* pOutput; sal_uInt16 mnAutoFormatIndex; long nHeaderRows; // page fields plus filter button @@ -108,8 +108,7 @@ private: SAL_DLLPRIVATE void CreateOutput(); SAL_DLLPRIVATE void ClearSource(); SAL_DLLPRIVATE bool FillLabelDataForDimension( - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess>& xDims, + const css::uno::Reference< css::container::XIndexAccess>& xDims, sal_Int32 nDim, ScDPLabelData& rLabelData); public: @@ -154,7 +153,7 @@ public: const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } - com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> GetSource(); + css::uno::Reference<css::sheet::XDimensionsSupplier> GetSource(); bool IsSheetData() const; bool IsImportData() const { return(pImpDesc != NULL); } @@ -176,7 +175,7 @@ public: OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL ); bool IsDuplicated( long nDim ); long GetDimCount(); - void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); + void GetHeaderPositionData(const ScAddress& rPos, css::sheet::DataPilotTableHeaderData& rData); long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient ); bool GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMouseTop, long nDragDim, @@ -185,31 +184,31 @@ public: double GetPivotData( const OUString& rDataFieldName, - std::vector<com::sun::star::sheet::DataPilotFieldFilter>& rFilters); + std::vector<css::sheet::DataPilotFieldFilter>& rFilters); bool ParseFilters( OUString& rDataFieldName, - std::vector<com::sun::star::sheet::DataPilotFieldFilter>& rFilters, - std::vector<com::sun::star::sheet::GeneralFunction>& rFilterFuncs, + std::vector<css::sheet::DataPilotFieldFilter>& rFilters, + std::vector<css::sheet::GeneralFunction>& rFilterFuncs, const OUString& rFilterList ); void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); - void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); + void ToggleDetails(const css::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); bool FillOldParam(ScPivotParam& rParam) const; bool FillLabelData(sal_Int32 nDim, ScDPLabelData& Labels); bool FillLabelData(ScPivotParam& rParam); - bool GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); - bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< OUString >& rHiers ); + bool GetHierarchiesNA( sal_Int32 nDim, css::uno::Reference< css::container::XNameAccess >& xHiers ); + bool GetHierarchies( sal_Int32 nDim, css::uno::Sequence< OUString >& rHiers ); sal_Int32 GetUsedHierarchy( sal_Int32 nDim ); - bool GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); - bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); + bool GetMembersNA( sal_Int32 nDim, css::uno::Reference< css::container::XNameAccess >& xMembers ); + bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, css::uno::Reference< css::container::XNameAccess >& xMembers ); - bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< OUString >& rNames ); + bool GetMemberNames( sal_Int32 nDim, css::uno::Sequence< OUString >& rNames ); bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers ); void UpdateReference( UpdateRefMode eUpdateRefMode, @@ -217,16 +216,14 @@ public: bool RefsEqual( const ScDPObject& r ) const; void WriteRefsTo( ScDPObject& r ) const; - void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); + void GetPositionData(const ScAddress& rPos, css::sheet::DataPilotTablePositionData& rPosData); bool GetDataFieldPositionData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters); + css::uno::Sequence< + css::sheet::DataPilotFieldFilter >& rFilters); void GetDrillDownData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any > >& rTableData); + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rTableData); // apply drop-down attribute, initialize nHeaderRows, without accessing the source // (button attribute must be present) @@ -241,15 +238,14 @@ public: bool SyncAllDimensionMembers(); static bool HasRegisteredSources(); - static com::sun::star::uno::Sequence<OUString> GetRegisteredSources(); - static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> + static css::uno::Sequence<OUString> GetRegisteredSources(); + static css::uno::Reference<css::sheet::XDimensionsSupplier> CreateSource( const ScDPServiceDesc& rDesc ); static void ConvertOrientation( ScDPSaveData& rSaveData, const ScPivotFieldVector& rFields, sal_uInt16 nOrient, - const com::sun::star::uno::Reference< - com::sun::star::sheet::XDimensionsSupplier>& xSource, + const css::uno::Reference< css::sheet::XDimensionsSupplier>& xSource, const ScDPLabelDataVector& rLabels, const ScPivotFieldVector* pRefColFields = NULL, const ScPivotFieldVector* pRefRowFields = NULL, @@ -356,7 +352,7 @@ public: ScDPCache* getExistingCache( sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); - static com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> createRowSet( + static css::uno::Reference<css::sdbc::XRowSet> createRowSet( sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); void updateCache( diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 440f097bba8c..f759c64d5724 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -47,8 +47,7 @@ class ScDPOutput { private: ScDocument* pDoc; - com::sun::star::uno::Reference< - com::sun::star::sheet::XDimensionsSupplier> xSource; + css::uno::Reference< css::sheet::XDimensionsSupplier> xSource; ScAddress aStartPos; ScDPOutLevelData* pColFields; ScDPOutLevelData* pRowFields; @@ -56,17 +55,15 @@ private: long nColFieldCount; long nRowFieldCount; long nPageFieldCount; - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::sheet::DataResult> > aData; - OUString aDataDescription; + css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult> > aData; + OUString aDataDescription; // Number format related parameters - sal_uInt32* pColNumFmt; - sal_uInt32* pRowNumFmt; + sal_uInt32* pColNumFmt; + sal_uInt32* pRowNumFmt; long nColFmtCount; long nRowFmtCount; - sal_uInt32 nSingleNumFmt; + sal_uInt32 nSingleNumFmt; // Output geometry related parameters long nColCount; @@ -88,9 +85,9 @@ private: bool mbHeaderLayout:1; // true : grid, false : standard void DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, - const com::sun::star::sheet::DataResult& rData ); + const css::sheet::DataResult& rData ); void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, - const com::sun::star::sheet::MemberResult& rData, + const css::sheet::MemberResult& rData, bool bColHeader, long nLevel ); void FieldCell(SCCOL nCol, SCROW nRow, SCTAB nTab, const ScDPOutLevelData& rData, bool bInTable); @@ -104,24 +101,23 @@ private: public: ScDPOutput( ScDocument* pD, - const com::sun::star::uno::Reference< - com::sun::star::sheet::XDimensionsSupplier>& xSrc, + const css::uno::Reference< css::sheet::XDimensionsSupplier>& xSrc, const ScAddress& rPos, bool bFilter ); ~ScDPOutput(); void SetPosition( const ScAddress& rPos ); void Output(); //! Refresh? - ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); - ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ) const; + ScRange GetOutputRange( sal_Int32 nRegionType = css::sheet::DataPilotOutputRangeType::WHOLE ); + ScRange GetOutputRange( sal_Int32 nRegionType = css::sheet::DataPilotOutputRangeType::WHOLE ) const; long GetHeaderRows(); bool HasError(); // range overflow or exception from source - void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); + void GetPositionData(const ScAddress& rPos, css::sheet::DataPilotTablePositionData& rPosData); /** Get filtering criteria based on the position of the cell within data field region. */ - bool GetDataResultPositionData(::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos); + bool GetDataResultPositionData(::std::vector< css::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos); long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient ); bool GetHeaderDrag( @@ -136,8 +132,7 @@ public: static void GetDataDimensionNames( OUString& rSourceName, OUString& rGivenName, - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& xDim ); + const css::uno::Reference< css::uno::XInterface>& xDim ); }; #endif diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx index 135b78c85269..0bcdc1a43953 100644 --- a/sc/inc/dpresfilter.hxx +++ b/sc/inc/dpresfilter.hxx @@ -121,10 +121,9 @@ public: void clear(); const ValuesType* getResults( - const com::sun::star::uno::Sequence< - com::sun::star::sheet::DataPilotFieldFilter>& rFilters) const; + const css::uno::Sequence< css::sheet::DataPilotFieldFilter>& rFilters) const; - double getLeafResult(const com::sun::star::sheet::DataPilotFieldFilter& rFilter) const; + double getLeafResult(const css::sheet::DataPilotFieldFilter& rFilter) const; #if DEBUG_PIVOT_TABLE void dump() const; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index c81a690f78cf..77cdcf54a5c1 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -82,7 +82,7 @@ public: SC_DLLPUBLIC const OUString* GetLayoutName() const; void RemoveLayoutName(); - void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xMember, + void WriteToSource( const css::uno::Reference<css::uno::XInterface>& xMember, sal_Int32 nPosition ); #if DEBUG_PIVOT_TABLE @@ -90,9 +90,9 @@ public: #endif }; -bool operator == (const ::com::sun::star::sheet::DataPilotFieldSortInfo &l, const ::com::sun::star::sheet::DataPilotFieldSortInfo &r ); -bool operator == (const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &l, const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &r ); -bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, const ::com::sun::star::sheet::DataPilotFieldReference &r ); +bool operator == (const css::sheet::DataPilotFieldSortInfo &l, const css::sheet::DataPilotFieldSortInfo &r ); +bool operator == (const css::sheet::DataPilotFieldAutoShowInfo &l, const css::sheet::DataPilotFieldAutoShowInfo &r ); +bool operator == (const css::sheet::DataPilotFieldReference &l, const css::sheet::DataPilotFieldReference &r ); class SC_DLLPUBLIC ScDPSaveDimension { @@ -110,10 +110,10 @@ private: bool bSubTotalDefault; //! at level long nSubTotalCount; sal_uInt16* pSubTotalFuncs; // enum GeneralFunction - ::com::sun::star::sheet::DataPilotFieldReference* pReferenceValue; - ::com::sun::star::sheet::DataPilotFieldSortInfo* pSortInfo; // (level) - ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo; // (level) - ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) + css::sheet::DataPilotFieldReference* pReferenceValue; + css::sheet::DataPilotFieldSortInfo* pSortInfo; // (level) + css::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo; // (level) + css::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: typedef std::unordered_set<OUString, OUStringHash> MemberSetType; @@ -184,23 +184,23 @@ public: bool IsMemberNameInUse(const OUString& rName) const; - const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const + const css::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } - void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); + void SetReferenceValue(const css::sheet::DataPilotFieldReference* pNew); - const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const + const css::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; } - void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew); - const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const + void SetSortInfo(const css::sheet::DataPilotFieldSortInfo* pNew); + const css::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const { return pAutoShowInfo; } - void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew); - const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const + void SetAutoShowInfo(const css::sheet::DataPilotFieldAutoShowInfo* pNew); + const css::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; } - void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew); + void SetLayoutInfo(const css::sheet::DataPilotFieldLayoutInfo* pNew); void SetCurrentPage( const OUString* pPage ); // NULL = no selection (all) OUString GetCurrentPage() const; // only for ODF compatibility @@ -223,7 +223,7 @@ public: void SetMemberPosition( const OUString& rName, sal_Int32 nNewPos ); - void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xDim ); + void WriteToSource( const css::uno::Reference<css::uno::XInterface>& xDim ); void UpdateMemberVisibility(const std::unordered_map< OUString, bool, OUStringHash>& rData); @@ -292,7 +292,7 @@ public: * @param rDims (out) list of dimensions for specified orientation */ SC_DLLPUBLIC void GetAllDimensionsByOrientation( - com::sun::star::sheet::DataPilotFieldOrientation eOrientation, + css::sheet::DataPilotFieldOrientation eOrientation, std::vector<const ScDPSaveDimension*>& rDims) const; void AddDimension(ScDPSaveDimension* pDim); @@ -320,7 +320,7 @@ public: void RemoveDimensionByName(const OUString& rName); ScDPSaveDimension* GetInnermostDimension(sal_uInt16 nOrientation); - ScDPSaveDimension* GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation); + ScDPSaveDimension* GetFirstDimension(css::sheet::DataPilotFieldOrientation eOrientation); long GetDataDimensionCount() const; void SetPosition( ScDPSaveDimension* pDim, long nNew ); @@ -348,7 +348,7 @@ public: bool GetDrillDown() const { return bDrillDown; } - void WriteToSource( const com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>& xSource ); + void WriteToSource( const css::uno::Reference<css::sheet::XDimensionsSupplier>& xSource ); bool IsEmpty() const; const ScDPDimensionSaveData* GetExistingDimensionData() const diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index e5666ac3288d..41b9a3196f64 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -75,7 +75,7 @@ public: virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) override; virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rData) override; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; virtual const ScDPFilteredCache& GetCacheTable() const override; virtual void ReloadCacheTable() override; diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index b3087df8b0b0..c3adf8e5b362 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -115,7 +115,7 @@ public: virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims) override; virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rData) override; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; virtual const ScDPFilteredCache& GetCacheTable() const override; virtual void ReloadCacheTable() override; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 0a455d95db7b..d47951e47d10 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -124,7 +124,7 @@ public: virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) = 0; virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) = 0; + css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rData) = 0; virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) = 0; virtual const ScDPFilteredCache& GetCacheTable() const = 0; virtual void ReloadCacheTable() = 0; diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 8a923307fa38..e12b88f33689 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -284,7 +284,7 @@ class ScDPResultData //! keep things like measure lists here std::vector<ScSubTotalFunc> maMeasureFuncs; - std::vector<com::sun::star::sheet::DataPilotFieldReference> maMeasureRefs; + std::vector<css::sheet::DataPilotFieldReference> maMeasureRefs; std::vector<sal_uInt16> maMeasureRefOrients; std::vector<OUString> maMeasureNames; @@ -300,7 +300,7 @@ public: void SetMeasureData( std::vector<ScSubTotalFunc>& rFunctions, - std::vector<com::sun::star::sheet::DataPilotFieldReference>& rRefs, + std::vector<css::sheet::DataPilotFieldReference>& rRefs, std::vector<sal_uInt16>& rRefOrient, std::vector<OUString>& rNames ); void SetDataLayoutOrientation( sal_uInt16 nOrient ); @@ -310,7 +310,7 @@ public: ScSubTotalFunc GetMeasureFunction(long nMeasure) const; OUString GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; OUString GetMeasureDimensionName(long nMeasure) const; - const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; + const css::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; sal_uInt16 GetMeasureRefOrient(long nMeasure) const; bool IsLateInit() const { return bLateInit; } @@ -390,15 +390,13 @@ public: const ::std::vector<SCROW>& aDataMembers, const ::std::vector<ScDPValue>& aValues ); void FillMemberResults( - com::sun::star::uno::Sequence< - com::sun::star::sheet::MemberResult>* pSequences, + css::uno::Sequence< css::sheet::MemberResult>* pSequences, long& rPos, long nMeasure, bool bRoot, const OUString* pMemberName, const OUString* pMemberCaption ); void FillDataResults( - const ScDPResultMember* pRefMember, ScDPResultFilterContext& rFilterCxt, - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::sheet::DataResult> >& rSequence, + const ScDPResultMember* pRefMember, + ScDPResultFilterContext& rFilterCxt, + css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult> >& rSequence, long nMeasure) const; void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; @@ -466,7 +464,7 @@ public: void FillDataRow( const ScDPResultMember* pRefMember, ScDPResultFilterContext& rFilterCxt, - com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, + css::uno::Sequence<css::sheet::DataResult>& rSequence, long nMeasure, bool bIsSubTotalRow, const ScDPSubTotalState& rSubState) const; @@ -546,16 +544,16 @@ public: const ScDPResultDimension* pDataDim, const ::std::vector<SCROW>& aDataMembers, const ::std::vector<ScDPValue>& aValues ) const; //! Test - void FillMemberResults( com::sun::star::uno::Sequence< - com::sun::star::sheet::MemberResult>* pSequences, + void FillMemberResults( css::uno::Sequence< + css::sheet::MemberResult>* pSequences, long nStart, long nMeasure ); void FillDataResults( const ScDPResultMember* pRefMember, ScDPResultFilterContext& rFilterCxt, - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::sheet::DataResult> >& rSequence, + css::uno::Sequence< + css::uno::Sequence< + css::sheet::DataResult> >& rSequence, long nMeasure) const; void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; @@ -627,7 +625,7 @@ public: void FillDataRow( const ScDPResultDimension* pRefDim, ScDPResultFilterContext& rFilterCxt, - com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, + css::uno::Sequence<css::sheet::DataResult>& rSequence, long nMeasure, bool bIsSubTotalRow, const ScDPSubTotalState& rSubState) const; void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, bool bIsSubTotalRow, diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 8391f3d88fa8..54dd48beb415 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -80,12 +80,12 @@ class ScDPMembers; class ScDPMember; class ScDPSource : public cppu::WeakImplHelper< - com::sun::star::sheet::XDimensionsSupplier, - com::sun::star::sheet::XDataPilotResults, - com::sun::star::util::XRefreshable, - com::sun::star::sheet::XDrillDownDataSupplier, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo > + css::sheet::XDimensionsSupplier, + css::sheet::XDataPilotResults, + css::util::XRefreshable, + css::sheet::XDrillDownDataSupplier, + css::beans::XPropertySet, + css::lang::XServiceInfo > { private: ScDPTableData* pData; // data source (ScDPObject manages its life time) @@ -109,8 +109,8 @@ private: ScDPResultData* pResData; // keep the rest in this! ScDPResultMember* pColResRoot; ScDPResultMember* pRowResRoot; - com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pColResults; - com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults; + css::uno::Sequence<css::sheet::MemberResult>* pColResults; + css::uno::Sequence<css::sheet::MemberResult>* pRowResults; std::vector<ScDPLevel*> aColLevelList; std::vector<ScDPLevel*> aRowLevelList; bool bResultOverflow; @@ -175,89 +175,82 @@ public: long GetSourceDim(long nDim); - const com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* + const css::uno::Sequence<css::sheet::MemberResult>* GetMemberResults( ScDPLevel* pLevel ); ScDPDimensions* GetDimensionsObject(); // XDimensionsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getDimensions( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XDataPilotResults - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::DataResult > > SAL_CALL getResults( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult > > SAL_CALL getResults( ) + throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence<double> SAL_CALL + virtual css::uno::Sequence<double> SAL_CALL getFilteredResults( - const com::sun::star::uno::Sequence<com::sun::star::sheet::DataPilotFieldFilter>& aFilters ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::sheet::DataPilotFieldFilter>& aFilters ) + throw (css::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; // XDrillDownDataSupplier - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > - SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::DataPilotFieldFilter >& aFilters ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > + SAL_CALL getDrillDownData(const css::uno::Sequence< + css::sheet::DataPilotFieldFilter >& aFilters ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; #if DEBUG_PIVOT_TABLE void DumpResults() const; @@ -265,8 +258,8 @@ public: }; class ScDPDimensions : public cppu::WeakImplHelper< - com::sun::star::container::XNameAccess, - com::sun::star::lang::XServiceInfo > + css::container::XNameAccess, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -280,52 +273,52 @@ public: void CountChanged(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; long getCount() const; ScDPDimension* getByIndex(long nIndex) const; }; class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper< - com::sun::star::sheet::XHierarchiesSupplier, - com::sun::star::container::XNamed, - com::sun::star::util::XCloneable, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo > + css::sheet::XHierarchiesSupplier, + css::container::XNamed, + css::util::XCloneable, + css::beans::XPropertySet, + css::lang::XServiceInfo > { ScDPSource* pSource; long nDim; // dimension index (== column ID) ScDPHierarchies* pHierarchies; long nUsedHier; - sal_uInt16 nFunction; // enum GeneralFunction - OUString aName; // if empty, take from source + sal_uInt16 nFunction; // enum GeneralFunction + OUString aName; // if empty, take from source std::unique_ptr<OUString> mpLayoutName; std::unique_ptr<OUString> mpSubtotalName; long nSourceDim; // >=0 if dup'ed - ::com::sun::star::sheet::DataPilotFieldReference + css::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" bool bHasSelectedPage; - OUString aSelectedPage; + OUString aSelectedPage; ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage bool mbHasHiddenMember; @@ -343,66 +336,63 @@ public: const OUString* GetSubtotalName() const; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XHierarchiesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getHierarchies() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getHierarchies() throw(css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL - createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL + createClone() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; sal_uInt16 getOrientation() const; void setOrientation(sal_uInt16 nNew); @@ -415,12 +405,12 @@ public: bool HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); - const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;} + const css::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;} }; class ScDPHierarchies : public cppu::WeakImplHelper< - com::sun::star::container::XNameAccess, - com::sun::star::lang::XServiceInfo > + css::container::XNameAccess, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -433,36 +423,36 @@ public: virtual ~ScDPHierarchies(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; long getCount() const; ScDPHierarchy* getByIndex(long nIndex) const; }; class ScDPHierarchy : public cppu::WeakImplHelper< - com::sun::star::sheet::XLevelsSupplier, - com::sun::star::container::XNamed, - com::sun::star::lang::XServiceInfo > + css::sheet::XLevelsSupplier, + css::container::XNamed, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -477,26 +467,26 @@ public: ScDPLevels* GetLevelsObject(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XLevelsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getLevels() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getLevels() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScDPLevels : public cppu::WeakImplHelper< - com::sun::star::container::XNameAccess, - com::sun::star::lang::XServiceInfo > + css::container::XNameAccess, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -510,38 +500,38 @@ public: virtual ~ScDPLevels(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; long getCount() const; ScDPLevel* getByIndex(long nIndex) const; }; class ScDPLevel : public cppu::WeakImplHelper< - com::sun::star::sheet::XMembersSupplier, - com::sun::star::container::XNamed, - com::sun::star::sheet::XDataPilotMemberResults, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo > + css::sheet::XMembersSupplier, + css::container::XNamed, + css::sheet::XDataPilotMemberResults, + css::beans::XPropertySet, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -549,10 +539,10 @@ private: long nHier; long nLev; ScDPMembers* pMembers; - com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> aSubTotals; - ::com::sun::star::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings - ::com::sun::star::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo; // stored user settings - ::com::sun::star::sheet::DataPilotFieldLayoutInfo aLayoutInfo; // stored user settings + css::uno::Sequence<css::sheet::GeneralFunction> aSubTotals; + css::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings + css::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo; // stored user settings + css::sheet::DataPilotFieldLayoutInfo aLayoutInfo; // stored user settings // valid only from result calculation: ::std::vector<sal_Int32> aGlobalOrder; // result of sorting by name or position long nSortMeasure; // measure (index of data dimension) to sort by @@ -568,73 +558,69 @@ public: ScDPMembers* GetMembersObject(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XMembersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getMembers() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getMembers() throw(css::uno::RuntimeException, std::exception) override; // XDataPilotMemberResults - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::MemberResult > SAL_CALL - getResults() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::MemberResult > SAL_CALL + getResults() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; - com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; + css::uno::Sequence<css::sheet::GeneralFunction> getSubTotals() const; bool getShowEmpty() const { return bShowEmpty;} bool getRepeatItemLabels() const { return bRepeatItemLabels; } - const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } - const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } + const css::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } + const css::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } void EvaluateSortOrder(); void SetEnableLayout(bool bSet); @@ -648,14 +634,14 @@ public: { return bEnableLayout && aLayoutInfo.LayoutMode != - ::com::sun::star::sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT; + css::sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT; } bool IsSubtotalsAtTop() const { return bEnableLayout && aLayoutInfo.LayoutMode == - ::com::sun::star::sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP; + css::sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP; } bool IsAddEmpty() const @@ -670,8 +656,8 @@ public: typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap; class ScDPMembers : public cppu::WeakImplHelper< - com::sun::star::container::XNameAccess, - com::sun::star::lang::XServiceInfo > + css::container::XNameAccess, + css::lang::XServiceInfo > { private: typedef std::vector<rtl::Reference<ScDPMember> > MembersType; @@ -688,27 +674,27 @@ public: virtual ~ScDPMembers(); // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; long getCount() const { return nMbrCount;} ScDPMember* getByIndex(long nIndex) const; @@ -721,9 +707,9 @@ public: }; class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper< - com::sun::star::container::XNamed, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo > + css::container::XNamed, + css::beans::XPropertySet, + css::lang::XServiceInfo > { private: ScDPSource* pSource; @@ -754,58 +740,54 @@ public: sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; bool isVisible() const { return bVisible;} bool getShowDetails() const { return bShowDet;} diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx index 002389e33b1b..29c7036e0d0e 100644 --- a/sc/inc/dputil.hxx +++ b/sc/inc/dputil.hxx @@ -50,7 +50,7 @@ public: static OUString getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc eFunc); - static ScSubTotalFunc toSubTotalFunc(com::sun::star::sheet::GeneralFunction eGenFunc); + static ScSubTotalFunc toSubTotalFunc(css::sheet::GeneralFunction eGenFunc); }; #endif diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index aea4d2d1aafb..cdd8ec79743e 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -35,7 +35,7 @@ public: virtual ScDrawPage* Clone() const override; virtual ScDrawPage* Clone(SdrModel* pNewModel) const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; private: ScDrawPage(const ScDrawPage& rSrcPage); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index ca990980164e..10d7414a34af 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -213,7 +213,7 @@ private: public: static void SetGlobalDrawPersist(SfxObjectShell* pPersist); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override; }; #endif diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index ec50d5442c13..7dc815ac7051 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -30,8 +30,8 @@ class ScDocShell; class ScSheetEventsObj : public cppu::WeakImplHelper< - com::sun::star::container::XNameReplace, - com::sun::star::lang::XServiceInfo>, + css::container::XNameReplace, + css::lang::XServiceInfo>, public SfxListener { private: @@ -46,34 +46,34 @@ public: // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index af8921d17069..d341b797f854 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -69,7 +69,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) override; + const OUString& rMimeType, const css::uno::Any & rValue) override; virtual void Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl) override; void SetDoReferesh(bool b); diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index faf25143dc63..6aef98560e5c 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -50,15 +50,15 @@ class ScDocShell; class ScHeaderFooterTextData; class ScCellFieldsObj : public cppu::WeakImplHelper< - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::container::XContainer, - com::sun::star::util::XRefreshable, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::container::XContainer, + css::util::XRefreshable, + css::lang::XServiceInfo >, public SfxListener { private: - com::sun::star::uno::Reference<com::sun::star::text::XTextRange> mxContent; + css::uno::Reference<css::text::XTextRange> mxContent; ScDocShell* pDocShell; ScAddress aCellPos; ScEditSource* mpEditSource; @@ -67,67 +67,62 @@ private: /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - com::sun::star::uno::Reference< - com::sun::star::text::XTextField> + css::uno::Reference<css::text::XTextField> GetObjectByIndex_Impl(sal_Int32 Index) const; public: ScCellFieldsObj( - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& xContent, + const css::uno::Reference<css::text::XTextRange>& xContent, ScDocShell* pDocSh, const ScAddress& rPos); virtual ~ScCellFieldsObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScHeaderFieldsObj : public cppu::WeakImplHelper< - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::container::XContainer, - com::sun::star::util::XRefreshable, - com::sun::star::lang::XServiceInfo > + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::container::XContainer, + css::util::XRefreshable, + css::lang::XServiceInfo > { private: ScHeaderFooterTextData& mrData; @@ -138,8 +133,7 @@ private: /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - com::sun::star::uno::Reference< - com::sun::star::text::XTextField> + css::uno::Reference< css::text::XTextField> GetObjectByIndex_Impl(sal_Int32 Index) const; public: @@ -147,46 +141,42 @@ public: virtual ~ScHeaderFieldsObj(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; /** @@ -194,10 +184,10 @@ public: * footers. */ class ScEditFieldObj : public cppu::WeakImplHelper< - com::sun::star::text::XTextField, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo>, + css::text::XTextField, + css::beans::XPropertySet, + css::lang::XUnoTunnel, + css::lang::XServiceInfo>, public ScMutexHelper, public ::cppu::OComponentHelper, private boost::noncopyable @@ -208,9 +198,9 @@ class ScEditFieldObj : public cppu::WeakImplHelper< sal_Int32 meType; std::unique_ptr<SvxFieldData> mpData; - com::sun::star::uno::Reference<com::sun::star::text::XTextRange> mpContent; + css::uno::Reference<css::text::XTextRange> mpContent; - com::sun::star::util::DateTime maDateTime; + css::util::DateTime maDateTime; sal_Int32 mnNumFormat; bool mbIsDate:1; bool mbIsFixed:1; @@ -220,23 +210,23 @@ private: SvxFieldData* getData(); - void setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueURL(const OUString& rName); + void setPropertyValueURL(const OUString& rName, const css::uno::Any& rVal); + css::uno::Any getPropertyValueURL(const OUString& rName); - void setPropertyValueFile(const OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueFile(const OUString& rName); + void setPropertyValueFile(const OUString& rName, const css::uno::Any& rVal); + css::uno::Any getPropertyValueFile(const OUString& rName); - void setPropertyValueDateTime(const OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueDateTime(const OUString& rName); + void setPropertyValueDateTime(const OUString& rName, const css::uno::Any& rVal); + css::uno::Any getPropertyValueDateTime(const OUString& rName); - void setPropertyValueSheet(const OUString& rName, const com::sun::star::uno::Any& rVal); + void setPropertyValueSheet(const OUString& rName, const css::uno::Any& rVal); public: - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - static ScEditFieldObj* getImplementation(const com::sun::star::uno::Reference<com::sun::star::text::XTextContent>& xObj); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static ScEditFieldObj* getImplementation(const css::uno::Reference<css::text::XTextContent>& xObj); ScEditFieldObj( - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rContent, + const css::uno::Reference<css::text::XTextRange>& rContent, ScEditSource* pEditSrc, sal_Int32 eType, const ESelection& rSel); virtual ~ScEditFieldObj(); @@ -245,90 +235,81 @@ public: bool IsInserted() const; SvxFieldItem CreateFieldItem(); void InitDoc( - const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rContent, + const css::uno::Reference<css::text::XTextRange>& rContent, ScEditSource* pEditSrc, const ESelection& rSel); // XTextField virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xTextRange ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getAnchor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getAnchor() throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index e992b9a657db..6a4bb2ec3eb0 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -32,14 +32,14 @@ private: double fExcelColScale; double fExcelRowScale; - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; bool GetWK3Flag() const { return bWK3Flag; } }; diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index a297cba58134..bd983002fb37 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -34,11 +34,11 @@ namespace com { namespace sun { namespace star { namespace io { } } } } class ScFilterOptionsObj : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertyAccess, - ::com::sun::star::ui::dialogs::XExecutableDialog, - ::com::sun::star::document::XImporter, - ::com::sun::star::document::XExporter, - ::com::sun::star::lang::XServiceInfo > + css::beans::XPropertyAccess, + css::ui::dialogs::XExecutableDialog, + css::document::XImporter, + css::document::XExporter, + css::lang::XServiceInfo > { private: OUString aFileName; @@ -52,40 +52,38 @@ public: virtual ~ScFilterOptionsObj(); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aProps ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > + SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< + css::beans::PropertyValue >& aProps ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 6044abea6e2e..5b870eaba087 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -67,11 +67,11 @@ struct ScCondFormatEntryItem }; class ScTableConditionalFormat : public cppu::WeakImplHelper< - com::sun::star::sheet::XSheetConditionalEntries, - com::sun::star::container::XNameAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo > + css::sheet::XSheetConditionalEntries, + css::container::XNameAccess, + css::container::XEnumerationAccess, + css::lang::XUnoTunnel, + css::lang::XServiceInfo > { private: std::vector<ScTableConditionalEntry*> aEntries; @@ -89,60 +89,58 @@ public: formula::FormulaGrammar::Grammar eGrammar) const; // XSheetConditionalEntries - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aConditionalEntry ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addNew( const css::uno::Sequence< css::beans::PropertyValue >& aConditionalEntry ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableConditionalFormat* getImplementation(const css::uno::Reference<css::sheet::XSheetConditionalEntries>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableConditionalEntry : public cppu::WeakImplHelper< - com::sun::star::sheet::XSheetCondition2, - com::sun::star::sheet::XSheetConditionalEntry, - com::sun::star::lang::XServiceInfo > + css::sheet::XSheetCondition2, + css::sheet::XSheetConditionalEntry, + css::lang::XServiceInfo > { private: ScCondFormatEntryItem aData; @@ -155,45 +153,45 @@ public: void GetData(ScCondFormatEntryItem& rData) const; // XSheetCondition - virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::sheet::ConditionOperator SAL_CALL getOperator() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getConditionOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourcePosition( const ::com::sun::star::table::CellAddress& aSourcePosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getSourcePosition() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) + throw(css::uno::RuntimeException, std::exception) override; // XSheetConditionalEntry - virtual OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStyleName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStyleName( const OUString& aStyleName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScTableValidationObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XSheetCondition2, - com::sun::star::sheet::XMultiFormulaTokens, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo > + css::sheet::XSheetCondition2, + css::sheet::XMultiFormulaTokens, + css::beans::XPropertySet, + css::lang::XUnoTunnel, + css::lang::XServiceInfo > { private: SfxItemPropertySet aPropSet; @@ -204,8 +202,8 @@ private: OUString maExprNmsp2; formula::FormulaGrammar::Grammar meGrammar1; // grammar used with aExpr1 and aExpr2 formula::FormulaGrammar::Grammar meGrammar2; // grammar used with aExpr1 and aExpr2 - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1; - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; + css::uno::Sequence< css::sheet::FormulaToken > aTokens1; + css::uno::Sequence< css::sheet::FormulaToken > aTokens2; ScAddress aSrcPos; OUString aPosString; // formula position as text sal_uInt16 nValMode; // enum ScValidationMode @@ -231,90 +229,85 @@ public: formula::FormulaGrammar::Grammar eGrammar ) const; // XSheetCondition - virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::sheet::ConditionOperator SAL_CALL getOperator() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getConditionOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourcePosition( const ::com::sun::star::table::CellAddress& aSourcePosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getSourcePosition() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) + throw(css::uno::RuntimeException, std::exception) override; // XMultiFormulaTokens - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override; virtual void SAL_CALL setTokens( sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) + throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableValidationObj* getImplementation(const css::uno::Reference<css::beans::XPropertySet>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 8a903d22c95e..f06968780644 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -105,9 +105,9 @@ private: class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem { typedef std::map<OUString,sal_uInt16> PropsToIds; - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); static ScFormulaCfg::PropsToIds GetPropNamesToId(); - void UpdateFromProperties( const com::sun::star::uno::Sequence<OUString>& rNames ); + void UpdateFromProperties( const css::uno::Sequence<OUString>& rNames ); virtual void ImplCommit() override; @@ -116,7 +116,7 @@ public: void SetOptions( const ScFormulaOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index cc2771b29b0c..28e8a73c810d 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -37,13 +37,13 @@ public: bool hasFormulaParser( const OUString& rNamespace ); /** Returns the formula parser that is registered for the passed namespace. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser > + css::uno::Reference< css::sheet::XFormulaParser > getFormulaParser( const OUString& rNamespace ); private: typedef std::unordered_map< OUString, - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >, + css::uno::Reference< css::sheet::XFormulaParser >, OUStringHash, ::std::equal_to< OUString > > ParserMap; diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 19a7b489317a..1aab2365d05f 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -29,10 +29,9 @@ class ScDocument; class ScDocOptions; -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SAL_CALL ScFunctionAccess_CreateInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& ); class ScTempDocCache { @@ -53,9 +52,9 @@ public: }; class ScFunctionAccess : public cppu::WeakImplHelper< - com::sun::star::sheet::XFunctionAccess, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo>, + css::sheet::XFunctionAccess, + css::beans::XPropertySet, + css::lang::XServiceInfo>, public SfxListener { private: @@ -72,63 +71,57 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XFunctionAccess - virtual ::com::sun::star::uno::Any SAL_CALL callFunction( + virtual css::uno::Any SAL_CALL callFunction( const OUString& aName, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 665f06647e18..3a47f55e3228 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -38,10 +38,10 @@ struct ScCalcConfig; enum class SvtScriptType; #define SC_COLLATOR_IGNORES ( \ - ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ) + css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ) #define SC_TRANSLITERATION_IGNORECASE ( \ - ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE ) + css::i18n::TransliterationModules_IGNORE_CASE ) #define SC_TRANSLITERATION_CASESENSE 0 // Calc has lots of names... @@ -485,14 +485,14 @@ class ScGlobal static SvNumberFormatter* pEnglishFormatter; // for UNO / XML export - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> xOrdinalSuffix; + static css::uno::Reference< css::i18n::XOrdinalSuffix> xOrdinalSuffix; static CalendarWrapper* pCalendar; static CollatorWrapper* pCaseCollator; static CollatorWrapper* pCollator; static ::utl::TransliterationWrapper* pTransliteration; static ::utl::TransliterationWrapper* pCaseTransliteration; static IntlWrapper* pScIntlWrapper; - static ::com::sun::star::lang::Locale* pLocale; + static css::lang::Locale* pLocale; static ScFieldEditEngine* pFieldEditEngine; @@ -508,7 +508,7 @@ public: SC_DLLPUBLIC static CollatorWrapper* GetCollator(); static CollatorWrapper* GetCaseCollator(); static IntlWrapper* GetScIntlWrapper(); - static ::com::sun::star::lang::Locale* GetLocale(); + static css::lang::Locale* GetLocale(); SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); static ::utl::TransliterationWrapper* GetCaseTransliteration(); diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index db385559fa93..3536109a9682 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -79,7 +79,7 @@ public: class ScInputCfg : public ScInputOptions, public utl::ConfigItem { - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; @@ -89,7 +89,7 @@ public: void SetOptions( const ScInputOptions& rNew ); void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; }; #endif diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index e4a96429f984..3145dd4c8a16 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -49,10 +49,10 @@ class ScTableLink; typedef std::vector< css::uno::Reference< css::util::XRefreshListener > > XRefreshListenerArr_Impl; class ScSheetLinkObj : public cppu::WeakImplHelper< - com::sun::star::container::XNamed, - com::sun::star::util::XRefreshable, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo >, + css::container::XNamed, + css::util::XRefreshable, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -72,62 +72,56 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // aus get/setPropertyValue gerufen: OUString getFileName() const; @@ -141,18 +135,18 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScSheetLinksObj : public cppu::WeakImplHelper< - com::sun::star::container::XNameAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo >, + css::container::XNameAccess, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -168,45 +162,45 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScAreaLinkObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XAreaLink, - com::sun::star::util::XRefreshable, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo >, + css::sheet::XAreaLink, + css::util::XRefreshable, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -217,7 +211,7 @@ private: void Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, const OUString* pNewOptions, const OUString* pNewSource, - const com::sun::star::table::CellRangeAddress* pNewDest ); + const css::table::CellRangeAddress* pNewDest ); void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); void Refreshed_Impl(); @@ -229,89 +223,82 @@ public: // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // called from get/setPropertyValue: - OUString getFileName() const; + OUString getFileName() const; void setFileName(const OUString& FileName); - OUString getFilter() const; + OUString getFilter() const; void setFilter(const OUString& Filter); - OUString getFilterOptions() const; + OUString getFilterOptions() const; void setFilterOptions(const OUString& FilterOptions); sal_Int32 getRefreshDelay() const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink - virtual OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSourceArea() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDestArea( const ::com::sun::star::table::CellRangeAddress& aDestArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getDestArea() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDestArea( const css::table::CellRangeAddress& aDestArea ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScAreaLinksObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XAreaLinks, - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo >, + css::sheet::XAreaLinks, + css::container::XEnumerationAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -326,48 +313,48 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XAreaLinks - virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, + virtual void SAL_CALL insertAtPosition( const css::table::CellAddress& aDestPos, const OUString& aFileName, const OUString& aSourceArea, const OUString& aFilter, const OUString& aFilterOptions ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols class ScDDELinkObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XDDELink, - com::sun::star::container::XNamed, - com::sun::star::util::XRefreshable, - com::sun::star::sheet::XDDELinkResults, - com::sun::star::lang::XServiceInfo >, + css::sheet::XDDELink, + css::container::XNamed, + css::util::XRefreshable, + css::sheet::XDDELinkResults, + css::lang::XServiceInfo >, public SfxListener { private: @@ -387,49 +374,47 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XDDELink - virtual OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getApplication() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTopic() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItem() throw(css::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) + throw(css::uno::RuntimeException, std::exception) override; // XDDELinkResults - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getResults( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setResults( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aResults ) - throw (::com::sun::star::uno::RuntimeException, + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aResults ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScDDELinksObj : public cppu::WeakImplHelper< - com::sun::star::container::XEnumerationAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::sheet::XDDELinks, - com::sun::star::lang::XServiceInfo >, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::sheet::XDDELinks, + css::lang::XServiceInfo >, public SfxListener { private: @@ -445,48 +430,48 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XDDELinks - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > SAL_CALL addDDELink( + virtual css::uno::Reference< css::sheet::XDDELink > SAL_CALL addDDELink( const OUString& aApplication, const OUString& aTopic, - const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) - throw (::com::sun::star::uno::RuntimeException, + const OUString& aItem, css::sheet::DDELinkMode nMode ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; -class ScExternalSheetCacheObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalSheetCache > +class ScExternalSheetCacheObj : public cppu::WeakImplHelper< css::sheet::XExternalSheetCache > { public: explicit ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex); @@ -494,21 +479,21 @@ public: // XExternalSheetCache virtual void SAL_CALL setCellValue( - sal_Int32 nCol, sal_Int32 nRow, const ::com::sun::star::uno::Any& rAny) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int32 nCol, sal_Int32 nRow, const css::uno::Any& rAny) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // Attributes virtual sal_Int32 SAL_CALL getTokenIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete; @@ -519,46 +504,46 @@ private: size_t mnIndex; }; -class ScExternalDocLinkObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalDocLink > +class ScExternalDocLinkObj : public cppu::WeakImplHelper< css::sheet::XExternalDocLink > { public: ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId); virtual ~ScExternalDocLinkObj(); // XExternalDocLink - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > + virtual css::uno::Reference< css::sheet::XExternalSheetCache > SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // Attributes virtual sal_Int32 SAL_CALL getTokenIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScDocShell* mpDocShell; @@ -567,42 +552,42 @@ private: }; /** This is the UNO API equivalent of ScExternalRefManager. */ -class ScExternalDocLinksObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalDocLinks > +class ScExternalDocLinksObj : public cppu::WeakImplHelper< css::sheet::XExternalDocLinks > { public: ScExternalDocLinksObj(ScDocShell* pDocShell); virtual ~ScExternalDocLinksObj(); // XExternalDocLinks - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > + virtual css::uno::Reference< css::sheet::XExternalDocLink > SAL_CALL addDocLink( const OUString& aDocName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; private: ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete; diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx index d691052ca873..0a335a1a4ae4 100644 --- a/sc/inc/listenercalls.hxx +++ b/sc/inc/listenercalls.hxx @@ -35,13 +35,12 @@ namespace com { namespace sun { namespace star { struct ScUnoListenerEntry { - ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > xListener; - ::com::sun::star::lang::EventObject aEvent; + css::uno::Reference< + css::util::XModifyListener > xListener; + css::lang::EventObject aEvent; - ScUnoListenerEntry( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& rL, - const ::com::sun::star::lang::EventObject& rE ) : + ScUnoListenerEntry( const css::uno::Reference< css::util::XModifyListener >& rL, + const css::lang::EventObject& rE ) : xListener( rL ), aEvent( rE ) {} @@ -59,9 +58,8 @@ public: ScUnoListenerCalls(); ~ScUnoListenerCalls(); - void Add( const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener >& rListener, - const ::com::sun::star::lang::EventObject& rEvent ); + void Add( const css::uno::Reference< css::util::XModifyListener >& rListener, + const css::lang::EventObject& rEvent ); void ExecuteAndClear(); }; diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx index 996ea653b0d6..afe803e4432d 100644 --- a/sc/inc/macromgr.hxx +++ b/sc/inc/macromgr.hxx @@ -40,7 +40,7 @@ public: private: typedef std::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap; NameBoolMap mhFuncToVolatile; - com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener; + css::uno::Reference< css::container::XContainerListener > mxContainerListener; ::std::unique_ptr<ScUserMacroDepTracker> mpDepTracker; ScDocument* mpDoc; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 68e6d7bef748..acb837cffd66 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -32,20 +32,20 @@ #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ OUString SAL_CALL ClassName::getImplementationName() \ - throw(::com::sun::star::uno::RuntimeException, std::exception) \ + throw(css::uno::RuntimeException, std::exception) \ { \ return OUString(ClassNameAscii); \ } \ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ - throw(::com::sun::star::uno::RuntimeException, std::exception) \ + throw(css::uno::RuntimeException, std::exception) \ { \ return cppu::supportsService(this, ServiceName); \ } \ -::com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ SAL_CALL ClassName::getSupportedServiceNames() \ - throw(::com::sun::star::uno::RuntimeException, std::exception) \ + throw(css::uno::RuntimeException, std::exception) \ { \ - ::com::sun::star::uno::Sequence< OUString > aRet(1); \ + css::uno::Sequence< OUString > aRet(1); \ OUString* pArray = aRet.getArray(); \ pArray[0] = ServiceAscii; \ return aRet; \ @@ -85,116 +85,112 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ { uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; } class ScIndexEnumeration : public cppu::WeakImplHelper< - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo > + css::container::XEnumeration, + css::lang::XServiceInfo > { private: - com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> xIndex; - OUString sServiceName; + css::uno::Reference<css::container::XIndexAccess> xIndex; + OUString sServiceName; sal_Int32 nPos; public: - ScIndexEnumeration(const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess>& rInd, const OUString& rServiceName); + ScIndexEnumeration(const css::uno::Reference< + css::container::XIndexAccess>& rInd, const OUString& rServiceName); virtual ~ScIndexEnumeration(); // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException, std::exception) override; }; // new (uno 3) variant class ScNameToIndexAccess : public cppu::WeakImplHelper< - com::sun::star::container::XIndexAccess, - com::sun::star::lang::XServiceInfo > + css::container::XIndexAccess, + css::lang::XServiceInfo > { private: - com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xNameAccess; - com::sun::star::uno::Sequence<OUString> aNames; + css::uno::Reference<css::container::XNameAccess> xNameAccess; + css::uno::Sequence<OUString> aNames; public: ScNameToIndexAccess( - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess>& rNameObj ); + const css::uno::Reference< css::container::XNameAccess>& rNameObj ); virtual ~ScNameToIndexAccess(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScUnoHelpFunctions { public: - static com::sun::star::uno::Reference<com::sun::star::uno::XInterface> - AnyToInterface( const com::sun::star::uno::Any& rAny ); - static bool GetBoolProperty( const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& xProp, + static css::uno::Reference<css::uno::XInterface> + AnyToInterface( const css::uno::Any& rAny ); + static bool GetBoolProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, const OUString& rName, bool bDefault = false ); - static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& xProp, + static sal_Int32 GetLongProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, const OUString& rName, long nDefault = 0 ); - static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& xProp, + static sal_Int32 GetEnumProperty( const css::uno::Reference< css::beans::XPropertySet>& xProp, const OUString& rName, long nDefault ); static OUString GetStringProperty( - const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp, + const css::uno::Reference<css::beans::XPropertySet>& xProp, const OUString& rName, const OUString& rDefault ); - static bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny ); - static void SetBoolInAny( com::sun::star::uno::Any& rAny, bool bValue ); + static bool GetBoolFromAny( const css::uno::Any& aAny ); + static sal_Int16 GetInt16FromAny( const css::uno::Any& aAny ); + static sal_Int32 GetInt32FromAny( const css::uno::Any& aAny ); + static sal_Int32 GetEnumFromAny( const css::uno::Any& aAny ); + static void SetBoolInAny( css::uno::Any& rAny, bool bValue ); static void SetOptionalPropertyValue( - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, - const sal_Char* pPropName, const ::com::sun::star::uno::Any& rVal ); + css::uno::Reference< css::beans::XPropertySet >& rPropSet, + const sal_Char* pPropName, const css::uno::Any& rVal ); template<typename ValueType> static void SetOptionalPropertyValue( - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, + css::uno::Reference< css::beans::XPropertySet >& rPropSet, const sal_Char* pPropName, const ValueType& rVal ) { - ::com::sun::star::uno::Any any; + css::uno::Any any; any <<= rVal; SetOptionalPropertyValue(rPropSet, pPropName, any); } template<typename ValueType> - static com::sun::star::uno::Sequence<ValueType> VectorToSequence( const std::vector<ValueType>& rVector ) + static css::uno::Sequence<ValueType> VectorToSequence( const std::vector<ValueType>& rVector ) { if (rVector.empty()) - return com::sun::star::uno::Sequence<ValueType>(); + return css::uno::Sequence<ValueType>(); - return com::sun::star::uno::Sequence<ValueType>(&rVector[0], static_cast<sal_Int32>(rVector.size())); + return css::uno::Sequence<ValueType>(&rVector[0], static_cast<sal_Int32>(rVector.size())); } }; diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 0e3dbd7bbcac..df67816b919a 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -46,19 +46,19 @@ class ScTokenArray; class ScNamedRangesObj; class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XNamedRange, - ::com::sun::star::sheet::XFormulaTokens, - ::com::sun::star::sheet::XCellRangeReferrer, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo >, + css::sheet::XNamedRange, + css::sheet::XFormulaTokens, + css::sheet::XCellRangeReferrer, + css::beans::XPropertySet, + css::lang::XUnoTunnel, + css::lang::XServiceInfo >, public SfxListener { private: rtl::Reference< ScNamedRangesObj > mxParent; ScDocShell* pDocShell; OUString aName; - com::sun::star::uno::Reference< com::sun::star::container::XNamed > mxSheet; + css::uno::Reference< css::container::XNamed > mxSheet; private: friend class ScVbaName; @@ -71,110 +71,103 @@ friend class ScVbaName; public: ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const OUString& rNm, - com::sun::star::uno::Reference< com::sun::star::container::XNamed > xSheet = com::sun::star::uno::Reference< com::sun::star::container::XNamed > ()); + css::uno::Reference< css::container::XNamed > xSheet = css::uno::Reference< css::container::XNamed > ()); virtual ~ScNamedRangeObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XNamedRange - virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getContent() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setContent( const OUString& aContent ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getReferencePosition() + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReferencePosition( - const ::com::sun::star::table::CellAddress& aReferencePosition ) - throw (::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& aReferencePosition ) + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType( sal_Int32 nType ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// XFormulaTokens - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) + throw (css::uno::RuntimeException, std::exception) override; /// XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// XCellRangeReferrer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL + getReferredCells() throw(css::uno::RuntimeException, std::exception) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScNamedRangesObj : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XNamedRanges, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::document::XActionLockable, - ::com::sun::star::lang::XServiceInfo >, + css::sheet::XNamedRanges, + css::container::XEnumerationAccess, + css::container::XIndexAccess, + css::beans::XPropertySet, + css::document::XActionLockable, + css::lang::XServiceInfo >, public SfxListener { private: @@ -209,98 +202,95 @@ public: /// XNamedRanges virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, - const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) - throw (::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& aPosition, sal_Int32 nType ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, - ::com::sun::star::sheet::Border aBorder ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addNewFromTitles( const css::table::CellRangeAddress& aSource, + css::sheet::Border aBorder ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL outputList( const css::table::CellAddress& aOutputPosition ) + throw(css::uno::RuntimeException, std::exception) override; /// XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScGlobalNamedRangesObj: public ScNamedRangesObj @@ -328,15 +318,15 @@ private: virtual ScRangeName* GetRangeName_Impl() override; virtual SCTAB GetTab_Impl() override; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > mxSheet; + css::uno::Reference< css::container::XNamed > mxSheet; public: - ScLocalNamedRangesObj(ScDocShell* pDocSh, ::com::sun::star::uno::Reference< com::sun::star::container::XNamed > xNamed ); + ScLocalNamedRangesObj(ScDocShell* pDocSh, css::uno::Reference< css::container::XNamed > xNamed ); virtual ~ScLocalNamedRangesObj(); }; class ScLabelRangeObj : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XLabelRange, - ::com::sun::star::lang::XServiceInfo >, + css::sheet::XLabelRange, + css::lang::XServiceInfo >, public SfxListener { private: @@ -355,28 +345,28 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XLabelRange - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getLabelArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getLabelArea() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabelArea( const css::table::CellRangeAddress& aLabelArea ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getDataArea() + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) + throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScLabelRangesObj : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XLabelRanges, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::lang::XServiceInfo >, + css::sheet::XLabelRanges, + css::container::XEnumerationAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -392,35 +382,35 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XLabelRanges - virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, - const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addNew( const css::table::CellRangeAddress& aLabelArea, + const css::table::CellRangeAddress& aDataArea ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; /// XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; /// XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index 2247d4ef8a77..ca9a3f494fb2 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -34,11 +34,11 @@ class SvxUnoText; class ScPostIt; class ScAnnotationObj : public cppu::WeakImplHelper< - com::sun::star::container::XChild, - com::sun::star::text::XSimpleText, - com::sun::star::sheet::XSheetAnnotation, - com::sun::star::sheet::XSheetAnnotationShapeSupplier, - com::sun::star::lang::XServiceInfo >, + css::container::XChild, + css::text::XSimpleText, + css::sheet::XSheetAnnotation, + css::sheet::XSheetAnnotationShapeSupplier, + css::lang::XServiceInfo >, public SfxListener { public: @@ -48,69 +48,67 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& Parent ) - throw(::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL + getParent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< + css::uno::XInterface >& Parent ) + throw(css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) override; /// XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursorByRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertString( const css::uno::Reference< + css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; /// XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XSheetAnnotation - virtual ::com::sun::star::table::CellAddress SAL_CALL getPosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getPosition() + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAuthor() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDate() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getIsVisible() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; /// XSheetAnnotationShapeSupplier - virtual ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > SAL_CALL + virtual css::uno::Reference < css::drawing::XShape > SAL_CALL getAnnotationShape() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: SvxUnoText& GetUnoText(); diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index 5d04cb79372b..d2d2bcef59d3 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -44,8 +44,8 @@ public: static bool setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ); - static ::com::sun::star::uno::Any getPropertyValue( + const css::uno::Any& aValue ); + static css::uno::Any getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, const OUString& PropertyName ); @@ -65,18 +65,18 @@ public: // get/setPropertyValue override to used stored options instead of document virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index e16f58652ad1..deb2d2d8b0ab 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -44,15 +44,15 @@ public: ScLinkConfigItem( const OUString& rSubTree, ConfigItemMode nMode ); void SetCommitLink( const Link<ScLinkConfigItem&,void>& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; virtual void ImplCommit() override; void SetModified() { ConfigItem::SetModified(); } - com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) + css::uno::Sequence< css::uno::Any> + GetProperties(const css::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } - bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues) + bool PutProperties( const css::uno::Sequence< OUString >& rNames, + const css::uno::Sequence< css::uno::Any>& rValues) { return ConfigItem::PutProperties( rNames, rValues ); } using ConfigItem::EnableNotification; diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index d3d0bec2670d..ebf3b0a8142b 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -35,11 +35,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw(com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index dec2fa00c292..8ab7e8e30f9e 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -75,7 +75,7 @@ private: class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { private: - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; @@ -84,7 +84,7 @@ public: void SetOptions( const ScPrintOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 0b328e07e08c..dc8ce018dd64 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -30,19 +30,19 @@ class ScRange; class ScRangeToSequence { public: - static bool FillLongArray( com::sun::star::uno::Any& rAny, + static bool FillLongArray( css::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static bool FillLongArray( com::sun::star::uno::Any& rAny, + static bool FillLongArray( css::uno::Any& rAny, const ScMatrix* pMatrix ); - static bool FillDoubleArray( com::sun::star::uno::Any& rAny, + static bool FillDoubleArray( css::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static bool FillDoubleArray( com::sun::star::uno::Any& rAny, + static bool FillDoubleArray( css::uno::Any& rAny, const ScMatrix* pMatrix ); - static bool FillStringArray( com::sun::star::uno::Any& rAny, + static bool FillStringArray( css::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static bool FillStringArray( com::sun::star::uno::Any& rAny, + static bool FillStringArray( css::uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ); - static bool FillMixedArray( com::sun::star::uno::Any& rAny, + static bool FillMixedArray( css::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange, bool bAllowNV = false ); @@ -52,7 +52,7 @@ public: implementation of XFormulaParser. If <FALSE/>, boolean values are treated as ordinary double values 1 (true) and 0 (false). */ - static bool FillMixedArray( com::sun::star::uno::Any& rAny, + static bool FillMixedArray( css::uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes = false ); }; @@ -69,8 +69,8 @@ public: */ static bool ConvertAnyToDouble( double & o_fVal, - com::sun::star::uno::TypeClass & o_eClass, - const com::sun::star::uno::Any & rAny ); + css::uno::TypeClass & o_eClass, + const css::uno::Any & rAny ); }; @@ -85,7 +85,7 @@ public: @returns a new'd ScMatrix as ScMatrixRef, NULL if rAny couldn't be read as type Sequence<Sequence<Any>> */ - static ScMatrixRef CreateMixedMatrix( const com::sun::star::uno::Any & rAny ); + static ScMatrixRef CreateMixedMatrix( const css::uno::Any & rAny ); }; @@ -94,7 +94,7 @@ class ScByteSequenceToString public: // rAny must contain Sequence<sal_Int8>, // may or may not contain 0-bytes at the end - static bool GetString( OUString& rString, const com::sun::star::uno::Any& rAny, + static bool GetString( OUString& rString, const css::uno::Any& rAny, sal_uInt16 nEncoding ); }; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 90e5873820f9..c30880816609 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -158,7 +158,7 @@ public: /// String to Range API static bool GetAddressFromString( - ::com::sun::star::table::CellAddress& rAddress, + css::table::CellAddress& rAddress, const OUString& rAddressStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -166,7 +166,7 @@ public: sal_Unicode cSeparator = ' ', sal_Unicode cQuote = '\''); static bool GetRangeFromString( - ::com::sun::star::table::CellRangeAddress& rRange, + css::table::CellRangeAddress& rRange, const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -211,7 +211,7 @@ public: /// Range to String API static void GetStringFromAddress( OUString& rString, - const ::com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', @@ -219,7 +219,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( OUString& rString, - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', @@ -227,7 +227,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( OUString& rString, - const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, + const css::uno::Sequence< css::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 82c866ecd01d..c2373aada6f4 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -242,7 +242,7 @@ class AbstractScDPFunctionDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetFuncMask() const = 0; - virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const = 0; + virtual css::sheet::DataPilotFieldReference GetFieldRef() const = 0; }; class AbstractScDPSubtotalDlg : public VclAbstractDialog @@ -351,7 +351,7 @@ public: bool bEnableExternal) = 0; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices, + const css::uno::Sequence<OUString>& rServices, int nId ) = 0; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false) = 0 ; diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index 37a5f46a2984..368b5ce5ea83 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -96,9 +96,9 @@ class ScServiceProvider { public: // pDocShell is not needed for all Services - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + static css::uno::Reference< css::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); - static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames(); + static css::uno::Sequence<OUString> GetAllServiceNames(); static sal_uInt16 GetProviderType(const OUString& rServiceName); }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index d9fa07ba357b..3d24fa5afa09 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -49,15 +49,15 @@ class ScMacroInfo; // object which aggregates all svx shape objects, // to add own properties -typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::text::XTextContent - , ::com::sun::star::document::XEventsSupplier - , ::com::sun::star::lang::XServiceInfo +typedef ::cppu::WeakImplHelper < css::beans::XPropertySet + , css::beans::XPropertyState + , css::text::XTextContent + , css::document::XEventsSupplier + , css::lang::XServiceInfo > ScShapeObj_Base; -typedef ::cppu::ImplHelper1 < ::com::sun::star::text::XText +typedef ::cppu::ImplHelper1 < css::text::XText > ScShapeObj_TextBase; -typedef ::cppu::ImplHelper1 < ::com::sun::star::container::XChild +typedef ::cppu::ImplHelper1 < css::container::XChild > ScShapeObj_ChildBase; class ScShapeObj :public ScShapeObj_Base ,public ScShapeObj_TextBase @@ -65,14 +65,14 @@ class ScShapeObj :public ScShapeObj_Base { private: friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, bool bCreate ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg; + css::uno::Reference< css::uno::XAggregation > mxShapeAgg; // cached pointers to avoid repeated queryAggregation calls: - ::com::sun::star::beans::XPropertySet* pShapePropertySet; - ::com::sun::star::beans::XPropertyState* pShapePropertyState; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo; - bool bIsTextShape; - bool bIsNoteCaption; - bool bInitializedNotifier; + css::beans::XPropertySet* pShapePropertySet; + css::beans::XPropertyState* pShapePropertyState; + css::uno::Reference< css::beans::XPropertySetInfo > mxPropSetInfo; + bool bIsTextShape; + bool bIsNoteCaption; + bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); @@ -85,163 +85,147 @@ public: static const SvEventDescription* GetSupportedMacroItems(); // ctor modifies xShape parameter - ScShapeObj( ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > & xShape ); + ScShapeObj( css::uno::Reference< + css::drawing::XShape > & xShape ); virtual ~ScShapeObj(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< - OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL + virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & aListener) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & aListener) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) + throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) + throw( css::uno::RuntimeException, std::exception ) override; // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent, + virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, + const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursorByRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) - throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) + throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override ; + throw (css::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 08af11933888..268b14c03c25 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -57,7 +57,7 @@ struct SC_DLLPUBLIC ScSortParam SCROW nDestRow; ::std::vector<ScSortKeyState> maKeyState; - ::com::sun::star::lang::Locale aCollatorLocale; + css::lang::Locale aCollatorLocale; OUString aCollatorAlgorithm; sal_uInt16 nCompatHeader; diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index f32b74ca56b6..405c91d5d140 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -29,9 +29,9 @@ class SvxSearchItem; class ScCellSearchObj : public cppu::WeakImplHelper< - com::sun::star::util::XReplaceDescriptor, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo > + css::util::XReplaceDescriptor, + css::lang::XUnoTunnel, + css::lang::XServiceInfo > { private: SfxItemPropertySet aPropSet; @@ -44,73 +44,68 @@ public: SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReplaceString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XSearchDescriptor - virtual OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSearchString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // search/replace should be called from outside (from XSearchable)... // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellSearchObj* getImplementation(const css::uno::Reference<css::util::XSearchDescriptor>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index f6de51e86357..b76632e611a9 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -46,10 +46,10 @@ class ScStyleFamilyObj; class ScStyleObj; class ScStyleFamiliesObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::style::XStyleLoader2, - ::com::sun::star::lang::XServiceInfo >, + css::container::XIndexAccess, + css::container::XNameAccess, + css::style::XStyleLoader2, + css::lang::XServiceInfo >, public SfxListener { private: @@ -66,62 +66,59 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XStyleLoader virtual void SAL_CALL loadStylesFromURL( const OUString& URL, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aOptions ) - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) + throw(css::io::IOException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getStyleLoaderOptions() throw(css::uno::RuntimeException, std::exception) override; //XStyleLoader2 - virtual void SAL_CALL loadStylesFromDocument( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XComponent > & aSourceComponent, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aOptions ) - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadStylesFromDocument( const css::uno::Reference < css::lang::XComponent > & aSourceComponent, + const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) + throw(css::io::IOException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: void loadStylesFromDocShell( ScDocShell* pSource, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& aOptions ) - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + const css::uno::Sequence< css::beans::PropertyValue>& aOptions ) + throw(css::io::IOException, + css::uno::RuntimeException, std::exception); }; class ScStyleFamilyObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameContainer, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo >, + css::container::XNameContainer, + css::container::XIndexAccess, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: @@ -139,84 +136,84 @@ public: // XNameContainer 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameReplace 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, std::exception) override; + const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNameAccess - 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScStyleObj : public ::cppu::WeakImplHelper< - ::com::sun::star::style::XStyle, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XMultiPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::beans::XMultiPropertyStates, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo >, + css::style::XStyle, + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::beans::XPropertyState, + css::beans::XMultiPropertyStates, + css::lang::XUnoTunnel, + css::lang::XServiceInfo >, public SfxListener { private: @@ -229,9 +226,9 @@ private: const SfxItemSet* GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); void SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, - const ::com::sun::star::uno::Any* pValue ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any* pValue ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception); ScStyleObj(); // disabled @@ -246,136 +243,127 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > + static css::uno::Reference< css::container::XIndexReplace > CreateEmptyNumberingRules(); // XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUserDefined() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isInUse() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getParentStyle() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Sequence< css::uno::Any >& aValues ) + throw (css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL + getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< - OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, + throw(css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XMultiPropertyStates // getPropertyStates already defined for XPropertyState virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< - OUString >& aPropertyNames ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyDefaults( const ::com::sun::star::uno::Sequence< - OUString >& aPropertyNames ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL + getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScStyleObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); }; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 45ed46982ac5..3ae472becd9c 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -793,8 +793,8 @@ public: void RemoveColBreak(SCCOL nCol, bool bPage, bool bManual); void SetRowBreak(SCROW nRow, bool bPage, bool bManual); void SetColBreak(SCCOL nCol, bool bPage, bool bManual); - ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const; + css::uno::Sequence< + css::sheet::TablePageBreakData> GetRowBreakData() const; bool RowHidden(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const; bool RowHiddenLeaf(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const; diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index a12ba1d3c2ee..9a7ba8da2766 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -50,7 +50,7 @@ public: virtual ~ScTableLink(); virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) override; diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index 7e0825609449..066f8c4fdbe4 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -62,10 +62,10 @@ public: virtual bool isPasswordEmpty() const = 0; virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const = 0; virtual void setPassword(const OUString& aPassText) = 0; - virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( + virtual css::uno::Sequence<sal_Int8> getPasswordHash( ScPasswordHash eHash, ScPasswordHash eHas2 = PASSHASH_UNSPECIFIED) const = 0; virtual void setPasswordHash( - const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, + const css::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0; virtual bool verifyPassword(const OUString& aPassText) const = 0; }; @@ -92,10 +92,10 @@ public: virtual bool isPasswordEmpty() const override; virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPassword(const OUString& aPassText) override; - virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( + virtual css::uno::Sequence<sal_Int8> getPasswordHash( ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPasswordHash( - const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, + const css::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; virtual bool verifyPassword(const OUString& aPassText) const override; @@ -178,10 +178,10 @@ public: virtual bool isPasswordEmpty() const override; virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPassword(const OUString& aPassText) override; - virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( + virtual css::uno::Sequence<sal_Int8> getPasswordHash( ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPasswordHash( - const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, + const css::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; virtual bool verifyPassword(const OUString& aPassText) const override; diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 5b465ce9f601..a21b8e5abc29 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -63,8 +63,8 @@ class ScDocShell; //! Graphic / OleObject (need separate collections!) class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo >, + css::container::XNameAccess, + css::lang::XServiceInfo >, public SfxListener { private: @@ -77,28 +77,28 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - // ::com::sun::star::container::XNameAccess - 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, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XNameAccess + virtual css::uno::Any SAL_CALL getByName(const OUString& aName) + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; + + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; + + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; }; class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::document::XLinkTargetSupplier, - ::com::sun::star::lang::XServiceInfo >, + css::beans::XPropertySet, + css::document::XLinkTargetSupplier, + css::lang::XServiceInfo >, public SfxListener { private: @@ -112,78 +112,78 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); + static void SetLinkTargetBitmap( css::uno::Any& rRet, sal_uInt16 nType ); - // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue) + throw( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::document::XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + // css::document::XLinkTargetSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) override; + + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; }; class ScLinkTargetsObj : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo > + css::container::XNameAccess, + css::lang::XServiceInfo > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xCollection; + css::uno::Reference< css::container::XNameAccess > xCollection; public: - ScLinkTargetsObj( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & rColl ); + ScLinkTargetsObj( const css::uno::Reference< css::container::XNameAccess > & rColl ); virtual ~ScLinkTargetsObj(); - // ::com::sun::star::container::XNameAccess - 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, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XNameAccess + virtual css::uno::Any SAL_CALL getByName(const OUString& aName) + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; + + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; + + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 11b692474b75..9a641572d4ff 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -57,9 +57,9 @@ struct ScHeaderFieldData; // the page template using setPropertyValue class ScHeaderFooterContentObj : public cppu::WeakImplHelper< - com::sun::star::sheet::XHeaderFooterContent, - com::sun::star::lang::XUnoTunnel, - com::sun::star::lang::XServiceInfo > + css::sheet::XHeaderFooterContent, + css::lang::XUnoTunnel, + css::lang::XServiceInfo > { private: rtl::Reference<ScHeaderFooterTextObj> mxLeftText; @@ -80,28 +80,28 @@ public: const EditTextObject* GetRightEditObject() const; // XHeaderFooterContent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getLeftText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getCenterText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getRightText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getLeftText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getCenterText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getRightText() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static rtl::Reference<ScHeaderFooterContentObj> getImplementation(const css::uno::Reference<css::sheet::XHeaderFooterContent>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj @@ -140,11 +140,11 @@ public: * ScHeaderFooterTextObj changes the text in a ScHeaderFooterContentObj. */ class ScHeaderFooterTextObj : public cppu::WeakImplHelper< - com::sun::star::text::XText, - com::sun::star::text::XTextRangeMover, - com::sun::star::container::XEnumerationAccess, - com::sun::star::text::XTextFieldsSupplier, - com::sun::star::lang::XServiceInfo > + css::text::XText, + css::text::XTextRangeMover, + css::container::XEnumerationAccess, + css::text::XTextFieldsSupplier, + css::lang::XServiceInfo > { private: ScHeaderFooterTextData aTextData; @@ -163,74 +163,67 @@ public: static void FillDummyFieldData( ScHeaderFieldData& rData ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent, + virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, + const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xContent ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursorByRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursor() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL + createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XTextRangeMover - virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + virtual void SAL_CALL moveTextRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nParagraphs ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XTextFieldsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL + getTextFields() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; // derived cursor objects for getImplementation and getText/getStart/getEnd @@ -249,19 +242,18 @@ public: ScCellObj& GetCellObj() const { return rTextObj; } // SvxUnoTextCursor methods reimplemented here: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellTextCursor* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj); }; @@ -276,48 +268,45 @@ public: virtual ~ScHeaderFooterTextCursor() throw(); // SvxUnoTextCursor methods reimplemented here: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScHeaderFooterTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); }; class ScDrawTextCursor : public SvxUnoTextCursor { private: - com::sun::star::uno::Reference< com::sun::star::text::XText > xParentText; + css::uno::Reference< css::text::XText > xParentText; public: ScDrawTextCursor(const ScDrawTextCursor& rOther); - ScDrawTextCursor( const com::sun::star::uno::Reference< - com::sun::star::text::XText >& xParent, + ScDrawTextCursor( const css::uno::Reference< css::text::XText >& xParent, const SvxUnoTextBase& rText ); virtual ~ScDrawTextCursor() throw(); // SvxUnoTextCursor methods reimplemented here: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL + getText() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getStart() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL + getEnd() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScDrawTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); }; diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index f643aeaa4dd4..f28d24eada64 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -41,22 +41,22 @@ public: static SC_DLLPUBLIC bool ConvertToTokenArray( ScDocument& rDoc, ScTokenArray& rTokenArray, - const com::sun::star::uno::Sequence< com::sun::star::sheet::FormulaToken >& rSequence ); + const css::uno::Sequence< css::sheet::FormulaToken >& rSequence ); static SC_DLLPUBLIC bool ConvertToTokenSequence( const ScDocument& rDoc, - com::sun::star::uno::Sequence< com::sun::star::sheet::FormulaToken >& rSequence, + css::uno::Sequence< css::sheet::FormulaToken >& rSequence, const ScTokenArray& rTokenArray ); }; class ScFormulaParserObj : public ::cppu::WeakImplHelper< - ::com::sun::star::sheet::XFormulaParser, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo >, + css::sheet::XFormulaParser, + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SfxListener { private: - ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::FormulaOpCodeMapEntry > maOpCodeMapping; - ::com::sun::star::uno::Sequence<com::sun::star::sheet::ExternalLinkInfo> maExternalLinks; + css::uno::Sequence< const css::sheet::FormulaOpCodeMapEntry > maOpCodeMapping; + css::uno::Sequence<css::sheet::ExternalLinkInfo> maExternalLinks; ScCompiler::OpCodeMapPtr mxOpCodeMap; ScDocShell* mpDocShell; sal_Int16 mnConv; @@ -73,64 +73,58 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XFormulaParser - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula( + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula( const OUString& aFormula, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw (::com::sun::star::uno::RuntimeException, + const css::table::CellAddress& rReferencePos ) + throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< - ::com::sun::star::sheet::FormulaToken >& aTokens, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL printFormula( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens, + const css::table::CellAddress& rReferencePos ) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index b623e9c72811..91617f7baf6f 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -141,9 +141,9 @@ class ScViewCfg : public ScViewOptions DECL_LINK_TYPED( DisplayCommitHdl, ScLinkConfigItem&, void ); DECL_LINK_TYPED( GridCommitHdl, ScLinkConfigItem&, void ); - static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetDisplayPropertyNames(); - static com::sun::star::uno::Sequence<OUString> GetGridPropertyNames(); + static css::uno::Sequence<OUString> GetLayoutPropertyNames(); + static css::uno::Sequence<OUString> GetDisplayPropertyNames(); + static css::uno::Sequence<OUString> GetGridPropertyNames(); public: ScViewCfg(); diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index fd5da4a1561c..e90e7ad9009b 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -50,11 +50,11 @@ class ScPreviewShell; // ScViewPaneBase not derived from OWeakObject // to avoid duplicate OWeakObject in ScTabViewObj -class ScViewPaneBase : public com::sun::star::sheet::XViewPane, - public com::sun::star::sheet::XCellRangeReferrer, - public com::sun::star::view::XFormLayerAccess, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XTypeProvider, +class ScViewPaneBase : public css::sheet::XViewPane, + public css::sheet::XCellRangeReferrer, + public css::view::XFormLayerAccess, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, public SfxListener { private: @@ -62,7 +62,7 @@ private: sal_uInt16 nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE protected: - ::com::sun::star::awt::Rectangle GetVisArea() const; + css::awt::Rectangle GetVisArea() const; public: ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP); @@ -70,59 +70,56 @@ public: ScTabViewShell* GetViewShell() const { return pViewShell; } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XViewPane - virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() - throw(::com::sun::star::uno::RuntimeException, + virtual css::table::CellRangeAddress SAL_CALL getVisibleRange() + throw(css::uno::RuntimeException, std::exception) override; // XCellRangeReferrer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL + getReferredCells() throw(css::uno::RuntimeException, std::exception) override; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL - getFormController( const ::com::sun::star::uno::Reference< - ::com::sun::star::form::XForm >& Form ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL + getFormController( const css::uno::Reference< css::form::XForm >& Form ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFormDesignMode( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL - getControl( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XControlModel >& xModel ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL + getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; }; // ScViewPaneObj for direct use (including OWeakObject) @@ -133,9 +130,8 @@ public: ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP); virtual ~ScViewPaneObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; }; @@ -144,19 +140,19 @@ public: class ScTabViewObj : public ScViewPaneBase, public SfxBaseController, - public com::sun::star::sheet::XSpreadsheetView, - public com::sun::star::sheet::XEnhancedMouseClickBroadcaster, - public com::sun::star::sheet::XActivationBroadcaster, - public com::sun::star::container::XEnumerationAccess, - public com::sun::star::container::XIndexAccess, - public com::sun::star::view::XSelectionSupplier, - public com::sun::star::beans::XPropertySet, - public com::sun::star::sheet::XViewSplitable, - public com::sun::star::sheet::XViewFreezable, - public com::sun::star::sheet::XRangeSelection, - public com::sun::star::lang::XUnoTunnel, - public com::sun::star::datatransfer::XTransferableSupplier, - public com::sun::star::sheet::XSelectedSheetsSupplier + public css::sheet::XSpreadsheetView, + public css::sheet::XEnhancedMouseClickBroadcaster, + public css::sheet::XActivationBroadcaster, + public css::container::XEnumerationAccess, + public css::container::XIndexAccess, + public css::view::XSelectionSupplier, + public css::beans::XPropertySet, + public css::sheet::XViewSplitable, + public css::sheet::XViewFreezable, + public css::sheet::XRangeSelection, + public css::lang::XUnoTunnel, + public css::datatransfer::XTransferableSupplier, + public css::sheet::XSelectedSheetsSupplier { private: typedef std::vector<css::uno::Reference<css::sheet::XRangeSelectionListener> > XRangeSelectionListenerVector; @@ -183,7 +179,7 @@ private: sal_Int16 GetZoomType() const; void SetZoomType(sal_Int16 ZoomType); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const; + css::uno::Reference< css::uno::XInterface > GetClickedObject(const Point& rPoint) const; void EndMouseListening(); void EndActivationListening(); bool mbLeftMousePressed; @@ -193,9 +189,8 @@ public: ScTabViewObj(ScTabViewShell* pViewSh); virtual ~ScTabViewObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -204,208 +199,192 @@ public: // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet void SheetChanged( bool bSameTabButMoved = false ); bool IsMouseListening() const; - bool MousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - bool MouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + bool MousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException); + bool MouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException); void RangeSelDone( const OUString& rText ); void RangeSelAborted( const OUString& rText ); void RangeSelChanged( const OUString& rText ); // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection() - throw(::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getSelection() + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; //! XPrintable? // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL + createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XSpreadsheetView - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getActiveSheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet ) - throw(::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL + getActiveSheet() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveSheet( const css::uno::Reference< css::sheet::XSpreadsheet >& xActiveSheet ) + throw(css::uno::RuntimeException, std::exception) override; //XEnhancedMouseClickBroadcaster - virtual void SAL_CALL addEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addEnhancedMouseClickHandler( const css::uno::Reference< + css::awt::XEnhancedMouseClickHandler >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEnhancedMouseClickHandler( const css::uno::Reference< css::awt::XEnhancedMouseClickHandler >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; //XActivationBroadcaster - virtual void SAL_CALL addActivationEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XActivationEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActivationEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XActivationEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; // XViewSplitable - virtual sal_Bool SAL_CALL getIsWindowSplit() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsWindowSplit() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSplitVertical() throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSplitColumn() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSplitRow() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XViewFreezable - virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasFrozenPanes() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XRangeSelection - virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aArguments ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL startRangeSelection( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL abortRangeSelection() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL removeRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTabViewObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; // XTransferableSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable() + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) - throw(::com::sun::star::datatransfer::UnsupportedFlavorException, - ::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) + throw(css::datatransfer::UnsupportedFlavorException, + css::uno::RuntimeException, std::exception) override; // XSelectedSheetsSupplier - virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() + throw(css::uno::RuntimeException, std::exception) override; }; class ScPreviewObj : public SfxBaseController, public SfxListener, - public com::sun::star::sheet::XSelectedSheetsSupplier + public css::sheet::XSelectedSheetsSupplier { ScPreviewShell* mpViewShell; public: ScPreviewObj(ScPreviewShell* pViewSh); virtual ~ScPreviewObj(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -413,8 +392,8 @@ public: virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override; // XSelectedSheetsSupplier - virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() + throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index 817ac2c14415..d0e88122fb22 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -51,24 +51,24 @@ class ScXMLImportWrapper ScDocShell& mrDocShell; ScDocument& rDoc; SfxMedium* pMedium; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage; + css::uno::Reference< css::embed::XStorage > xStorage; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator(); + css::uno::Reference< css::task::XStatusIndicator> GetStatusIndicator(); - sal_uInt32 ImportFromComponent(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext, - com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel, - com::sun::star::uno::Reference<com::sun::star::xml::sax::XParser>& xParser, - com::sun::star::xml::sax::InputSource& aParserInput, + sal_uInt32 ImportFromComponent(const css::uno::Reference<css::uno::XComponentContext>& xContext, + css::uno::Reference<css::frame::XModel>& xModel, + css::uno::Reference<css::xml::sax::XParser>& xParser, + css::xml::sax::InputSource& aParserInput, const OUString& sComponentName, const OUString& sDocName, const OUString& sOldDocName, - com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs, + css::uno::Sequence<css::uno::Any>& aArgs, bool bMustBeSuccessfull); - bool ExportToComponent(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext, - com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel, - com::sun::star::uno::Reference<com::sun::star::xml::sax::XWriter>& xWriter, - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aDescriptor, + bool ExportToComponent(const css::uno::Reference<css::uno::XComponentContext>& xContext, + css::uno::Reference<css::frame::XModel>& xModel, + css::uno::Reference<css::xml::sax::XWriter>& xWriter, + css::uno::Sequence<css::beans::PropertyValue>& aDescriptor, const OUString& sName, const OUString& sMediaType, const OUString& sComponentName, - com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs, + css::uno::Sequence<css::uno::Any>& aArgs, ScMySharedData*& pSharedData); public: @@ -91,12 +91,12 @@ public: class ScXMLChartExportWrapper { public: - ScXMLChartExportWrapper( com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel, SfxMedium& rMed ); + ScXMLChartExportWrapper( css::uno::Reference< css::frame::XModel > xModel, SfxMedium& rMed ); bool Export(); private: - com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > mxStorage; + css::uno::Reference< css::frame::XModel > mxModel; + css::uno::Reference< css::embed::XStorage > mxStorage; SfxMedium& mrMedium; }; |