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 | |
| parent | 5d3c37b99e8bfa9256f12015152439bf4e5ebbb4 (diff) | |
com::sun::star->css in sc
Change-Id: I7774890f46f9343e944e34db27af8bce3b1d0915
408 files changed, 7352 insertions, 8155 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; }; diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 33faa9f95484..bfd0bf33917c 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -71,7 +71,7 @@ void ScMacrosTest::testMSP() const OUString aFileNameBase("MasterScriptProviderProblem.ods"); OUString aFileName; createFileURL(aFileNameBase, aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load MasterScriptProviderProblem.ods", xComponent.is()); @@ -103,7 +103,7 @@ void ScMacrosTest::testPasswordProtectedStarBasic() const OUString aFileNameBase("testTypePassword.ods"); OUString aFileName; createFileURL(aFileNameBase, aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load testTypePassword.ods", xComponent.is()); @@ -158,7 +158,7 @@ void ScMacrosTest::testStarBasic() const OUString aFileNameBase("StarBasic.ods"); OUString aFileName; createFileURL(aFileNameBase, aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); @@ -302,7 +302,7 @@ void ScMacrosTest::testVba() { OUString aFileName; createFileURL(testInfo[i].sFileBaseName + "xls", aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); OUString sMsg( "Failed to load " + aFileName ); CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); diff --git a/sc/qa/extras/recordchanges-test.cxx b/sc/qa/extras/recordchanges-test.cxx index fa3b36ea80c1..993841e62974 100644 --- a/sc/qa/extras/recordchanges-test.cxx +++ b/sc/qa/extras/recordchanges-test.cxx @@ -37,7 +37,7 @@ public: void ScRecordChangesTest::testSetRecordChanges() { - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop("private:factory/scalc"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop("private:factory/scalc"); uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xDocSettingsPropSet (xDoc, UNO_QUERY_THROW); @@ -67,7 +67,7 @@ void ScRecordChangesTest::testCheckRecordChangesProtection() // test with protected changes OUString aFileName; createFileURL( "RecordChangesProtected.ods", aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName); uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xDocSettingsPropSet (xDoc, UNO_QUERY_THROW); diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index ba3cca23a0e2..1ac0b9387b03 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -74,7 +74,7 @@ void ScChartRegressionTest::test() { OUString aFileName; createFileURL( "testChart.ods", aFileName); - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(xComponent.is()); diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 2868b8a11365..43d0d6ee948f 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -126,7 +126,7 @@ void ScConditionalFormatTest::testUndoAnchor() OUString aFileURL; createFileURL(OUString("document_with_linked_graphic.ods"), aFileURL); // open the document with graphic included - uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileURL); + uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(xComponent.is()); // Get the document model diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 352e38e4bf90..5eff7d4bf7d6 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -552,7 +552,7 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, { pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword)); } - pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); + pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); SAL_INFO( "sc.qa", "about to load " << rURL ); if (!xDocShRef->DoLoad(pSrcMed)) { diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 06e3c1695371..de6598c29b6c 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -382,7 +382,7 @@ long ScColumn::GetNeededSize( if ( static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index b72a5adf83e6..be54ecd50e1a 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1519,37 +1519,37 @@ ScConditionMode ScConditionEntry::GetModeFromApi(sal_Int32 nOperation) ScConditionMode eMode = SC_COND_NONE; switch (nOperation) { - case com::sun::star::sheet::ConditionOperator2::EQUAL: + case css::sheet::ConditionOperator2::EQUAL: eMode = SC_COND_EQUAL; break; - case com::sun::star::sheet::ConditionOperator2::LESS: + case css::sheet::ConditionOperator2::LESS: eMode = SC_COND_LESS; break; - case com::sun::star::sheet::ConditionOperator2::GREATER: + case css::sheet::ConditionOperator2::GREATER: eMode = SC_COND_GREATER; break; - case com::sun::star::sheet::ConditionOperator2::LESS_EQUAL: + case css::sheet::ConditionOperator2::LESS_EQUAL: eMode = SC_COND_EQLESS; break; - case com::sun::star::sheet::ConditionOperator2::GREATER_EQUAL: + case css::sheet::ConditionOperator2::GREATER_EQUAL: eMode = SC_COND_EQGREATER; break; - case com::sun::star::sheet::ConditionOperator2::NOT_EQUAL: + case css::sheet::ConditionOperator2::NOT_EQUAL: eMode = SC_COND_NOTEQUAL; break; - case com::sun::star::sheet::ConditionOperator2::BETWEEN: + case css::sheet::ConditionOperator2::BETWEEN: eMode = SC_COND_BETWEEN; break; - case com::sun::star::sheet::ConditionOperator2::NOT_BETWEEN: + case css::sheet::ConditionOperator2::NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break; - case com::sun::star::sheet::ConditionOperator2::FORMULA: + case css::sheet::ConditionOperator2::FORMULA: eMode = SC_COND_DIRECT; break; - case com::sun::star::sheet::ConditionOperator2::DUPLICATE: + case css::sheet::ConditionOperator2::DUPLICATE: eMode = SC_COND_DUPLICATE; break; - case com::sun::star::sheet::ConditionOperator2::NOT_DUPLICATE: + case css::sheet::ConditionOperator2::NOT_DUPLICATE: eMode = SC_COND_NOTDUPLICATE; break; default: diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index d499ec98ab36..e7d554c11859 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -701,7 +701,7 @@ void ScDocument::UpdateChartListenerCollection() { uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); OSL_ENSURE( xIPObj.is(), "No embedded object is given!"); - uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; + uno::Reference< css::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xIPObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 169d32ec1b5e..dccdfc51e42d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -578,7 +578,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const else { OUString aQueryStr = rEntry.GetQueryItem().maString.getString(); - ::com::sun::star::uno::Sequence< sal_Int32 > xOff; + css::uno::Sequence< sal_Int32 > xOff; OUString aCell = pTransliteration->transliterate( aCellStr, ScGlobal::eLnge, 0, aCellStr.getLength(), &xOff); OUString aQuer = pTransliteration->transliterate( diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index d98dc3f9cff8..cfd0c7e0712a 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -824,7 +824,7 @@ OUString ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, const std::vector<OUString>* pDeletedNames ) { - using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; + using namespace css::sheet::DataPilotFieldGroupBy; OUString aPartName; switch( nDatePart ) { diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index a8ad62db3ba4..17f739e1f1db 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -280,21 +280,21 @@ bool isDateInGroup(const ScDPItemData& rGroupItem, const ScDPItemData& rChildIte switch (nChildPart) // inner part { - case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: + case css::sheet::DataPilotFieldGroupBy::MONTHS: // a month is only contained in its quarter - if (nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS) + if (nGroupPart == css::sheet::DataPilotFieldGroupBy::QUARTERS) // months and quarters are both 1-based return (nGroupValue - 1 == (nChildValue - 1) / 3); break; - case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS: + case css::sheet::DataPilotFieldGroupBy::DAYS: // a day is only contained in its quarter or month - if (nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS || - nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS) + if (nGroupPart == css::sheet::DataPilotFieldGroupBy::MONTHS || + nGroupPart == css::sheet::DataPilotFieldGroupBy::QUARTERS) { Date aDate(1, 1, SC_DP_LEAPYEAR); aDate += (nChildValue - 1); // days are 1-based sal_Int32 nCompare = aDate.GetMonth(); - if (nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS) + if (nGroupPart == css::sheet::DataPilotFieldGroupBy::QUARTERS) nCompare = ( ( nCompare - 1 ) / 3 ) + 1; // get quarter from date return nGroupValue == nCompare; diff --git a/sc/source/core/data/dpresfilter.cxx b/sc/source/core/data/dpresfilter.cxx index d4895b825130..02b3d80244bb 100644 --- a/sc/source/core/data/dpresfilter.cxx +++ b/sc/source/core/data/dpresfilter.cxx @@ -224,7 +224,7 @@ const ScDPResultTree::ValuesType* ScDPResultTree::getResults( return &pMember->maValues; } -double ScDPResultTree::getLeafResult(const com::sun::star::sheet::DataPilotFieldFilter& rFilter) const +double ScDPResultTree::getLeafResult(const css::sheet::DataPilotFieldFilter& rFilter) const { NamePairType aPair( ScGlobal::pCharClass->uppercase(rFilter.FieldName), diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 2e97565dc54f..d3a6217b53e5 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -1511,18 +1511,18 @@ void ScDPSaveData::DimensionsChanged() mpDimOrder.reset(); } -bool operator == (const ::com::sun::star::sheet::DataPilotFieldSortInfo &l, const ::com::sun::star::sheet::DataPilotFieldSortInfo &r ) +bool operator == (const css::sheet::DataPilotFieldSortInfo &l, const css::sheet::DataPilotFieldSortInfo &r ) { return l.Field == r.Field && l.IsAscending == r.IsAscending && l.Mode == r.Mode; } -bool operator == (const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &l, const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &r ) +bool operator == (const css::sheet::DataPilotFieldAutoShowInfo &l, const css::sheet::DataPilotFieldAutoShowInfo &r ) { return l.IsEnabled == r.IsEnabled && l.ShowItemsMode == r.ShowItemsMode && l.ItemCount == r.ItemCount && l.DataField == r.DataField; } -bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, const ::com::sun::star::sheet::DataPilotFieldReference &r ) +bool operator == (const css::sheet::DataPilotFieldReference &l, const css::sheet::DataPilotFieldReference &r ) { return l.ReferenceType == r.ReferenceType && l.ReferenceField == r.ReferenceField && diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index bd9950bb6552..24e7fec60cf2 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -2484,14 +2484,14 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const { nVal = nIndex; // DayOfWeek is 0-based aName = ScGlobal::GetCalendar()->getDisplayName( - ::com::sun::star::i18n::CalendarDisplayIndex::DAY, + css::i18n::CalendarDisplayIndex::DAY, sal::static_int_cast<sal_Int16>(nVal), 0 ); } else if ( nHier == SC_DAPI_HIERARCHY_QUARTER && nLev == SC_DAPI_LEVEL_MONTH ) { nVal = nIndex; // Month is 0-based aName = ScGlobal::GetCalendar()->getDisplayName( - ::com::sun::star::i18n::CalendarDisplayIndex::MONTH, + css::i18n::CalendarDisplayIndex::MONTH, sal::static_int_cast<sal_Int16>(nVal), 0 ); } else diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 510d391f9bc6..bdf59eebe3a6 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -113,7 +113,7 @@ OUString ScDPUtil::getDateGroupName( return OUString::number(nValue); case sheet::DataPilotFieldGroupBy::QUARTERS: return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1)); // nValue is 1-based - case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: + case css::sheet::DataPilotFieldGroupBy::MONTHS: return ScGlobal::GetCalendar()->getDisplayName( i18n::CalendarDisplayIndex::MONTH, sal_Int16(nValue-1), 0); // 0-based, get short name case sheet::DataPilotFieldGroupBy::DAYS: @@ -337,16 +337,16 @@ sal_Int32 ScDPUtil::getDatePartValue( switch ( nDatePart ) { - case com::sun::star::sheet::DataPilotFieldGroupBy::YEARS: + case css::sheet::DataPilotFieldGroupBy::YEARS: nResult = aDate.GetYear(); break; - case com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS: + case css::sheet::DataPilotFieldGroupBy::QUARTERS: nResult = 1 + (aDate.GetMonth() - 1) / 3; // 1..4 break; - case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: + case css::sheet::DataPilotFieldGroupBy::MONTHS: nResult = aDate.GetMonth(); // 1..12 break; - case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS: + case css::sheet::DataPilotFieldGroupBy::DAYS: { Date aYearStart(1, 1, aDate.GetYear()); nResult = (aDate - aYearStart) + 1; // Jan 01 has value 1 @@ -398,7 +398,7 @@ OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc return aRet.makeStringAndClear(); } -ScSubTotalFunc ScDPUtil::toSubTotalFunc(com::sun::star::sheet::GeneralFunction eGenFunc) +ScSubTotalFunc ScDPUtil::toSubTotalFunc(css::sheet::GeneralFunction eGenFunc) { ScSubTotalFunc eSubTotal; switch (eGenFunc) diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 3594c1d0c9aa..1bc969d1080a 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -59,7 +59,7 @@ ScDrawPage* ScDrawPage::Clone(SdrModel* const pNewModel) const return pNewPage; } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawPage::createUnoPage() +css::uno::Reference< css::uno::XInterface > ScDrawPage::createUnoPage() { return static_cast<cppu::OWeakObject*>( new ScPageObj( this ) ); } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 6a7429fbe6b2..071f39861af2 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -353,7 +353,7 @@ void ScDrawLayer::UseHyphenator() { if (!bHyphenatorSet) { - com::sun::star::uno::Reference< com::sun::star::linguistic2::XHyphenator > + css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator = LinguMgr::GetHyphenator(); GetDrawOutliner().SetHyphenator( xHyphenator ); @@ -2130,9 +2130,9 @@ void ScDrawLayer::SetChanged( bool bFlg /* = true */ ) FmFormModel::SetChanged( bFlg ); } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawLayer::createUnoModel() +css::uno::Reference< css::uno::XInterface > ScDrawLayer::createUnoModel() { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; + css::uno::Reference< css::uno::XInterface > xRet; if( pDoc && pDoc->GetDocumentShell() ) xRet = pDoc->GetDocumentShell()->GetModel(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 272ff854bce6..90d31e9d2160 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -91,7 +91,7 @@ ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL; ScUserList* ScGlobal::pUserList = NULL; OUString** ScGlobal::ppRscString = NULL; LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM; -::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL; +css::lang::Locale* ScGlobal::pLocale = NULL; SvtSysLocale* ScGlobal::pSysLocale = NULL; const CharClass* ScGlobal::pCharClass = NULL; const LocaleDataWrapper* ScGlobal::pLocaleData = NULL; @@ -100,7 +100,7 @@ CollatorWrapper* ScGlobal::pCollator = NULL; CollatorWrapper* ScGlobal::pCaseCollator = NULL; ::utl::TransliterationWrapper* ScGlobal::pTransliteration = NULL; ::utl::TransliterationWrapper* ScGlobal::pCaseTransliteration = NULL; -::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = NULL; +css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = NULL; IntlWrapper* ScGlobal::pScIntlWrapper = NULL; sal_Unicode ScGlobal::cListDelimiter = ','; OUString* ScGlobal::pEmptyOUString = NULL; @@ -1122,11 +1122,11 @@ IntlWrapper* ScGlobal::GetScIntlWrapper() } return pScIntlWrapper; } -::com::sun::star::lang::Locale* ScGlobal::GetLocale() +css::lang::Locale* ScGlobal::GetLocale() { if ( !pLocale ) { - pLocale = new ::com::sun::star::lang::Locale( Application::GetSettings().GetLanguageTag().getLocale()); + pLocale = new css::lang::Locale( Application::GetSettings().GetLanguageTag().getLocale()); } return pLocale; } diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index b87657716dc4..7c246cb00c39 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -55,7 +55,7 @@ void ScSortParam::Clear() nUserIndex = 0; bHasHeader=bCaseSens=bUserDef=bNaturalSort = false; bByRow=bIncludePattern=bInplace = true; - aCollatorLocale = ::com::sun::star::lang::Locale(); + aCollatorLocale = css::lang::Locale(); aCollatorAlgorithm.clear(); aKeyState.bDoSort = false; diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 4fb4216a707e..4b06f9938258 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -111,7 +111,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo } sal_Int32 nStart = 0; sal_Int32 nEnd = aString.getLength(); - ::com::sun::star::util::SearchResult aSearchResult; + css::util::SearchResult aSearchResult; if (pSearchText) { if ( bDoBack ) @@ -727,7 +727,7 @@ bool ScTable::SearchAndReplace( else { // SearchParam no longer needed - SearchOptions contains all settings - com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); + css::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); aSearchOptions.Locale = *ScGlobal::GetLocale(); if (aSearchOptions.searchString.isEmpty()) @@ -741,8 +741,8 @@ bool ScTable::SearchAndReplace( // This is also done in SvxSearchDialog CommandHdl, but not in API object. if ( !rSearchItem.IsUseAsianOptions() ) aSearchOptions.transliterateFlags &= - ( com::sun::star::i18n::TransliterationModules_IGNORE_CASE | - com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH ); + ( css::i18n::TransliterationModules_IGNORE_CASE | + css::i18n::TransliterationModules_IGNORE_WIDTH ); pSearchText = new utl::TextSearch( aSearchOptions ); diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 8dffb4ebf57d..a2bb7b8a4124 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -102,10 +102,10 @@ public: bool isPasswordEmpty() const { return mbEmptyPass;} bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; void setPassword(const OUString& aPassText); - ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( + css::uno::Sequence<sal_Int8> getPasswordHash( ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; 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); bool verifyPassword(const OUString& aPassText) const; @@ -120,7 +120,7 @@ public: private: OUString maPassText; - ::com::sun::star::uno::Sequence<sal_Int8> maPassHash; + css::uno::Sequence<sal_Int8> maPassHash; ::std::vector<bool> maOptions; bool mbEmptyPass; bool mbProtected; diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 8d2efdbc25ab..9c3d51ae44e8 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -191,7 +191,7 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, bool bScriptReturnedFalse = false; // default: do not abort // Set up parameters - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aParams(2); + css::uno::Sequence< css::uno::Any > aParams(2); // 1) entered or calculated value OUString aValStr = rInput; @@ -206,13 +206,13 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, aValStr = pCell->GetString().getString(); } if ( bIsValue ) - aParams[0] = ::com::sun::star::uno::makeAny( nValue ); + aParams[0] = css::uno::makeAny( nValue ); else - aParams[0] = ::com::sun::star::uno::makeAny( OUString( aValStr ) ); + aParams[0] = css::uno::makeAny( OUString( aValStr ) ); // 2) Position of the cell OUString aPosStr(rPos.Format(SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention())); - aParams[1] = ::com::sun::star::uno::makeAny(aPosStr); + aParams[1] = css::uno::makeAny(aPosStr); // use link-update flag to prevent closing the document // while the macro is running @@ -223,9 +223,9 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, if ( pCell ) pDocument->LockTable( rPos.Tab() ); - ::com::sun::star::uno::Any aRet; - ::com::sun::star::uno::Sequence< sal_Int16 > aOutArgsIndex; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aOutArgs; + css::uno::Any aRet; + css::uno::Sequence< sal_Int16 > aOutArgsIndex; + css::uno::Sequence< css::uno::Any > aOutArgs; ErrCode eRet = pDocSh->CallXScript( aErrorTitle, aParams, aRet, aOutArgsIndex, aOutArgs ); diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index b3591d109820..7442da923a23 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -29,19 +29,19 @@ class ScDocument; class ScAddInListener : public cppu::WeakImplHelper< - com::sun::star::sheet::XResultListener, - com::sun::star::lang::XServiceInfo >, + css::sheet::XResultListener, + css::lang::XServiceInfo >, public SvtBroadcaster { private: - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVolRes; - com::sun::star::uno::Any aResult; + css::uno::Reference<css::sheet::XVolatileResult> xVolRes; + css::uno::Any aResult; ScAddInDocs* pDocs; // documents where this is used static ::std::list<ScAddInListener*> aAllListeners; // always allocated via CreateListener - ScAddInListener( com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVR, + ScAddInListener( css::uno::Reference<css::sheet::XVolatileResult> xVR, ScDocument* pD ); public: @@ -49,11 +49,10 @@ public: // create Listener and put it into global list static ScAddInListener* CreateListener( - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVR, + css::uno::Reference<css::sheet::XVolatileResult> xVR, ScDocument* pDoc ); - static ScAddInListener*Get( com::sun::star::uno::Reference< - com::sun::star::sheet::XVolatileResult> xVR ); + static ScAddInListener* Get( css::uno::Reference<css::sheet::XVolatileResult> xVR ); static void RemoveDocument( ScDocument* pDocument ); @@ -63,26 +62,26 @@ public: void AddDocument( ScDocument* pDoc ) { pDocs->insert( pDoc ); } - const com::sun::star::uno::Any& GetResult() const + const css::uno::Any& GetResult() const { return aResult; } // XResultListener - virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::sheet::ResultEvent& 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; // 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; + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SC_SOURCE_CORE_INC_ADDINLIS_HXX diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index 75b62ecb8714..a9137c58210b 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.hxx @@ -35,9 +35,9 @@ struct ScCellKeyword { const sal_Char* mpName; OpCode meOpCode; - const ::com::sun::star::lang::Locale& mrLocale; + const css::lang::Locale& mrLocale; - ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const ::com::sun::star::lang::Locale& rLocale); + ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const css::lang::Locale& rLocale); }; typedef std::unordered_map< OUString, ::std::list<ScCellKeyword>, OUStringHash > ScCellKeywordHashMap; @@ -63,7 +63,7 @@ typedef std::unordered_map< OUString, ::std::list<ScCellKeyword>, OUStringHash > class ScCellKeywordTranslator { public: - static void transKeyword(OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); + static void transKeyword(OUString& rName, const css::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); ~ScCellKeywordTranslator(); private: @@ -71,9 +71,9 @@ private: void init(); void addToMap(const OUString& rKey, const sal_Char* pName, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, OpCode eOpCode = ocNone); - void addToMap(const TransItem* pItems, const ::com::sun::star::lang::Locale& rLocale); + void addToMap(const TransItem* pItems, const css::lang::Locale& rLocale); static ::std::unique_ptr<ScCellKeywordTranslator> spInstance; ScCellKeywordHashMap maStringNameMap; diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index 4b147086c27c..02c591608b37 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -60,7 +60,7 @@ public: // SvBaseLink 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; // SvtBroadcaster override: virtual void ListenersGone() override; diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx index 3c322dc3c929..a4cd2afc0796 100644 --- a/sc/source/core/inc/scrdata.hxx +++ b/sc/source/core/inc/scrdata.hxx @@ -29,10 +29,10 @@ namespace com { namespace sun { namespace star { namespace i18n { class ScScriptTypeData { public: - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBreakIter; + css::uno::Reference< css::i18n::XBreakIterator > xBreakIter; - ScScriptTypeData() {} - ~ScScriptTypeData() {} + ScScriptTypeData() {} + ~ScScriptTypeData() {} }; #endif diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 69885b8390e3..853177d5d121 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -105,8 +105,8 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) // XResultListener -void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //TODO: or generate a UserEvent @@ -126,8 +126,8 @@ void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEv // XEventListener -void SAL_CALL ScAddInListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScAddInListener::disposing( const css::lang::EventObject& /* Source */ ) + throw(css::uno::RuntimeException, std::exception) { // hold a ref so this is not deleted at removeResultListener uno::Reference<sheet::XResultListener> xRef( this ); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 425bf0c0b854..f7f796aa0678 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -194,7 +194,7 @@ bool ScCompiler::IsEnglishSymbol( const OUString& rName ) void ScCompiler::InitCharClassEnglish() { - ::com::sun::star::lang::Locale aLocale( "en", "US", ""); + css::lang::Locale aLocale( "en", "US", ""); pCharClassEnglish = new CharClass( ::comphelper::getProcessComponentContext(), LanguageTag( aLocale)); } @@ -208,7 +208,7 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar ) if( eGrammar == FormulaGrammar::GRAM_EXTERNAL ) { meGrammar = eGrammar; - mxSymbols = GetOpCodeMap( ::com::sun::star::sheet::FormulaLanguage::NATIVE); + mxSymbols = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE); } else { @@ -218,7 +218,7 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar ) OSL_ENSURE( xMap, "ScCompiler::SetGrammar: unknown formula language"); if (!xMap) { - xMap = GetOpCodeMap( ::com::sun::star::sheet::FormulaLanguage::NATIVE); + xMap = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE); eMyGrammar = xMap->getGrammar(); } @@ -4836,7 +4836,7 @@ FormulaTokenRef ScCompiler::ExtendRangeReference( FormulaToken & rTok1, FormulaT return extendRangeReference( rTok1, rTok2, aPos,bReuseDoubleRef ); } -void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const +void ScCompiler::fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const { // All known AddIn functions. sheet::FormulaOpCodeMapEntry aEntry; diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index bf7770cd7680..03591f1aeefb 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -122,7 +122,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const } sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) + const OUString& rMimeType, const css::uno::Any & rValue ) { // wir koennen nur Strings... if ( SotClipboardFormatId::STRING != SotExchange::GetFormatIdFromMimeType( rMimeType )) diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 46d004bf0285..a9b6e39d81a4 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -170,6 +170,6 @@ void ScDefaultsCfg::SetOptions( const ScDefaultsOptions& rNew ) SetModified(); } -void ScDefaultsCfg::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} +void ScDefaultsCfg::Notify( const css::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index 86626d8c162c..2d8304cc2a3c 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -25,7 +25,7 @@ #include "miscuno.hxx" using namespace utl; -using namespace com::sun::star::uno; +using namespace css::uno; #define CFGPATH_FILTER "Office.Calc/Filter/Import" diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index db1bc0bbc6cf..665a7fc7c0aa 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -695,7 +695,7 @@ void ScFormulaCfg::SetOptions( const ScFormulaOptions& rNew ) SetModified(); } -void ScFormulaCfg::Notify( const ::com::sun::star::uno::Sequence< OUString >& rNames) +void ScFormulaCfg::Notify( const css::uno::Sequence< OUString >& rNames) { UpdateFromProperties( rNames ); } diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index e78fabd63022..cdf55deeb13a 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -51,7 +51,7 @@ void ScLinkConfigItem::SetCommitLink( const Link<ScLinkConfigItem&,void>& rLink aCommitLink = rLink; } -void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<OUString>& /* aPropertyNames */ ) +void ScLinkConfigItem::Notify( const css::uno::Sequence<OUString>& /* aPropertyNames */ ) { //TODO: not implemented yet... } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 71495a77677d..2f7dc0a7e884 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -488,7 +488,7 @@ void ScParameterClassification::GenerateDocumentation() MergeArgumentsFromFunctionResource(); ScAddress aAddress; ScCompiler aComp(NULL,aAddress); - ScCompiler::OpCodeMapPtr xMap( aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH)); + ScCompiler::OpCodeMapPtr xMap( aComp.GetOpCodeMap(css::sheet::FormulaLanguage::ENGLISH)); if (!xMap) return; fflush( stderr); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 4b3aa5c6765a..cb201e595b8a 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -187,6 +187,6 @@ void ScPrintCfg::SetOptions( const ScPrintOptions& rNew ) SetModified(); } -void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} +void ScPrintCfg::Notify( const css::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index f861fb5b5345..2e16a4c4a228 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -527,10 +527,10 @@ bool ScRangeData::HasReferences() const sal_uInt32 ScRangeData::GetUnoType() const { sal_uInt32 nUnoType = 0; - if ( HasType(RT_CRITERIA) ) nUnoType |= com::sun::star::sheet::NamedRangeFlag::FILTER_CRITERIA; - if ( HasType(RT_PRINTAREA) ) nUnoType |= com::sun::star::sheet::NamedRangeFlag::PRINT_AREA; - if ( HasType(RT_COLHEADER) ) nUnoType |= com::sun::star::sheet::NamedRangeFlag::COLUMN_HEADER; - if ( HasType(RT_ROWHEADER) ) nUnoType |= com::sun::star::sheet::NamedRangeFlag::ROW_HEADER; + if ( HasType(RT_CRITERIA) ) nUnoType |= css::sheet::NamedRangeFlag::FILTER_CRITERIA; + if ( HasType(RT_PRINTAREA) ) nUnoType |= css::sheet::NamedRangeFlag::PRINT_AREA; + if ( HasType(RT_COLHEADER) ) nUnoType |= css::sheet::NamedRangeFlag::COLUMN_HEADER; + if ( HasType(RT_ROWHEADER) ) nUnoType |= css::sheet::NamedRangeFlag::ROW_HEADER; return nUnoType; } diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 834e10ce8d3b..9670939b7914 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -325,8 +325,8 @@ bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMatrix, } bool ScApiTypeConversion::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 ) { bool bRet = false; o_eClass = rAny.getValueTypeClass(); @@ -354,7 +354,7 @@ bool ScApiTypeConversion::ConvertAnyToDouble( double & o_fVal, return bRet; } -ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::Any & rAny ) +ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const css::uno::Any & rAny ) { ScMatrixRef xMatrix; uno::Sequence< uno::Sequence< uno::Any > > aSequence; diff --git a/sc/source/filter/chart/chart_imp.cxx b/sc/source/filter/chart/chart_imp.cxx index 4dda833b6cdf..8a61be61e586 100644 --- a/sc/source/filter/chart/chart_imp.cxx +++ b/sc/source/filter/chart/chart_imp.cxx @@ -16,7 +16,7 @@ using namespace com::sun::star; -ScXMLChartExportWrapper::ScXMLChartExportWrapper( com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel, SfxMedium& rMed ): +ScXMLChartExportWrapper::ScXMLChartExportWrapper( css::uno::Reference< css::frame::XModel > xModel, SfxMedium& rMed ): mxModel(xModel), mrMedium(rMed) { diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index e3c18f02e7e0..1792c046cf68 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -362,7 +362,7 @@ sal_Int32 XclExpChRoot::CalcChartYFromHmm( sal_Int32 nPosY ) const return ::limit_cast< sal_Int32, double >( (nPosY - mxChData->mnBorderGapY) / mxChData->mfUnitSizeY, 0, EXC_CHART_TOTALUNITS ); } -XclChRectangle XclExpChRoot::CalcChartRectFromHmm( const ::com::sun::star::awt::Rectangle& rRect ) const +XclChRectangle XclExpChRoot::CalcChartRectFromHmm( const css::awt::Rectangle& rRect ) const { XclChRectangle aRect; aRect.mnX = CalcChartXFromHmm( rRect.X ); @@ -1220,9 +1220,9 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, // calculate absolute position for CHTEXT record Reference< cssc::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW ); Reference< XShape > xTitleShape( xChart1Doc->getTitle(), UNO_SET_THROW ); - ::com::sun::star::awt::Point aPos = xTitleShape->getPosition(); - ::com::sun::star::awt::Size aSize = xTitleShape->getSize(); - ::com::sun::star::awt::Rectangle aRect( aPos.X, aPos.Y, aSize.Width, aSize.Height ); + css::awt::Point aPos = xTitleShape->getPosition(); + css::awt::Size aSize = xTitleShape->getSize(); + css::awt::Rectangle aRect( aPos.X, aPos.Y, aSize.Width, aSize.Height ); maData.maRect = CalcChartRectFromHmm( aRect ); ::insert_value( maData.mnFlags2, EXC_CHTEXT_POS_MOVED, 0, 4 ); // manual title position implies manual plot area @@ -2309,12 +2309,12 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet ) mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_CHARTSIZE, EXC_CHFRAMEPOS_PARENT ) ); XclChFramePos& rFramePos = mxFramePos->GetFramePosData(); rFramePos.mnTLMode = EXC_CHFRAMEPOS_CHARTSIZE; - ::com::sun::star::awt::Point aLegendPos = xChart1Legend->getPosition(); + css::awt::Point aLegendPos = xChart1Legend->getPosition(); rFramePos.maRect.mnX = maData.maRect.mnX = CalcChartXFromHmm( aLegendPos.X ); rFramePos.maRect.mnY = maData.maRect.mnY = CalcChartYFromHmm( aLegendPos.Y ); // legend size, Excel expects points in CHFRAMEPOS record rFramePos.mnBRMode = EXC_CHFRAMEPOS_ABSSIZE_POINTS; - ::com::sun::star::awt::Size aLegendSize = xChart1Legend->getSize(); + css::awt::Size aLegendSize = xChart1Legend->getSize(); rFramePos.maRect.mnWidth = static_cast< sal_uInt16 >( aLegendSize.Width * EXC_POINTS_PER_HMM + 0.5 ); rFramePos.maRect.mnHeight = static_cast< sal_uInt16 >( aLegendSize.Height * EXC_POINTS_PER_HMM + 0.5 ); maData.maRect.mnWidth = CalcChartXFromHmm( aLegendSize.Width ); @@ -3290,7 +3290,7 @@ void XclExpChAxesSet::WriteBody( XclExpStream& rStrm ) static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc, OUString& rSubTitle) { - Reference< ::com::sun::star::chart::XChartDocument > xChartDoc1(xChartDoc, UNO_QUERY); + Reference< css::chart::XChartDocument > xChartDoc1(xChartDoc, UNO_QUERY); if (!xChartDoc1.is()) return; diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 6c2601fe31ac..0b64dce2865c 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -615,9 +615,9 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mbMultiSel( false ), mbScrollHor( false ) { - namespace FormCompType = ::com::sun::star::form::FormComponentType; - namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; - namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation; + namespace FormCompType = css::form::FormComponentType; + namespace AwtVisualEffect = css::awt::VisualEffect; + namespace AwtScrollOrient = css::awt::ScrollBarOrientation; ScfPropertySet aCtrlProp( XclControlHelper::GetControlModel( xShape ) ); if( !xShape.is() || !aCtrlProp.Is() ) @@ -1063,7 +1063,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape Reference< XModel > xModel; aShapeProp.GetProperty( xModel, "Model" ); mxChartDoc.set( xModel,UNO_QUERY ); - ::com::sun::star::awt::Rectangle aBoundRect; + css::awt::Rectangle aBoundRect; aShapeProp.GetProperty( aBoundRect, "BoundRect" ); Rectangle aChartRect( Point( aBoundRect.X, aBoundRect.Y ), Size( aBoundRect.Width, aBoundRect.Height ) ); mxChart.reset( new XclExpChart( GetRoot(), xModel, aChartRect ) ); @@ -1332,7 +1332,7 @@ XclMacroHelper::SetMacroLink( const OUString& rMacroName ) return false; } -XclExpShapeObj::XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, ScDocument* pDoc ) : +XclExpShapeObj::XclExpShapeObj( XclExpObjectManager& rRoot, css::uno::Reference< css::drawing::XShape > xShape, ScDocument* pDoc ) : XclObjAny( rRoot, xShape, pDoc ), XclMacroHelper( rRoot ) { diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 7982d285083c..19986afdc109 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -113,7 +113,7 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm ) pAttrList->add( XML_copies, OString::number( mrData.mnCopies ).getStr() ); // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ), - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > aAttrs(pAttrList); + css::uno::Reference< css::xml::sax::XFastAttributeList > aAttrs(pAttrList); rStrm.GetCurrentStream()->singleElement( XML_pageSetup, aAttrs ); } diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 0b259b2c7842..416329b605a6 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -407,7 +407,7 @@ void XclExpPCField::InitNumGroupField( const ScDPObject& rDPObj, const ScDPNumGr { // special case: group by days with step count meFieldType = EXC_PCFIELD_DATEGROUP; - maNumGroupInfo.SetScDateType( com::sun::star::sheet::DataPilotFieldGroupBy::DAYS ); + maNumGroupInfo.SetScDateType( css::sheet::DataPilotFieldGroupBy::DAYS ); SetDateGroupLimit( rNumInfo, true ); } else @@ -1030,7 +1030,7 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim ) if( const DataPilotFieldSortInfo* pSortInfo = rSaveDim.GetSortInfo() ) { maFieldExtInfo.SetApiSortMode( pSortInfo->Mode ); - if( pSortInfo->Mode == ::com::sun::star::sheet::DataPilotFieldSortMode::DATA ) + if( pSortInfo->Mode == css::sheet::DataPilotFieldSortMode::DATA ) maFieldExtInfo.mnSortField = mrPTable.GetDataFieldIndex( pSortInfo->Field, EXC_SXVDEX_SORT_OWN ); ::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SORT_ASC, pSortInfo->IsAscending ); } @@ -1093,7 +1093,7 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim if( const XclExpPTField* pRefField = mrPTable.GetField( pFieldRef->ReferenceField ) ) { rDataInfo.mnRefField = pRefField->GetFieldIndex(); - if( pFieldRef->ReferenceItemType == ::com::sun::star::sheet::DataPilotFieldReferenceItemType::NAMED ) + if( pFieldRef->ReferenceItemType == css::sheet::DataPilotFieldReferenceItemType::NAMED ) rDataInfo.mnRefItem = pRefField->GetItemIndex( pFieldRef->ReferenceItemName, 0 ); } } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 5a5c1305ce66..ca2a5e3567ed 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -843,9 +843,9 @@ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const S item set, and which script type we should prefer according to the current language settings. */ - static const WhichAndScript WAS_LATIN( ATTR_FONT, ::com::sun::star::i18n::ScriptType::LATIN ); - static const WhichAndScript WAS_ASIAN( ATTR_CJK_FONT, ::com::sun::star::i18n::ScriptType::ASIAN ); - static const WhichAndScript WAS_CMPLX( ATTR_CTL_FONT, ::com::sun::star::i18n::ScriptType::COMPLEX ); + static const WhichAndScript WAS_LATIN( ATTR_FONT, css::i18n::ScriptType::LATIN ); + static const WhichAndScript WAS_ASIAN( ATTR_CJK_FONT, css::i18n::ScriptType::ASIAN ); + static const WhichAndScript WAS_CMPLX( ATTR_CTL_FONT, css::i18n::ScriptType::COMPLEX ); /* do not let a font from a parent style override an explicit cell font. */ @@ -925,7 +925,7 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI bool bUsed = ScfTools::CheckItems( rItemSet, pnCommonIds, bDeep ); if( !bUsed ) { - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; // if WEAK is passed, guess script type from existing items in the item set if( nScript == ApiScriptType::WEAK ) nScript = GetFirstUsedScript( rRoot, rItemSet ); @@ -2084,7 +2084,7 @@ XclExpXF::XclExpXF( const XclExpRoot& rRoot, const SfxStyleSheetBase& rStyleShee mnParentXFId( XclExpXFBuffer::GetXFIdFromIndex( EXC_XF_STYLEPARENT ) ) { bool bDefStyle = (rStyleSheet.GetName() == ScGlobal::GetRscString( STR_STYLENAME_STANDARD )); - sal_Int16 nScript = bDefStyle ? GetDefApiScript() : ::com::sun::star::i18n::ScriptType::WEAK; + sal_Int16 nScript = bDefStyle ? GetDefApiScript() : css::i18n::ScriptType::WEAK; Init( const_cast< SfxStyleSheetBase& >( rStyleSheet ).GetItemSet(), nScript, NUMBERFORMAT_ENTRY_NOT_FOUND, EXC_FONT_NOTFOUND, false, bDefStyle ); } diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 6283f8022139..7d955df20f03 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -318,9 +318,9 @@ sal_Int32 XclImpChRoot::CalcHmmFromChartY( sal_Int32 nPosY ) const return static_cast< sal_Int32 >( mxChData->mfUnitSizeY * nPosY + mxChData->mnBorderGapY + 0.5 ); } -::com::sun::star::awt::Rectangle XclImpChRoot::CalcHmmFromChartRect( const XclChRectangle& rRect ) const +css::awt::Rectangle XclImpChRoot::CalcHmmFromChartRect( const XclChRectangle& rRect ) const { - return ::com::sun::star::awt::Rectangle( + return css::awt::Rectangle( CalcHmmFromChartX( rRect.mnX ), CalcHmmFromChartY( rRect.mnY ), CalcHmmFromChartX( rRect.mnWidth ), @@ -1191,17 +1191,17 @@ void XclImpChText::ConvertTitlePosition( const XclChTextKey& rTitleKey ) const { Reference< XShape > xTitleShape( GetTitleShape( rTitleKey ), UNO_SET_THROW ); // the call to XShape.getSize() may recalc the chart view - ::com::sun::star::awt::Size aTitleSize = xTitleShape->getSize(); + css::awt::Size aTitleSize = xTitleShape->getSize(); // rotated titles need special handling... sal_Int32 nScRot = XclTools::GetScRotation( GetRotation(), 0 ); double fRad = nScRot * F_PI18000; double fSin = fabs( sin( fRad ) ); double fCos = fabs( cos( fRad ) ); - ::com::sun::star::awt::Size aBoundSize( + css::awt::Size aBoundSize( static_cast< sal_Int32 >( fCos * aTitleSize.Width + fSin * aTitleSize.Height + 0.5 ), static_cast< sal_Int32 >( fSin * aTitleSize.Width + fCos * aTitleSize.Height + 0.5 ) ); // calculate the title position from the values in the CHTEXT record - ::com::sun::star::awt::Point aTitlePos( + css::awt::Point aTitlePos( CalcHmmFromChartX( maData.maRect.mnX ), CalcHmmFromChartY( maData.maRect.mnY ) ); // add part of height to X direction, if title is rotated down (clockwise) @@ -2586,7 +2586,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const RelativePosition aRelPos( CalcRelativeFromChartX( pFramePos->maRect.mnX ), CalcRelativeFromChartY( pFramePos->maRect.mnY ), - ::com::sun::star::drawing::Alignment_TOP_LEFT ); + css::drawing::Alignment_TOP_LEFT ); aLegendProp.SetProperty( EXC_CHPROP_RELATIVEPOSITION, aRelPos ); } else @@ -2883,7 +2883,7 @@ void XclImpChTypeGroup::CreateDataSeries( Reference< XChartType > xChartType, sa if( bSpline && !maTypeInfo.IsSeriesFrameFormat() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_RADAR) ) { ScfPropertySet aTypeProp( xChartType ); - aTypeProp.SetProperty( EXC_CHPROP_CURVESTYLE, ::com::sun::star::chart2::CurveStyle_CUBIC_SPLINES ); + aTypeProp.SetProperty( EXC_CHPROP_CURVESTYLE, css::chart2::CurveStyle_CUBIC_SPLINES ); } } @@ -3977,7 +3977,7 @@ void XclImpChChart::Convert( const Reference<XChartDocument>& xChartDoc, if( (rFramePos.mnTLMode == EXC_CHFRAMEPOS_PARENT) && (rFramePos.mnBRMode == EXC_CHFRAMEPOS_PARENT) ) { Reference< cssc::XDiagramPositioning > xPositioning( xDiagram1, UNO_QUERY_THROW ); - ::com::sun::star::awt::Rectangle aDiagramRect = CalcHmmFromChartRect( rFramePos.maRect ); + css::awt::Rectangle aDiagramRect = CalcHmmFromChartRect( rFramePos.maRect ); // for pie charts, always set inner plot area size to exclude the data labels as Excel does const XclImpChTypeGroup* pFirstTypeGroup = mxPrimAxesSet->GetFirstTypeGroup().get(); if( pFirstTypeGroup && (pFirstTypeGroup->GetTypeInfo().meTypeCateg == EXC_CHTYPECATEG_PIE) ) diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index f95e6e792703..b0d265599a07 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -618,7 +618,7 @@ void XclImpDrawObjBase::ConvertLineStyle( SdrObject& rSdrObj, const XclObjLineDa long nLineWidth = 35 * ::std::min( rLineData.mnWidth, EXC_OBJ_LINE_THICK ); rSdrObj.SetMergedItem( XLineWidthItem( nLineWidth ) ); rSdrObj.SetMergedItem( XLineColorItem( EMPTY_OUSTRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) ); - rSdrObj.SetMergedItem( XLineJointItem( com::sun::star::drawing::LineJoint_MITER ) ); + rSdrObj.SetMergedItem( XLineJointItem( css::drawing::LineJoint_MITER ) ); sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 ); sal_uLong nDashLen = 3 * nDotLen; @@ -1505,7 +1505,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& if( SdrObjCustomShape* pObjCustomShape = dynamic_cast< SdrObjCustomShape* >( &rSdrObj ) ) { double fAngle = 180.0; - com::sun::star::beans::PropertyValue aTextRotateAngle; + css::beans::PropertyValue aTextRotateAngle; aTextRotateAngle.Name = "TextRotateAngle"; aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem(static_cast<const SdrCustomShapeGeometryItem&>(pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); @@ -1706,10 +1706,10 @@ SdrObjectPtr XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const /* Set the size to the embedded object, this prevents that font sizes of text objects are changed in the chart when the object is inserted into the draw page. */ - sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT; + sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT; MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xEmbObj->getMapUnit( nAspect ) ); Size aSize( vcl::Window::LogicToLogic( rAnchorRect.GetSize(), MapMode( MAP_100TH_MM ), MapMode( aUnit ) ) ); - ::com::sun::star::awt::Size aAwtSize( aSize.Width(), aSize.Height() ); + css::awt::Size aAwtSize( aSize.Width(), aSize.Height() ); xEmbObj->setVisualAreaSize( nAspect, aAwtSize ); // #i121334# This call will change the chart's default background fill from white to transparent. @@ -2053,7 +2053,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const //In this case, DFF_Prop_wzDescription will not be set in excel file. //So In the end of SvxMSDffManager::ImportShape, description will not be set. But actually in excel, //the alt text is the label value. So here set description as label text first which is called before ImportShape. - Reference< ::com::sun::star::beans::XPropertySet > xPropset( mxShape, UNO_QUERY ); + Reference< css::beans::XPropertySet > xPropset( mxShape, UNO_QUERY ); try{ if(xPropset.is()) xPropset->setPropertyValue( "Description", makeAny(::rtl::OUString(aLabel)) ); @@ -2564,14 +2564,14 @@ void XclImpSpinButtonObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, void XclImpSpinButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( "Border", ::com::sun::star::awt::VisualEffect::NONE ); + rPropSet.SetProperty( "Border", css::awt::VisualEffect::NONE ); rPropSet.SetProperty< sal_Int32 >( "DefaultSpinValue", mnValue ); rPropSet.SetProperty< sal_Int32 >( "SpinValueMin", mnMin ); rPropSet.SetProperty< sal_Int32 >( "SpinValueMax", mnMax ); rPropSet.SetProperty< sal_Int32 >( "SpinIncrement", mnStep ); // Excel spin buttons always vertical - rPropSet.SetProperty( "Orientation", ::com::sun::star::awt::ScrollBarOrientation::VERTICAL ); + rPropSet.SetProperty( "Orientation", css::awt::ScrollBarOrientation::VERTICAL ); } OUString XclImpSpinButtonObj::DoGetServiceName() const @@ -2601,7 +2601,7 @@ void XclImpScrollBarObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, s void XclImpScrollBarObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( "Border", ::com::sun::star::awt::VisualEffect::NONE ); + rPropSet.SetProperty( "Border", css::awt::VisualEffect::NONE ); rPropSet.SetProperty< sal_Int32 >( "DefaultScrollValue", mnValue ); rPropSet.SetProperty< sal_Int32 >( "ScrollValueMin", mnMin ); rPropSet.SetProperty< sal_Int32 >( "ScrollValueMax", mnMax ); @@ -3373,7 +3373,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpTbxObjBase& rTbxOb // set controls form, needed in virtual function InsertControl() InitControlForm(); // try to insert the control into the form - ::com::sun::star::awt::Size aDummySize; + css::awt::Size aDummySize; Reference< XShape > xShape; XclImpDffConvData& rConvData = GetConvData(); if( rConvData.mxCtrlForm.is() && InsertControl( xFormComp, aDummySize, &xShape, true ) ) @@ -3414,7 +3414,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb if( GetConvData().mxCtrlForm.is() ) { Reference< XFormComponent > xFComp; - com::sun::star::awt::Size aSz; // not used in import + css::awt::Size aSz; // not used in import ReadOCXCtlsStream( mxCtlsStrm, xFComp, rPicObj.GetCtlsStreamPos(), rPicObj.GetCtlsStreamSize() ); // recreate the method formally known as // ReadOCXExcelKludgeStream( ) @@ -3599,7 +3599,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO } bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFormComp, - const ::com::sun::star::awt::Size& /*rSize*/, Reference< XShape >* pxShape, + const css::awt::Size& /*rSize*/, Reference< XShape >* pxShape, bool /*bFloatingCtrl*/ ) { if( GetDocShell() ) try diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 63aeb55d7f34..73cf2595675d 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -977,7 +977,7 @@ void XclChPropSetHelper::WriteLineProperties( Any aDashNameAny; if( eApiStyle == cssd::LineStyle_DASH ) { - OUString aDashName = rDashTable.InsertObject( ::com::sun::star::uno::makeAny( aApiDash ) ); + OUString aDashName = rDashTable.InsertObject( css::uno::makeAny( aApiDash ) ); if( !aDashName.isEmpty() ) aDashNameAny <<= aDashName; } diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index b8c8c342ec66..bd04117d1d36 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -43,7 +43,7 @@ public: virtual void Print( FILE* ) override; #endif bool Read(SvStream &rS) override; - bool ImportToolBarControl( ScCTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); + bool ImportToolBarControl( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); }; class ScCTB : public TBBase diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 7f863843b375..e2d0a2a0a3dd 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -162,7 +162,7 @@ bool ScfPropertySet::HasProperty( const OUString& rPropName ) const try { Reference< XPropertyState > xPropState( mxPropSet, UNO_QUERY_THROW ); - bHasProp = xPropState->getPropertyState( rPropName ) == ::com::sun::star::beans::PropertyState_DIRECT_VALUE; + bHasProp = xPropState->getPropertyState( rPropName ) == css::beans::PropertyState_DIRECT_VALUE; } catch( Exception& ) { diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 215da0534bcd..ea353694b673 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -160,7 +160,7 @@ static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) } static void lcl_AddStamp( OUString& rStr, const OUString& rName, - const ::com::sun::star::util::DateTime& rDateTime, + const css::util::DateTime& rDateTime, const LocaleDataWrapper& rLoc ) { Date aD(rDateTime.Day, rDateTime.Month, rDateTime.Year); diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 25da7e98d24d..d05c33db5159 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -41,46 +41,46 @@ public: bool empty() const { return mvAddresses.empty(); } - const ::com::sun::star::table::CellRangeAddress& front() const + const css::table::CellRangeAddress& front() const { return mvAddresses.front(); } - ::com::sun::star::table::CellRangeAddress& operator[]( size_t i ) + css::table::CellRangeAddress& operator[]( size_t i ) { return mvAddresses[ i ]; } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::const_iterator begin() const + ::std::vector< css::table::CellRangeAddress >::const_iterator begin() const { return mvAddresses.begin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::iterator begin() + ::std::vector< css::table::CellRangeAddress >::iterator begin() { return mvAddresses.begin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::const_iterator end() const + ::std::vector< css::table::CellRangeAddress >::const_iterator end() const { return mvAddresses.end(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::reverse_iterator rbegin() + ::std::vector< css::table::CellRangeAddress >::reverse_iterator rbegin() { return mvAddresses.rbegin(); } - ::std::vector< ::com::sun::star::table::CellRangeAddress >::reverse_iterator rend() + ::std::vector< css::table::CellRangeAddress >::reverse_iterator rend() { return mvAddresses.rend(); } void clear() { mvAddresses.clear(); } - void erase( ::std::vector< ::com::sun::star::table::CellRangeAddress >::iterator it ) + void erase( ::std::vector< css::table::CellRangeAddress >::iterator it ) { mvAddresses.erase( it ); } void pop_back() { mvAddresses.pop_back(); } - void push_back( const ::com::sun::star::table::CellRangeAddress& rAddress ) + void push_back( const css::table::CellRangeAddress& rAddress ) { mvAddresses.push_back( rAddress ); } /** Returns the base address of this range list (top-left cell of first range). */ - ::com::sun::star::table::CellAddress + css::table::CellAddress getBaseAddress() const; /** Converts to a sequence. */ - com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > + css::uno::Sequence< css::table::CellRangeAddress > toSequence() const; private: - ::std::vector< ::com::sun::star::table::CellRangeAddress > mvAddresses; + ::std::vector< css::table::CellRangeAddress > mvAddresses; }; /** A 2D cell address struct for binary filters. */ @@ -91,7 +91,7 @@ struct BinAddress inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit BinAddress( const ::com::sun::star::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} + inline explicit BinAddress( const css::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); @@ -130,9 +130,9 @@ struct BinRange inline explicit BinRange( const BinAddress& rFirst, const BinAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} inline explicit BinRange( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nCol2, sal_Int32 nRow2 ) : maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {} - inline explicit BinRange( const ::com::sun::star::table::CellAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {} - inline explicit BinRange( const ::com::sun::star::table::CellAddress& rFirst, const ::com::sun::star::table::CellAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} - inline explicit BinRange( const ::com::sun::star::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {} + inline explicit BinRange( const css::table::CellAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {} + inline explicit BinRange( const css::table::CellAddress& rFirst, const css::table::CellAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {} + inline explicit BinRange( const css::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {} void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); @@ -252,17 +252,17 @@ public: sal_Int32 nLength = SAL_MAX_INT32 ); /** Returns the biggest valid cell address in the own Calc document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxApiAddress() const { return maMaxApiPos; } /** Returns the biggest valid cell address in the imported/exported Excel document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxXlsAddress() const { return maMaxXlsPos; } /** Returns the biggest valid cell address in both Calc and the imported/exported Excel document. */ - inline const ::com::sun::star::table::CellAddress& + inline const css::table::CellAddress& getMaxAddress() const { return maMaxPos; } /** Checks if the passed column index is valid. @@ -300,7 +300,7 @@ public: @return true = Passed address is valid (no index overflow). */ bool checkCellAddress( - const ::com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, bool bTrackOverflow ); /** Converts the passed string to a single cell address, without checking @@ -312,12 +312,12 @@ public: @return true = Cell address could be parsed from the passed string. */ static bool convertToCellAddressUnchecked( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); static bool convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); + css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -329,13 +329,13 @@ public: @return true = Converted address is valid (no index overflow). */ bool convertToCellAddress( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); bool convertToCellAddress( - com::sun::star::table::CellAddress& rAddress, + css::table::CellAddress& rAddress, const char* pStr, sal_Int16 nSheet, bool bTrackOverflow ); /** Returns a valid cell address by moving it into allowed dimensions. @@ -345,7 +345,7 @@ public: @param bTrackOverflow true = Update the internal overflow flags, if the address is outside of the supported sheet limits. @return A valid API cell address struct. */ - ::com::sun::star::table::CellAddress + css::table::CellAddress createValidCellAddress( const OUString& rString, sal_Int16 nSheet, @@ -359,7 +359,7 @@ public: @param nSheet Sheet index to be inserted into orAddress. */ static void convertToCellAddressUnchecked( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); @@ -373,7 +373,7 @@ public: @return true = Converted address is valid (no index overflow). */ bool convertToCellAddress( - ::com::sun::star::table::CellAddress& orAddress, + css::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet, bool bTrackOverflow ); @@ -385,7 +385,7 @@ public: @param bTrackOverflow true = Update the internal overflow flags, if the address is outside of the supported sheet limits. @return A valid API cell address struct. */ - ::com::sun::star::table::CellAddress + css::table::CellAddress createValidCellAddress( const BinAddress& rBinAddress, sal_Int16 nSheet, @@ -407,7 +407,7 @@ public: overflow is not allowed via parameter bAllowOverflow. */ bool checkCellRange( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow ); /** Checks the passed cell range, may try to fit it to current sheet limits. @@ -437,7 +437,7 @@ public: allowed via parameter bAllowOverflow. */ bool validateCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, bool bAllowOverflow, bool bTrackOverflow ); /** Converts the passed string to a cell range address, without checking @@ -449,7 +449,7 @@ public: @return true = Range address could be parsed from the passed string. */ static bool convertToCellRangeUnchecked( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet ); @@ -478,7 +478,7 @@ public: allowed via parameter bAllowOverflow. */ bool convertToCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -491,7 +491,7 @@ public: @param nSheet Sheet index to be inserted into orRange. */ static void convertToCellRangeUnchecked( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet ); @@ -518,7 +518,7 @@ public: allowed via parameter bAllowOverflow. */ bool convertToCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -595,14 +595,14 @@ private: sal_Unicode cSameSheet ); }; - ::com::sun::star::table::CellAddress maMaxApiPos; /// Maximum valid cell address in Calc. - ::com::sun::star::table::CellAddress maMaxXlsPos; /// Maximum valid cell address in Excel. - ::com::sun::star::table::CellAddress maMaxPos; /// Maximum valid cell address in Calc/Excel. - ControlCharacters maLinkChars; /// Control characters for external link import (BIFF). - ControlCharacters maDConChars; /// Control characters for DCON* record import (BIFF). - bool mbColOverflow; /// Flag for "columns overflow". - bool mbRowOverflow; /// Flag for "rows overflow". - bool mbTabOverflow; /// Flag for "tables overflow". + css::table::CellAddress maMaxApiPos; /// Maximum valid cell address in Calc. + css::table::CellAddress maMaxXlsPos; /// Maximum valid cell address in Excel. + css::table::CellAddress maMaxPos; /// Maximum valid cell address in Calc/Excel. + ControlCharacters maLinkChars; /// Control characters for external link import (BIFF). + ControlCharacters maDConChars; /// Control characters for DCON* record import (BIFF). + bool mbColOverflow; /// Flag for "columns overflow". + bool mbRowOverflow; /// Flag for "rows overflow". + bool mbTabOverflow; /// Flag for "tables overflow". }; } // namespace xls diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 83a45ace1916..3eb2b2befcf6 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -36,7 +36,7 @@ namespace xls { /** Contains UNO API filter settings for a column in a filtered range. */ struct ApiFilterSettings { - typedef ::std::vector<com::sun::star::sheet::TableFilterField3> FilterFieldVector; + typedef ::std::vector<css::sheet::TableFilterField3> FilterFieldVector; FilterFieldVector maFilterFields; /// List of UNO API filter settings. OptValue< bool > mobNeedsRegExp; /// If set, requires regular expressions to be enabled/disabled. @@ -112,7 +112,7 @@ private: /** A filter criterion for a custom filter. */ struct FilterCriterionModel { - ::com::sun::star::uno::Any maValue; /// Comparison operand. + css::uno::Any maValue; /// Comparison operand. sal_Int32 mnOperator; /// Comparison operator. sal_uInt8 mnDataType; /// Operand data type (BIFF only). sal_uInt8 mnStrLen; /// Length of string operand (BIFF5-BIFF8 only). @@ -197,15 +197,13 @@ public: FilterColumn& createFilterColumn(); /** Applies the filter to the passed filter descriptor. */ - void finalizeImport( - const ::com::sun::star::uno::Reference< - ::com::sun::star::sheet::XSheetFilterDescriptor3>& rxFilterDesc ); + void finalizeImport( const css::uno::Reference< css::sheet::XSheetFilterDescriptor3>& rxFilterDesc ); private: typedef RefVector< FilterColumn > FilterColumnVector; FilterColumnVector maFilterColumns; - ::com::sun::star::table::CellRangeAddress maRange; + css::table::CellRangeAddress maRange; }; class AutoFilterBuffer : public WorkbookHelper @@ -222,7 +220,7 @@ public: /** Applies the filters to the passed database range object. @return True = this buffer contains valid auto filter settings. */ - bool finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange >& rxDatabaseRange ); + bool finalizeImport( const css::uno::Reference< css::sheet::XDatabaseRange >& rxDatabaseRange ); private: /** Returns the auto filter object used to perform auto filtering. */ diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 3aafeae8aa1c..34e08f7b2e52 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -41,8 +41,8 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -60,8 +60,8 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -87,8 +87,8 @@ private: virtual BiffDecoder_XOR* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -99,7 +99,7 @@ private: private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; sal_uInt16 mnKey; sal_uInt16 mnHash; }; @@ -115,8 +115,8 @@ private: virtual BiffDecoder_RCF* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( @@ -127,7 +127,7 @@ private: private: ::oox::core::BinaryCodec_RCF maCodec; /// Cipher algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; ::std::vector< sal_uInt8 > maSalt; ::std::vector< sal_uInt8 > maVerifier; ::std::vector< sal_uInt8 > maVerifierHash; diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 6c99f47a2543..af5759b3c4e6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -29,10 +29,10 @@ namespace xls { struct CommentModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - OUString maAuthor; /// Comment author (BIFF8 only). + OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). bool mbAutoFill; /// Auto Selection of comment object's fill style @@ -42,8 +42,7 @@ struct CommentModel bool mbRowHidden; /// Comment cell's Row is Hidden sal_Int32 mnTHA; /// Horizontal Alignment sal_Int32 mnTVA; /// Vertical Alignment - ::com::sun::star::awt::Rectangle - maAnchor; /// Anchor parameters + css::awt::Rectangle maAnchor; /// Anchor parameters bool mbVisible; /// True = comment is always shown (BIFF2-BIFF8 only). explicit CommentModel(); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 31d67fb01a21..fefdef0313b6 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -39,7 +39,7 @@ const sal_Int32 BIFF12_CONNECTION_DSP = 8; /** Special properties for data connections representing web queries. */ struct WebPrModel { - typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector; + typedef ::std::vector< css::uno::Any > TablesVector; TablesVector maTables; /// Names or indexes of the web query tables. OUString maUrl; /// Source URL to refresh the data. diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 0eee4f55e910..5b0c36ebeeb1 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -81,13 +81,13 @@ public: /** Returns the original name as imported from or exported to the file. */ const OUString& getUpcaseModelName() const; /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */ - ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; + css::uno::Any getReference( const css::table::CellAddress& rBaseAddr ) const; protected: - DefinedNameModel maModel; /// Model data for this defined name. - mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. - OUString maCalcName; /// Final name used in the Calc document. - ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. + DefinedNameModel maModel; /// Model data for this defined name. + mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. + OUString maCalcName; /// Final name used in the Calc document. + css::uno::Any maRefAny; /// Single cell/range reference. }; class DefinedName : public DefinedNameBase @@ -123,7 +123,7 @@ public: /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Tries to resolve the defined name to an absolute cell range. */ - bool getAbsoluteRange( ::com::sun::star::table::CellRangeAddress& orRange ) const; + bool getAbsoluteRange( css::table::CellRangeAddress& orRange ) const; private: typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr; diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index a0dc33740584..16e258f7a911 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -101,11 +101,9 @@ public: bool isAnchorValid() const; /** Calculates the resulting shape anchor in EMUs. */ - ::oox::drawingml::EmuRectangle calcAnchorRectEmu( - const ::com::sun::star::awt::Size& rPageSizeHmm ) const; + ::oox::drawingml::EmuRectangle calcAnchorRectEmu( const css::awt::Size& rPageSizeHmm ) const; /** Calculates the resulting shape anchor in 1/100 mm. */ - ::com::sun::star::awt::Rectangle calcAnchorRectHmm( - const ::com::sun::star::awt::Size& rPageSizeHmm ) const; + css::awt::Rectangle calcAnchorRectHmm( const css::awt::Size& rPageSizeHmm ) const; AnchorType getEditAs() const { return meEditAs; } private: /** Converts the passed anchor to an absolute position in EMUs. */ diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 401ee46d46bb..3bb393cff0ef 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -46,13 +46,13 @@ class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: explicit ShapeMacroAttacher( const OUString& rMacroName, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::drawing::XShape >& rxShape ); private: virtual void attachMacro( const OUString& rMacroUrl ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; }; class Shape : public ::oox::drawingml::Shape, public WorksheetHelper @@ -66,7 +66,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) override; + const css::uno::Reference< css::drawing::XShapes >& rxShapes ) override; private: OUString maMacroName; @@ -114,7 +114,7 @@ protected: private: typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxDrawPage; /// Drawing page of this sheet. ::oox::drawingml::ShapePtr mxShape; /// Current top-level shape. ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. @@ -126,14 +126,14 @@ class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: explicit VmlControlMacroAttacher( const OUString& rMacroName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC, + const css::uno::Reference< css::container::XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: virtual void attachMacro( const OUString& rMacroUrl ) override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; + css::uno::Reference< css::container::XIndexContainer > mxCtrlFormIC; sal_Int32 mnCtrlIndex; sal_Int32 mnCtrlType; sal_Int32 mnDropStyle; @@ -145,7 +145,7 @@ public: explicit VmlDrawing( const WorksheetHelper& rHelper ); /** Returns the drawing shape for a cell note at the specified position. */ - const ::oox::vml::ShapeBase* getNoteShape( const ::com::sun::star::table::CellAddress& rPos ) const; + const ::oox::vml::ShapeBase* getNoteShape( const css::table::CellAddress& rPos ) const; /** Filters cell note shapes. */ virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const override; @@ -155,20 +155,20 @@ public: /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( - ::com::sun::star::awt::Rectangle& orShapeRect, + css::awt::Rectangle& orShapeRect, const OUString& rShapeAnchor ) const override; /** Creates a UNO control shape for legacy drawing controls. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + virtual css::uno::Reference< css::drawing::XShape > createAndInsertClientXShape( const ::oox::vml::ShapeBase& rShape, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; + const css::uno::Reference< css::drawing::XShapes >& rxShapes, + const css::awt::Rectangle& rShapeRect ) const override; /** Updates the bounding box covering all shapes of this drawing. */ virtual void notifyXShapeInserted( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::awt::Rectangle& rShapeRect, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const css::awt::Rectangle& rShapeRect, const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) override; private: diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 129a1f98d0ca..2e8a8731d957 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -58,13 +58,13 @@ class BiffDrawingBase : public WorksheetHelper { public: explicit BiffDrawingBase( const WorksheetHelper& rHelper, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage ); + const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage ); /** Final processing after import of the all drawing objects. */ void finalizeImport(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > mxDrawPage; /// UNO draw page used to insert the shapes. }; diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 7e594b2c9cda..59982c09bc90 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -34,7 +34,7 @@ public: /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) override; + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc ) override; /** Creates a data sequence from the passed formula. */ virtual css::uno::Reference<css::chart2::data::XDataSequence> diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 637e7fe29a9b..dfbb92a99ae2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -31,8 +31,8 @@ class ExcelFilter : public ::oox::core::XmlFilterBase { public: explicit ExcelFilter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) + throw( css::uno::RuntimeException ); virtual ~ExcelFilter(); void registerWorkbookGlobals( WorkbookGlobals& rBookGlob ); @@ -48,7 +48,7 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; virtual void useInternalChartDataTable( bool bInternal ) override; - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; private: virtual GraphicHelper* implCreateGraphicHelper() const override; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 47d37fec2edc..fc2135c20778 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -34,15 +34,15 @@ class ExcelVbaProject : public ::oox::ole::VbaProject { public: explicit ExcelVbaProject( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& rxDocument ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& rxDocument ); protected: /** Adds dummy modules for sheets without imported code name. */ virtual void prepareImport() override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > mxDocument; }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index e78373754fce..47d4a4c56cd8 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -196,7 +196,7 @@ class XclExpSheetProtection : public XclExpProtection class XclExpPassHash : public XclExpRecord { public: - XclExpPassHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aHash); + XclExpPassHash(const css::uno::Sequence<sal_Int8>& aHash); virtual ~XclExpPassHash(); private: diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 2ddc5d2e5d4e..526af61f312c 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -93,7 +93,7 @@ public: /** Returns the DDE item info needed by the XML formula parser. */ bool getDdeItemInfo( - ::com::sun::star::sheet::DDEItemInfo& orItemInfo ) const; + css::sheet::DDEItemInfo& orItemInfo ) const; /** Returns the complete DDE link data of this DDE item. */ bool getDdeLinkData( @@ -106,13 +106,13 @@ private: void setResultSize( sal_Int32 nColumns, sal_Int32 nRows ); private: - typedef Matrix< ::com::sun::star::uno::Any > ResultMatrix; + typedef Matrix< css::uno::Any > ResultMatrix; const ExternalLink& mrParentLink; /// External link this name belongs to. ExternalNameModel maExtNameModel; /// Additional name data. ResultMatrix maResults; /// DDE/OLE link results. ResultMatrix::iterator maCurrIt; /// Current position in result matrix. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > + css::uno::Reference< css::sheet::XDDELink > mxDdeLink; /// Interface of a DDE link. bool mbDdeLinkCreated; /// True = already tried to create the DDE link. }; @@ -229,7 +229,7 @@ public: /** Returns the target URL of this external link. */ inline const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ - ::com::sun::star::sheet::ExternalLinkInfo getLinkInfo() const; + css::sheet::ExternalLinkInfo getLinkInfo() const; /** Returns the type of the external library if this is a library link. */ FunctionLibraryType getFuncLibraryType() const; @@ -239,7 +239,7 @@ public: /** Returns the external sheet cache index or for the passed sheet. */ sal_Int32 getSheetCacheIndex( sal_Int32 nTabId = 0 ) const; /** Returns the sheet cache of the external sheet with the passed index. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > + css::uno::Reference< css::sheet::XExternalSheetCache > getSheetCache( sal_Int32 nTabId ) const; /** Returns the internal sheet range or range of external sheet caches for the passed sheet range (BIFF only). */ @@ -265,10 +265,10 @@ private: ExternalLinkType meLinkType; /// Type of this link object. FunctionLibraryType meFuncLibType; /// Type of the function library, if link type is LINKTYPE_LIBRARY. - OUString maRelId; /// Relation identifier for the external link fragment. - OUString maClassName; /// DDE service, OLE class name. - OUString maTargetUrl; /// Target link, DDE topic, OLE target. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > + OUString maRelId; /// Relation identifier for the external link fragment. + OUString maClassName; /// DDE service, OLE class name. + OUString maTargetUrl; /// Target link, DDE topic, OLE target. + css::uno::Reference< css::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. Int16Vector maCalcSheets; /// Internal sheet indexes. Int32Vector maSheetCaches; /// External sheet cache indexes. @@ -315,7 +315,7 @@ public: void importExternalSheets( SequenceInputStream& rStrm ); /** Returns the sequence of link infos needed by the XML formula parser. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::ExternalLinkInfo > + css::uno::Sequence< css::sheet::ExternalLinkInfo > getLinkInfos() const; /** Returns the external link for the passed reference identifier. */ diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index af728e5b802d..6a320ff23c7d 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -38,7 +38,7 @@ class ExternalSheetDataContext : public WorkbookContextBase public: explicit ExternalSheetDataContext( WorkbookFragmentBase& rFragment, - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache ); + const css::uno::Reference< css::sheet::XExternalSheetCache >& rxSheetCache ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; @@ -62,12 +62,12 @@ private: void importExtCellString( SequenceInputStream& rStrm ); /** Sets the passed cell value to the current position in the sheet cache. */ - void setCellValue( const ::com::sun::star::uno::Any& rValue ); + void setCellValue( const css::uno::Any& rValue ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > + css::uno::Reference< css::sheet::XExternalSheetCache > mxSheetCache; /// The sheet cache used to store external cell values. - ::com::sun::star::table::CellAddress maCurrPos; /// Position of current cell. + css::table::CellAddress maCurrPos; /// Position of current cell. sal_Int32 mnCurrType; /// Data type of current cell. }; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 18b2988dd6fb..fa3b152c0564 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -56,7 +56,7 @@ public: /** Converts a non-empty vector into a UNO sequence containing elements of the same type. */ template< typename Type > - static ::com::sun::star::uno::Sequence< Type > + static css::uno::Sequence< Type > VectorToSequence( const ::std::vector< Type >& rVector ); /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ @@ -80,16 +80,16 @@ public: /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, + static css::uno::Sequence< css::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords = 0 ); }; template< typename Type > -::com::sun::star::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< Type >& rVector ) +css::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< Type >& rVector ) { OSL_ENSURE( !rVector.empty(), "ScfApiHelper::VectorToSequence - vector is empty" ); - return ::com::sun::star::uno::Sequence< Type >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); + return css::uno::Sequence< Type >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) ); } // Property sets ============================================================== @@ -125,8 +125,8 @@ public: void Set( css::uno::Reference< css::beans::XPropertySet > xPropSet ); /** Queries the passed interface for an XPropertySet and releases the old UNO property set. */ template< typename InterfaceType > - inline void Set( ::com::sun::star::uno::Reference< InterfaceType > xInterface ) - { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, ::com::sun::star::uno::UNO_QUERY ) ); } + inline void Set( css::uno::Reference< InterfaceType > xInterface ) + { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, css::uno::UNO_QUERY ) ); } /** Returns true, if the contained XPropertySet interface is valid. */ inline bool Is() const { return mxPropSet.is(); } @@ -176,7 +176,7 @@ public: /** Puts the passed value into the property set. */ template< typename Type > inline void SetProperty( const OUString& rPropName, const Type& rValue ) - { SetAnyProperty( rPropName, ::com::sun::star::uno::makeAny( rValue ) ); } + { SetAnyProperty( rPropName, css::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ inline void SetBoolProperty( const OUString& rPropName, bool bValue ) diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 36e5abe8b15f..65eb0022935a 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -286,8 +286,7 @@ public: void resize( size_t n ) { mvTokens.resize( n ); } /** Appends a new token with the passed op-code, returns its data field. */ - ::com::sun::star::uno::Any& - append( sal_Int32 nOpCode ); + css::uno::Any& append( sal_Int32 nOpCode ); /** Appends a new token with the passed op-code and data. */ template< typename Type > @@ -599,7 +598,7 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe { public: explicit OpCodeProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory, FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport = false ); virtual ~OpCodeProvider(); @@ -612,7 +611,7 @@ public: const FunctionInfo* getFuncInfoFromApiToken( const ApiToken& rToken ) const; /** Returns the op-code map that is used by the OOXML formula parser. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > + css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry > getOoxParserMap() const; private: @@ -627,7 +626,7 @@ class ApiParserWrapper : public OpCodeProvider { public: explicit ApiParserWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory, const OpCodeProvider& rOpCodeProv ); /** Returns read/write access to the formula parser property set. */ @@ -636,10 +635,10 @@ public: /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( const OUString& rFormula, - const ::com::sun::star::table::CellAddress& rRefPos ); + const css::table::CellAddress& rRefPos ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser > + css::uno::Reference< css::sheet::XFormulaParser > mxParser; PropertySet maParserProps; }; @@ -659,7 +658,7 @@ public: @param bAbsolute True = adds dollar signs before column and row. */ static OUString generateAddress2dString( - const ::com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, bool bAbsolute ); /** Generates a cell address string in A1 notation from the passed binary @@ -686,7 +685,7 @@ public: @param rMatrix The matrix containing double values or strings. */ - static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); + static OUString generateApiArray( const Matrix< css::uno::Any >& rMatrix ); /** Tries to extract a single cell reference from a formula token sequence. @@ -699,7 +698,7 @@ public: com.sun.star.sheet.ComplexReference object. If the token sequence contains too many, or unexpected tokens, an empty Any is returned. */ - ::com::sun::star::uno::Any + css::uno::Any extractReference( const ApiTokenSequence& rTokens ) const; /** Tries to extract a cell range address from a formula token sequence. @@ -721,7 +720,7 @@ public: address which has been extracted to orRange, false otherwise. */ bool extractCellRange( - ::com::sun::star::table::CellRangeAddress& orRange, + css::table::CellRangeAddress& orRange, const ApiTokenSequence& rTokens, bool bAllowRelative ) const; diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 26a76db99856..a491b8098457 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -37,14 +37,14 @@ public: */ struct SharedFormulaEntry { - com::sun::star::table::CellAddress maAddress; - com::sun::star::table::CellRangeAddress maRange; + css::table::CellAddress maAddress; + css::table::CellRangeAddress maRange; OUString maTokenStr; sal_Int32 mnSharedId; SharedFormulaEntry( - const com::sun::star::table::CellAddress& rAddress, - const com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellAddress& rAddress, + const css::table::CellRangeAddress& rRange, const OUString& rTokenStr, sal_Int32 nSharedId ); }; @@ -53,37 +53,37 @@ public: */ struct SharedFormulaDesc { - com::sun::star::table::CellAddress maAddress; + css::table::CellAddress maAddress; sal_Int32 mnSharedId; OUString maCellValue; sal_Int32 mnValueType; SharedFormulaDesc( - const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); }; struct TokenAddressItem { OUString maTokenStr; - ::com::sun::star::table::CellAddress maCellAddress; - TokenAddressItem( const OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} + css::table::CellAddress maCellAddress; + TokenAddressItem( const OUString& rTokenStr, const css::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} }; struct TokenRangeAddressItem { TokenAddressItem maTokenAndAddress; - ::com::sun::star::table::CellRangeAddress maCellRangeAddress; - TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const ::com::sun::star::table::CellRangeAddress& rCellRangeAddress ) : maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) {} + css::table::CellRangeAddress maCellRangeAddress; + TokenRangeAddressItem( const TokenAddressItem& rTokenAndAddress, const css::table::CellRangeAddress& rCellRangeAddress ) : maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) {} }; struct FormulaValue { - com::sun::star::table::CellAddress maCellAddress; + css::table::CellAddress maCellAddress; OUString maValueStr; sal_Int32 mnCellType; }; - typedef std::pair<com::sun::star::table::CellAddress, double> ValueAddressPair; + typedef std::pair<css::table::CellAddress, double> ValueAddressPair; struct SheetItem { @@ -118,10 +118,10 @@ private: public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& ); + void setCellFormula( const css::table::CellAddress& rAddress, const OUString& ); void setCellFormula( - const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, + const css::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); void setCellFormulaValue( diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 95500860b4d6..f2158e3c2825 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -105,12 +105,12 @@ public: /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( - const ::com::sun::star::table::CellAddress& rBaseAddr, + const css::table::CellAddress& rBaseAddr, const OUString& rFormulaString ) const; /** Imports and converts a BIFF12 token array from the passed stream. */ ApiTokenSequence importFormula( - const ::com::sun::star::table::CellAddress& rBaseAddr, + const css::table::CellAddress& rBaseAddr, FormulaType eType, SequenceInputStream& rStrm ) const; diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index c7535e67d1a5..c3928de80750 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -35,8 +35,8 @@ namespace xls { struct NumFmtModel { - ::com::sun::star::lang::Locale maLocale; - OUString maFmtCode; + css::lang::Locale maLocale; + OUString maFmtCode; sal_Int16 mnPredefId; explicit NumFmtModel(); @@ -60,17 +60,17 @@ public: void setFormatCode( const OUString& rFmtCode ); /** Sets the passed format code, encoded in UTF-8. */ void setFormatCode( - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const sal_Char* pcFmtCode ); /** Sets the passed predefined format code identifier. */ void setPredefinedId( - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, sal_Int16 nPredefId ); /** Final processing after import of all style settings. Returns the API format index. */ sal_Int32 finalizeImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& rxNumFmts, - const ::com::sun::star::lang::Locale& rFromLocale ); + const css::uno::Reference< css::util::XNumberFormats >& rxNumFmts, + const css::lang::Locale& rFromLocale ); sal_uLong fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; /** Writes the number format to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 91df7282977e..4520a9f4707b 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -34,9 +34,9 @@ namespace xls { class OOXMLFormulaParserImpl; typedef ::cppu::WeakImplHelper< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE; + css::lang::XServiceInfo, + css::lang::XInitialization, + css::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE; /** OOXML formula parser/compiler service for usage in ODF filters. */ class OOXMLFormulaParser : public OOXMLFormulaParser_BASE @@ -48,45 +48,45 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rService ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::uno::Any >& rArgs ) + throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFormulaParser interface ---------------------------- - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula( const ::rtl::OUString& rFormula, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::table::CellAddress& rReferencePos ) + throw( css::uno::RuntimeException, std::exception ) override; virtual ::rtl::OUString SAL_CALL printFormula( - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& rTokens, - const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::sheet::FormulaToken >& rTokens, + const css::table::CellAddress& rReferencePos ) + throw( css::uno::RuntimeException, std::exception ) override; private: typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > mxComponent; ParserImplRef mxParserImpl; /// Implementation of import parser. }; diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 004f56275dd6..d42a46c0a439 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -460,7 +460,7 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory int mnProgress; - com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> mxStatusIndicator; + css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator; public: ScOrcusFactory(ScDocument& rDoc); @@ -480,7 +480,7 @@ public: void incrementProgress(); - void setStatusIndicator(const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& rIndicator); + void setStatusIndicator(const css::uno::Reference<css::task::XStatusIndicator>& rIndicator); }; class ScOrcusTable : public orcus::spreadsheet::iface::import_table diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 3aa935468cb6..a18c2addf6f1 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -88,7 +88,7 @@ public: /** Returns the type of the item. */ inline sal_Int32 getType() const { return mnType; } /** Returns the value of the item. */ - inline const ::com::sun::star::uno::Any& getValue() const { return maValue; } + inline const css::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ OUString getName() const; /** Returns true if the item is unused. */ @@ -98,7 +98,7 @@ private: friend class PivotCacheItemList; // #FIXME hack Sets the value of this item to the given string ( and overwrites type if necessary void setStringValue( const OUString& sName ); - ::com::sun::star::uno::Any maValue; /// Value of the item. + css::uno::Any maValue; /// Value of the item. sal_Int32 mnType; /// Value type (OOXML token identifier). bool mbUnused; }; @@ -174,8 +174,8 @@ struct PCSharedItemsModel struct PCFieldGroupModel { - ::com::sun::star::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. - ::com::sun::star::util::DateTime maEndDate; /// Manual or calculated end date for range grouping. + css::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. + css::util::DateTime maEndDate; /// Manual or calculated end date for range grouping. double mfStartValue; /// Manual or calculated start value for range grouping. double mfEndValue; /// Manual or calculated end value for range grouping. double mfInterval; /// Interval for numeric range grouping. @@ -279,13 +279,13 @@ public: /** Creates inplace numeric grouping settings. */ void convertNumericGrouping( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxDPField ) const; + const css::uno::Reference< css::sheet::XDataPilotField >& rxDPField ) const; /** Creates inplace date grouping settings or a new date group field. */ OUString createDateGroupField( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField ) const; + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField ) const; /** Creates a new grouped DataPilot field and returns its name. */ OUString createParentGroupField( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ) const; @@ -358,8 +358,8 @@ struct PCWorksheetSourceModel OUString maRelId; /// Relation identifier for an external document URL. OUString maSheet; /// Sheet name for cell range or sheet-local defined names. OUString maDefName; /// Defined name containing a cell range if present. - ::com::sun::star::table::CellRangeAddress - maRange; /// Source cell range of the data. + css::table::CellRangeAddress + maRange; /// Source cell range of the data. explicit PCWorksheetSourceModel(); }; @@ -397,7 +397,7 @@ public: /** Returns true, if the pivot cache is based on a dummy sheet created in finalizeImport. */ inline bool isBasedOnDummySheet() const { return mbDummySheet; } /** Returns the internal cell range the cache is based on. */ - inline const ::com::sun::star::table::CellRangeAddress& + inline const css::table::CellRangeAddress& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 77599286db72..aaef9bb1bdca 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -139,14 +139,14 @@ public: /** Finalizes the field after import, creates grouping and other settings. */ void finalizeImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& rxDPDesc ); + const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc ); /** Finalizes the grouped date field after import. */ void finalizeDateGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, sal_Int32 nBaseFieldIdx ); /** Finalizes the grouped field after import. */ void finalizeParentGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ); @@ -166,7 +166,7 @@ public: private: /** Converts dimension and other settings for row, column, page, or hidden fields. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > convertRowColPageField( sal_Int32 nAxis ); private: @@ -271,7 +271,7 @@ struct PTDefinitionModel : public AutoFormatModel struct PTLocationModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Target cell range for the pivot table. sal_Int32 mnFirstHeaderRow; /// First row of header cells (relative in pivot table). sal_Int32 mnFirstDataRow; /// First row of data cells (relative in pivot table). @@ -321,22 +321,22 @@ public: void finalizeImport(); /** Creates all date group fields for the specified cache field after import. */ void finalizeDateGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, sal_Int32 nBaseFieldIdx ); /** Creates all grouped fields for the specified cache field after import. */ void finalizeParentGroupingImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, + const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ); /** Returns the associated data pilot field for the specified pivot table field. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataPilotField( const OUString& rFieldName ) const; /** Returns the associated data pilot field for the specified pivot table field. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataPilotField( sal_Int32 nFieldIdx ) const; /** Returns the data layout field used to store all data fields in row/col dimension. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > + css::uno::Reference< css::sheet::XDataPilotField > getDataLayoutField() const; /** Returns the cache field with the specified index. */ @@ -365,19 +365,19 @@ private: static void importFields( IndexVector& orFields, SequenceInputStream& rStrm ); private: - ScDPObject* mpDPObject; + ScDPObject* mpDPObject; PivotTableFieldVector maFields; /// All pivot table fields. - PivotTableField maDataField; /// Data layout field. - IndexVector maRowFields; /// Indexes to fields in row dimension. - IndexVector maColFields; /// Indexes to fields in column dimension. - PageFieldVector maPageFields; /// Settings for all fields in page dimension. - DataFieldVector maDataFields; /// Settings for all fields in data area. + PivotTableField maDataField; /// Data layout field. + IndexVector maRowFields; /// Indexes to fields in row dimension. + IndexVector maColFields; /// Indexes to fields in column dimension. + PageFieldVector maPageFields; /// Settings for all fields in page dimension. + DataFieldVector maDataFields; /// Settings for all fields in data area. PivotTableFilterVector maFilters; /// All field filters. - PTDefinitionModel maDefModel; /// Global pivot table settings. - PTLocationModel maLocationModel; /// Location settings of the pivot table. - const PivotCache* mpPivotCache; /// The pivot cache this table is based on. - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > - mxDPDescriptor; /// Descriptor of the DataPilot object. + PTDefinitionModel maDefModel; /// Global pivot table settings. + PTLocationModel maLocationModel; /// Location settings of the pivot table. + const PivotCache* mpPivotCache; /// The pivot cache this table is based on. + css::uno::Reference< css::sheet::XDataPilotDescriptor > + mxDPDescriptor; /// Descriptor of the DataPilot object. }; class PivotTableBuffer : public WorkbookHelper diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 5635fed17330..766193710810 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -67,12 +67,12 @@ public: /** Converts the portion and replaces or appends to the passed XText. */ void convert( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, const oox::xls::Font* pFont, bool bReplace ); void convert( ScEditEngineDefaulter& rEE, ESelection& rSelection, const oox::xls::Font* pFont ); void writeFontProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, const oox::xls::Font* pFont ) const; private: @@ -256,7 +256,7 @@ public: @param pFirstPortionFont Optional font providing additional rich-text formatting for the first text portion, e.g. font escapement. */ void convert( - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rxText, + const css::uno::Reference< css::text::XText >& rxText, bool bReplaceOld, const oox::xls::Font* pFirstPortionFont = 0 ) const; ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const; diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 6afad59b8b8c..784548f31fa2 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -30,8 +30,8 @@ namespace xls { struct ScenarioCellModel { - ::com::sun::star::table::CellAddress maPos; - OUString maValue; + css::table::CellAddress maPos; + OUString maValue; sal_Int32 mnNumFmtId; bool mbDeleted; diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index c703bb641d52..a44db3431741 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -37,7 +37,7 @@ namespace xls { /** Stores basic data about cell values and formatting. */ struct CellModel { - ::com::sun::star::table::CellAddress + css::table::CellAddress maCellAddr; /// The address of the current cell. sal_Int32 mnCellType; /// Data type of the cell value. sal_Int32 mnXfId; /// XF (cell formatting) identifier. @@ -49,7 +49,7 @@ struct CellModel /** Stores data about cell formulas. */ struct CellFormulaModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maFormulaRef; /// Formula range for array/shared formulas and data tables. sal_Int32 mnFormulaType; /// Type of the formula (regular, array, shared, table). sal_Int32 mnSharedId; /// Identifier of a shared formula (OOXML only). @@ -57,9 +57,9 @@ struct CellFormulaModel explicit CellFormulaModel(); /** Returns true, if the passed cell address is valid for an array formula. */ - bool isValidArrayRef( const ::com::sun::star::table::CellAddress& rCellAddr ); + bool isValidArrayRef( const css::table::CellAddress& rCellAddr ); /** Returns true, if the passed cell address is valid for a shared formula. */ - bool isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr ); + bool isValidSharedRef( const css::table::CellAddress& rCellAddr ); }; /** Stores data about table operations. */ @@ -112,7 +112,7 @@ public: /** Inserts a shared string cell into the sheet. */ void setStringCell( const CellModel& rModel, sal_Int32 nStringId ); /** Inserts a date/time cell into the sheet and adjusts number format. */ - void setDateTimeCell( const CellModel& rModel, const ::com::sun::star::util::DateTime& rDateTime ); + void setDateTimeCell( const CellModel& rModel, const css::util::DateTime& rDateTime ); /** Inserts a boolean cell into the sheet and adjusts number format. */ void setBooleanCell( const CellModel& rModel, bool bValue ); /** Inserts an error cell from the passed error code into the sheet. */ @@ -125,25 +125,25 @@ public: void setDateCell( const CellModel& rModel, const OUString& rDateString ); void createSharedFormula( - const com::sun::star::table::CellAddress& rRange, + const css::table::CellAddress& rRange, const ApiTokenSequence& rTokens); /** Inserts the passed token array as array formula. */ void createArrayFormula( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const ApiTokenSequence& rTokens ); /** Sets a multiple table operation to the passed range. */ void createTableOperation( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const DataTableModel& rModel ); /** Sets default cell formatting for the specified range of rows. */ void setRowFormat( sal_Int32 nRow, sal_Int32 nXfId, bool bCustomFormat ); /** Merges the cells in the passed cell range. */ - void setMergedRange( const ::com::sun::star::table::CellRangeAddress& rRange ); + void setMergedRange( const css::table::CellRangeAddress& rRange ); /** Sets a standard number format (constant from com.sun.star.util.NumberFormat) to the specified cell. */ void setStandardNumFmt( - const ::com::sun::star::table::CellAddress& rCellAddr, + const css::table::CellAddress& rCellAddr, sal_Int16 nStdNumFmt ); /** Processes the cell formatting data of the passed cell. @param nNumFmtId If set, overrides number format of the cell XF. */ @@ -154,7 +154,7 @@ public: /** Sets the passed formula token array into a cell. */ void setCellFormula( - const ::com::sun::star::table::CellAddress& rCellAddr, + const css::table::CellAddress& rCellAddr, const ApiTokenSequence& rTokens ); private: @@ -166,22 +166,22 @@ private: /** Inserts the passed array formula into the sheet. */ void finalizeArrayFormula( - const ::com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellRangeAddress& rRange, const ApiTokenSequence& rTokens ) const; /** Inserts the passed table operation into the sheet. */ void finalizeTableOperation( - const ::com::sun::star::table::CellRangeAddress& rRange, const DataTableModel& rModel ); + const css::table::CellRangeAddress& rRange, const DataTableModel& rModel ); /** Writes all cell formatting attributes to the passed cell range list. (depreciates writeXfIdRangeProperties) */ - void applyCellMerging( const ::com::sun::star::table::CellRangeAddress& rRange ); - void addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const ::com::sun::star::table::CellRangeAddress& rAddress, bool bProcessRowRange = false ); + void applyCellMerging( const css::table::CellRangeAddress& rRange ); + void addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const css::table::CellRangeAddress& rAddress, bool bProcessRowRange = false ); private: /** Stores cell range address and formula token array of an array formula. */ - typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, ApiTokenSequence > ArrayFormula; + typedef ::std::pair< css::table::CellRangeAddress, ApiTokenSequence > ArrayFormula; typedef ::std::list< ArrayFormula > ArrayFormulaList; /** Stores cell range address and settings of a table operation. */ - typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, DataTableModel > TableOperation; + typedef ::std::pair< css::table::CellRangeAddress, DataTableModel > TableOperation; typedef ::std::list< TableOperation > TableOperationList; /** Stores information about a range of rows with equal cell formatting. */ @@ -217,13 +217,13 @@ private: /** Stores information about a merged cell range. */ struct MergedRange { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// The formatted cell range. sal_Int32 mnHorAlign; /// Horizontal alignment in the range. - explicit MergedRange( const ::com::sun::star::table::CellRangeAddress& rRange ); - explicit MergedRange( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign ); - bool tryExpand( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nHorAlign ); + explicit MergedRange( const css::table::CellRangeAddress& rRange ); + explicit MergedRange( const css::table::CellAddress& rAddress, sal_Int32 nHorAlign ); + bool tryExpand( const css::table::CellAddress& rAddress, sal_Int32 nHorAlign ); }; typedef ::std::list< MergedRange > MergedRangeList; @@ -233,7 +233,7 @@ private: TableOperationList maTableOperations; /// All table operations in the sheet. ::std::map< BinAddress, ApiTokenSequence > maSharedFormulas; /// Maps shared formula base address to defined name token index. - ::com::sun::star::table::CellAddress + css::table::CellAddress maSharedFmlaAddr; /// Address of a cell containing a pending shared formula. css::table::CellAddress maSharedBaseAddr; /// Base address of the pending shared formula. XfIdRowRange maXfIdRowRange; /// Cached XF identifier for a range of rows. diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index c3c4e6bd74c7..a1d2aea4e9d6 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -250,7 +250,7 @@ public: void finalizeImport(); /** Returns an API font descriptor with own font information. */ - const ::com::sun::star::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} + const css::awt::FontDescriptor& getFontDescriptor() const { return maApiData.maDesc;} /** Returns true, if the font requires rich text formatting in Calc. @descr Example: Font escapement is a cell attribute in Excel, but Calc needs an rich text cell for this attribute. */ @@ -357,7 +357,7 @@ struct ProtectionModel /** Contains all API cell protection attributes. */ struct ApiProtectionData { - typedef ::com::sun::star::util::CellProtection ApiCellProtection; + typedef css::util::CellProtection ApiCellProtection; ApiCellProtection maCellProt; @@ -421,7 +421,7 @@ struct BorderModel /** Contains API attributes of a complete cell border. */ struct ApiBorderData { - typedef ::com::sun::star::table::BorderLine2 ApiBorderLine; + typedef css::table::BorderLine2 ApiBorderLine; ApiBorderLine maLeft; /// Left line format ApiBorderLine maRight; /// Right line format @@ -476,7 +476,7 @@ private: /** Converts border line data to an API struct, returns true, if the line is marked as used. */ bool convertBorderLine( - ::com::sun::star::table::BorderLine2& rBorderLine, + css::table::BorderLine2& rBorderLine, const BorderLineModel& rModel ); private: diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index c18c57ab13ad..55eb2bdd4d5a 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -30,10 +30,10 @@ namespace xls { struct TableModel { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// Original (unchecked) range of the table. - OUString maProgName; /// Programmatical name. - OUString maDisplayName; /// Display name. + OUString maProgName; /// Programmatical name. + OUString maDisplayName; /// Display name. sal_Int32 mnId; /// Unique table identifier. sal_Int32 mnType; /// Table type (worksheet, query, etc.). sal_Int32 mnHeaderRows; /// Number of header rows. @@ -69,9 +69,9 @@ public: inline const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ - inline const ::com::sun::star::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } + inline const css::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } /** Returns the cell range of this table. */ - inline const ::com::sun::star::table::CellRangeAddress& getRange() const { return maDestRange; } + inline const css::table::CellRangeAddress& getRange() const { return maDestRange; } /** Returns the number of columns of this table. */ inline sal_Int32 getWidth() const { return maDestRange.EndColumn - maDestRange.StartColumn + 1; } /** Returns the number of rows of this table. */ @@ -86,7 +86,7 @@ private: AutoFilterBuffer maAutoFilters; /// Filter settings for this table. TableColumnsBuffer maTableColumns; /// Column names of this table. OUString maDBRangeName; /// Name of the database range in the Calc document. - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maDestRange; /// Validated range of the table in the worksheet. sal_Int32 mnTokenIndex; /// Token index used in API token array. }; diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 47db0e8e099e..0453ac7f15be 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -68,7 +68,7 @@ public: /** Final processing after import of all style settings. */ void finalizeImport(); /** Updates internal nulldate for date/serial conversion. */ - void finalizeNullDate( const ::com::sun::star::util::Date& rNullDate ); + void finalizeNullDate( const css::util::Date& rNullDate ); /** Converts the passed value between the passed units. */ double scaleValue( double fValue, Unit eFromUnit, Unit eToUnit ) const; @@ -79,9 +79,9 @@ public: double scaleFromMm100( sal_Int32 nMm100, Unit eUnit ) const; /** Returns the serial value of the passed datetime, based on current nulldate. */ - double calcSerialFromDateTime( const ::com::sun::star::util::DateTime& rDateTime ) const; + double calcSerialFromDateTime( const css::util::DateTime& rDateTime ) const; /** Returns the datetime of the passed serial value, based on current nulldate. */ - ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) const; + css::util::DateTime calcDateTimeFromSerial( double fSerial ) const; /** Returns a BIFF error code from the passed error string. */ sal_uInt8 calcBiffErrorCode( const OUString& rErrorCode ) const; diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index 15ba52db8a6a..5e8b5b656807 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -32,7 +32,7 @@ namespace xls { /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel { - ::com::sun::star::table::CellAddress maActiveCell; /// Position of active cell (cursor). + css::table::CellAddress maActiveCell; /// Position of active cell (cursor). ApiCellRangeList maSelection; /// Selected cell ranges. sal_Int32 mnActiveCellId; /// Index of active cell in selection list. @@ -46,8 +46,8 @@ struct SheetViewModel PaneSelectionModelMap maPaneSelMap; /// Selections of all panes. Color maGridColor; /// Grid color. - ::com::sun::star::table::CellAddress maFirstPos; /// First visible cell. - ::com::sun::star::table::CellAddress maSecondPos; /// First visible cell in additional panes. + css::table::CellAddress maFirstPos; /// First visible cell. + css::table::CellAddress maSecondPos; /// First visible cell in additional panes. sal_Int32 mnWorkbookViewId; /// Index into list of workbookView elements. sal_Int32 mnViewType; /// View type (normal, page break, layout). sal_Int32 mnActivePaneId; /// Active pane (with cell cursor). @@ -164,10 +164,10 @@ public: /** Stores converted view settings for a specific worksheet. */ void setSheetViewSettings( sal_Int16 nSheet, const SheetViewModelRef& rxSheetView, - const ::com::sun::star::uno::Any& rProperties ); + const css::uno::Any& rProperties ); /** Stores the used area for a specific worksheet. */ void setSheetUsedArea( - const ::com::sun::star::table::CellRangeAddress& rUsedArea ); + const css::table::CellRangeAddress& rUsedArea ); /** Converts all imported document view settings. */ void finalizeImport(); @@ -181,14 +181,14 @@ private: private: typedef RefVector< WorkbookViewModel > WorkbookViewModelVec; typedef RefMap< sal_Int16, SheetViewModel > SheetViewModelMap; - typedef ::std::map< sal_Int16, ::com::sun::star::uno::Any > SheetPropertiesMap; - typedef ::std::map< sal_Int16, ::com::sun::star::table::CellRangeAddress > SheetUsedAreaMap; + typedef ::std::map< sal_Int16, css::uno::Any > SheetPropertiesMap; + typedef ::std::map< sal_Int16, css::table::CellRangeAddress > SheetUsedAreaMap; WorkbookViewModelVec maBookViews; /// Workbook view models. SheetViewModelMap maSheetViews; /// Active view model for each sheet. SheetPropertiesMap maSheetProps; /// Converted property sequences for each sheet. SheetUsedAreaMap maSheetUsedAreas; /// Used area (cell range) of every sheet. - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maOleSize; /// Visible area if this is an embedded OLE object. bool mbValidOleSize; /// True = imported OLE size is a valid cell range. }; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 9609b2428608..91c544b3084f 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -154,26 +154,26 @@ public: ScEditEngineDefaulter& getEditEngine() const; /** Returns a reference to the source/target spreadsheet document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > getDocument() const; /** Returns a reference to the specified spreadsheet in the document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > getSheetFromDoc( sal_Int32 nSheet ) const; /** Returns a reference to the specified spreadsheet in the document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > getSheetFromDoc( const OUString& rSheet ) const; /** Returns the XCellRange interface for the passed cell range address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + css::uno::Reference< css::table::XCellRange > getCellRangeFromDoc( - const ::com::sun::star::table::CellRangeAddress& rRange ) const; + const css::table::CellRangeAddress& rRange ) const; /** Returns the cell or page styles container from the Calc document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > getStyleFamily( bool bPageStyles ) const; /** Returns the specified cell or page style from the Calc document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + css::uno::Reference< css::style::XStyle > getStyleObject( const OUString& rStyleName, bool bPageStyle ) const; /** Creates and returns a defined name on-the-fly in the Calc document. @@ -181,7 +181,7 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createNamedRangeObject( OUString& orName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, + const css::uno::Sequence< css::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0 ) const; @@ -190,29 +190,29 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createLocalNamedRangeObject( OUString& orName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, + const css::uno::Sequence< css::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const; /** Creates and returns a database range on-the-fly in the Calc document. The range will not be buffered in the global table buffer. @param orName (in/out-parameter) Returns the resulting used name. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > + css::uno::Reference< css::sheet::XDatabaseRange > createDatabaseRangeObject( OUString& orName, - const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; + const css::table::CellRangeAddress& rRangeAddr ) const; /** Creates and returns an unnamed database range on-the-fly in the Calc document. The range will not be buffered in the global table buffer. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > + css::uno::Reference< css::sheet::XDatabaseRange > createUnnamedDatabaseRangeObject( - const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; + const css::table::CellRangeAddress& rRangeAddr ) const; /** Finds the (already existing) database range of the given formula token index. */ ScDBData* findDatabaseRangeByIndex( sal_uInt16 nIndex ) const; /** Creates and returns a com.sun.star.style.Style object for cells or pages. */ - ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > + css::uno::Reference< css::style::XStyle > createStyleObject( OUString& orStyleName, bool bPageStyle ) const; diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 0e6b3787f250..e384dec70853 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -98,7 +98,7 @@ public: /** Returns the show objects mode (considered a view setting in Calc). */ sal_Int16 getApiShowObjectMode() const; /** Returns the nulldate of this workbook. */ - ::com::sun::star::util::Date getNullDate() const; + css::util::Date getNullDate() const; private: /** Updates date mode and unit converter nulldate. */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 41d86dedd3bc..b7aec9c88660 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -127,9 +127,9 @@ struct PageBreakModel /** Stores data about a hyperlink range. */ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress maRange; /// The cell area containing the hyperlink. - OUString maTooltip; /// Additional tooltip text. + OUString maTooltip; /// Additional tooltip text. explicit HyperlinkModel(); }; @@ -193,26 +193,26 @@ public: /** Returns the index of the current sheet. */ sal_Int32 getSheetIndex() const; /** Returns the XSpreadsheet interface of the current sheet. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& + const css::uno::Reference< css::sheet::XSpreadsheet >& getSheet() const; /** Returns the XCell interface for the passed cell address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > - getCell( const ::com::sun::star::table::CellAddress& rAddress ) const; + css::uno::Reference< css::table::XCell > + getCell( const css::table::CellAddress& rAddress ) const; /** Returns the XCellRange interface for the passed cell range address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - getCellRange( const ::com::sun::star::table::CellRangeAddress& rRange ) const; + css::uno::Reference< css::table::XCellRange > + getCellRange( const css::table::CellRangeAddress& rRange ) const; /** Returns the XDrawPage interface of the draw page of the current sheet. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > getDrawPage() const; /** Returns the absolute cell position in 1/100 mm. */ - ::com::sun::star::awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; + css::awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the cell size in 1/100 mm. */ - ::com::sun::star::awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; + css::awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the size of the entire drawing page in 1/100 mm. */ - ::com::sun::star::awt::Size getDrawPageSize() const; + css::awt::Size getDrawPageSize() const; /** Returns the buffer for cell contents and cell formatting. */ SheetDataBuffer& getSheetData() const; @@ -247,11 +247,11 @@ public: void setVmlDrawingPath( const OUString& rVmlDrawingPath ); /** Extends the used area of this sheet by the passed cell position. */ - void extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress ); + void extendUsedArea( const css::table::CellAddress& rAddress ); /** Extends the used area of this sheet by the passed cell range. */ - void extendUsedArea( const ::com::sun::star::table::CellRangeAddress& rRange ); + void extendUsedArea( const css::table::CellRangeAddress& rRange ); /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */ - void extendShapeBoundingBox( const ::com::sun::star::awt::Rectangle& rShapeRect ); + void extendShapeBoundingBox( const css::awt::Rectangle& rShapeRect ); /** Sets base width for all columns (without padding pixels). This value is only used, if width has not been set with setDefaultColumnWidth(). */ @@ -274,17 +274,17 @@ public: void setRowModel( const RowModel& rModel ); /** Inserts a value cell directly into the Calc sheet. */ - void putValue( const com::sun::star::table::CellAddress& rAddress, double fValue ); + void putValue( const css::table::CellAddress& rAddress, double fValue ); /** Inserts a string cell directly into the Calc sheet. */ - void putString( const com::sun::star::table::CellAddress& rAddress, const OUString& rText ); + void putString( const css::table::CellAddress& rAddress, const OUString& rText ); /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( - const com::sun::star::table::CellAddress& rAddress, + const css::table::CellAddress& rAddress, const RichString& rString, const oox::xls::Font* pFirstPortionFont ); /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( - const com::sun::star::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); + const css::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); /** Initial conversion before importing the worksheet. */ void initializeWorksheetImport(); @@ -293,17 +293,17 @@ public: /** Final import of drawing objects. Has to be called after all content has been imported */ void finalizeDrawingImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void setCellFormula( const css::table::CellAddress& rTokenAddress, const OUString& ); void setCellFormula( - const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& ); void createSharedFormulaMapEntry( - const com::sun::star::table::CellAddress& rAddress, - const com::sun::star::table::CellRangeAddress& rRange, + const css::table::CellAddress& rAddress, + const css::table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 76e09398976a..3c02a9500ad0 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -57,9 +57,9 @@ class EscherExHostAppData; class ShapeInteractionHelper { public: - static XclExpShapeObj* CreateShapeObj( XclExpObjectManager& rObjMgr, const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, ScDocument* pDoc ); - static void PopulateShapeInteractionInfo( XclExpObjectManager& rObjMgr, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData ); + static XclExpShapeObj* CreateShapeObj( XclExpObjectManager& rObjMgr, const css::uno::Reference< + css::drawing::XShape >& xShape, ScDocument* pDoc ); + static void PopulateShapeInteractionInfo( XclExpObjectManager& rObjMgr, const css::uno::Reference< css::drawing::XShape >& xShape, EscherExHostAppData& rHostAppData ); }; class XclEscherEx : public EscherEx, protected XclExpRoot @@ -92,7 +92,7 @@ public: XclExpDffAnchorBase* CreateDffAnchor( const SdrObject& rSdrObj ) const; virtual EscherExHostAppData* StartShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, + const css::uno::Reference< css::drawing::XShape>& rxShape, const Rectangle* pChildAnchor ) override; virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) override; virtual EscherExHostAppData* EnterAdditionalTextGroup() override; @@ -102,35 +102,34 @@ public: /** Creates an OCX form control OBJ record from the passed form control. @descr Writes the form control data to the 'Ctls' stream. */ std::unique_ptr<XclExpOcxControlObj> CreateOCXCtrlObj( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); private: tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream. /** Creates a TBX form control OBJ record from the passed form control. */ std::unique_ptr<XclExpTbxControlObj> CreateTBXCtrlObj( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); private: /** Tries to get the name of a Basic macro from a control. */ void ConvertTbxMacro( XclExpTbxControlObj& rTbxCtrlObj, - ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XControlModel > xCtrlModel ); + css::uno::Reference< css::awt::XControlModel > xCtrlModel ); void DeleteCurrAppData(); private: - XclExpObjectManager& mrObjMgr; - std::stack< std::pair< XclObj*, XclEscherHostAppData* > > aStack; - XclObj* pCurrXclObj; - XclEscherHostAppData* pCurrAppData; - XclEscherClientData* pTheClientData; // always the same - XclEscherClientTextbox* pAdditionalText; - sal_uInt16 nAdditionalText; - sal_uInt32 mnNextKey; - bool mbIsRootDff; + XclExpObjectManager& mrObjMgr; + std::stack< std::pair< XclObj*, XclEscherHostAppData* > > aStack; + XclObj* pCurrXclObj; + XclEscherHostAppData* pCurrAppData; + XclEscherClientData* pTheClientData; // always the same + XclEscherClientTextbox* pAdditionalText; + sal_uInt16 nAdditionalText; + sal_uInt32 mnNextKey; + bool mbIsRootDff; }; // --- class XclEscherHostAppData ------------------------------------ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e227170d5d35..6d34a3410aa5 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -248,20 +248,20 @@ protected: public: XclObjAny( XclExpObjectManager& rObjMgr, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, + const css::uno::Reference< css::drawing::XShape >& rShape, ScDocument* pDoc); virtual ~XclObjAny(); - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetShape() const { return mxShape; } virtual void Save( XclExpStream& rStrm ) override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); - static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); + static void WriteFromTo( XclExpXmlStream& rStrm, const css::uno::Reference< css::drawing::XShape >& rShape, SCTAB nTab ); private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > mxShape; ScDocument* mpDoc; }; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 35dd574675dc..001666a9c63a 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -113,7 +113,7 @@ public: /** Converts the passed vertical coordinate from 1/100 mm to Excel chart units. */ sal_Int32 CalcChartYFromHmm( sal_Int32 nPosY ) const; /** Converts the passed rectangle from 1/100 mm to Excel chart units. */ - XclChRectangle CalcChartRectFromHmm( const ::com::sun::star::awt::Rectangle& rRect ) const; + XclChRectangle CalcChartRectFromHmm( const css::awt::Rectangle& rRect ) const; /** Reads all line properties from the passed property set. */ void ConvertLineFormat( @@ -943,7 +943,7 @@ public: explicit XclExpChLabelRange( const XclExpChRoot& rRoot ); /** Converts category axis scaling settings. */ - void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData, + void Convert( const css::chart2::ScaleData& rScaleData, const ScfPropertySet& rChart1Axis, bool bMirrorOrient ); /** Converts position settings of a crossing axis at this axis. */ void ConvertAxisPosition( const ScfPropertySet& rPropSet ); @@ -968,7 +968,7 @@ public: explicit XclExpChValueRange( const XclExpChRoot& rRoot ); /** Converts value axis scaling settings. */ - void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData ); + void Convert( const css::chart2::ScaleData& rScaleData ); /** Converts position settings of a crossing axis at this axis. */ void ConvertAxisPosition( const ScfPropertySet& rPropSet ); @@ -1165,7 +1165,7 @@ class XclExpChartDrawing : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpChartDrawing( const XclExpRoot& rRoot, - const ::com::sun::star::uno::Reference< css::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, const Size& rChartSize ); virtual ~XclExpChartDrawing(); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 33b992d10e02..2113e1e52ae2 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -169,7 +169,7 @@ public: protected: /** Tries to get spreadsheet cell link and source range link from the passed shape. */ void ConvertSheetLinks( - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + css::uno::Reference< css::drawing::XShape > xShape ); /** Returns the Excel token array of the cell link, or 0, if no link present. */ inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } @@ -201,7 +201,7 @@ public: void WriteMacroSubRec( XclExpStream& rStrm ); /** Sets the name of a macro for object of passed type @return true = The passed event descriptor was valid, macro name has been found. */ - bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType ); + bool SetMacroLink( const css::script::ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType ); /** Sets the name of a macro @return true = The passed macro name has been found. */ @@ -211,7 +211,7 @@ public: class XclExpShapeObj : public XclObjAny, public XclMacroHelper { public: - explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, ScDocument* pDoc ); + explicit XclExpShapeObj( XclExpObjectManager& rRoot, css::uno::Reference< css::drawing::XShape > xShape, ScDocument* pDoc ); virtual ~XclExpShapeObj(); private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -226,7 +226,7 @@ class XclExpOcxControlObj : public XclObj, public XclExpControlHelper public: explicit XclExpOcxControlObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor, const OUString& rClassName, sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); @@ -248,12 +248,12 @@ class XclExpTbxControlObj : public XclObj, public XclMacroHelper public: explicit XclExpTbxControlObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); /** Sets the name of a macro attached to this control. @return true = The passed event descriptor was valid, macro name has been found. */ - bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); + bool SetMacroLink( const css::script::ScriptEventDescriptor& rEvent ); private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; @@ -291,7 +291,7 @@ class XclExpChartObj : public XclObj, protected XclExpRoot public: explicit XclExpChartObj( XclExpObjectManager& rObjMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, + css::uno::Reference< css::drawing::XShape > xShape, const Rectangle* pChildAnchor ); virtual ~XclExpChartObj(); @@ -401,7 +401,7 @@ public: std::shared_ptr< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage ); /** Processes a collection of UNO shapes and returns the record block containing all related records (MSODRAWING, OBJ, TXO, charts, etc.). */ - std::shared_ptr< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); + std::shared_ptr< XclExpRecordBase > ProcessDrawing( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); /** Finalizes the object manager after conversion of all sheets. */ void EndDocument(); diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index dd7d646031dd..d52a8edc6679 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -175,9 +175,9 @@ public: bool IsDocumentEncrypted() const; - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; + static css::uno::Sequence< css::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); + css::uno::Sequence< css::beans::NamedValue > GetEncryptionData() const; + css::uno::Sequence< css::beans::NamedValue > GenerateDefaultEncryptionData() const; private: diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 5b95a74bcd0e..a13a39650f75 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -216,7 +216,7 @@ public: void EncryptBytes( SvStream& rStrm, ::std::vector<sal_uInt8>& aBytes ); private: - void Init( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); + void Init( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ); static sal_uInt32 GetBlockPos( sal_Size nStrmPos ); static sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ); @@ -293,7 +293,7 @@ public: class XclExpXmlStream : public oox::core::XmlFilterBase { public: - XclExpXmlStream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCC, bool bExportVBA ); + XclExpXmlStream( const css::uno::Reference< css::uno::XComponentContext >& rCC, bool bExportVBA ); virtual ~XclExpXmlStream(); /** Returns the filter root data. */ @@ -314,7 +314,7 @@ public: sax_fastparser::FSHelperPtr CreateOutputStream ( const OUString& sFullStream, const OUString& sRelativeStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, + const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, OUString* pRelationshipId = NULL ); diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 038db9d51e13..dd012cf090f4 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -107,17 +107,17 @@ public: /** Starts the API chart document conversion. Must be called once before all API conversion. */ void InitConversion( - const ::com::sun::star::uno::Reference< - com::sun::star::chart2::XChartDocument>& xChartDoc, const Rectangle& rChartRect ) const; + const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc, + const Rectangle& rChartRect ) const; /** Finishes the API chart document conversion. Must be called once after all API conversion. */ void FinishConversion( XclImpDffConverter& rDffConv ) const; /** Returns the data provider for the chart document. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > + css::uno::Reference< css::chart2::data::XDataProvider > GetDataProvider() const; /** Returns the drawing shape interface of the specified title object. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; /** Converts the passed horizontal coordinate from Excel chart units into 1/100 mm. */ @@ -125,7 +125,7 @@ public: /** Converts the passed vertical coordinate from Excel chart units into 1/100 mm. */ sal_Int32 CalcHmmFromChartY( sal_Int32 nPosY ) const; /** Converts the passed rectangle from Excel chart units into 1/100 mm. */ - ::com::sun::star::awt::Rectangle CalcHmmFromChartRect( const XclChRectangle& rRect ) const; + css::awt::Rectangle CalcHmmFromChartRect( const XclChRectangle& rRect ) const; /** Converts the passed horizontal coordinate from 1/100 mm into a relative position. */ double CalcRelativeFromHmmX( sal_Int32 nPosX ) const; @@ -1305,8 +1305,7 @@ public: /** Converts and writes all properties to the passed chart. */ void Convert( - const ::com::sun::star::uno::Reference< - com::sun::star::chart2::XChartDocument>& xChartDoc, + const css::uno::Reference< css::chart2::XChartDocument>& xChartDoc, XclImpDffConverter& rDffConv, const OUString& rObjName, const Rectangle& rChartRect ) const; @@ -1331,7 +1330,7 @@ private: void FinalizeTitle(); /** Creates and returns a new diagram object and converts global chart settings. */ - com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> + css::uno::Reference<css::chart2::XDiagram> CreateDiagram() const; private: @@ -1362,7 +1361,7 @@ public: /** Converts all objects and inserts them into the chart drawing page. */ void ConvertObjects( XclImpDffConverter& rDffConv, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const css::uno::Reference< css::frame::XModel >& rxModel, const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 989afd934d72..85536e6a6a3a 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -470,7 +470,7 @@ public: /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, + const css::uno::Reference< css::drawing::XShape >& rxShape, const Rectangle& rAnchorRect ) const; /** Sets additional properties to the form control model, calls virtual DoProcessControl(). */ @@ -486,7 +486,7 @@ protected: virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; void ApplySheetLinkProps() const; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + mutable css::uno::Reference< css::drawing::XShape > mxShape; /// The UNO wrapper of the control shape. std::shared_ptr< ScAddress > mxCellLink; /// Linked cell in the Calc document. private: @@ -497,7 +497,7 @@ private: private: const XclImpRoot& mrRoot; /// Not derived from XclImpRoot to allow multiple inheritance. - std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. + std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document. XclCtrlBindMode meBindMode; /// Value binding mode. }; @@ -514,7 +514,7 @@ public: inline OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( - ::com::sun::star::script::ScriptEventDescriptor& rDescriptor ) const; + css::script::ScriptEventDescriptor& rDescriptor ) const; protected: /** Sets control text formatting. */ @@ -984,11 +984,11 @@ private: /** Inserts the passed control rxFComp into the form. Needs call to SetCurrentForm() before. */ virtual bool InsertControl( - const ::com::sun::star::uno::Reference< - ::com::sun::star::form::XFormComponent >& rxFormComp, - const ::com::sun::star::awt::Size& rSize, - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >* pxShape, + const css::uno::Reference< + css::form::XFormComponent >& rxFormComp, + const css::awt::Size& rSize, + css::uno::Reference< + css::drawing::XShape >* pxShape, bool bFloatingCtrl ) override; private: @@ -999,7 +999,7 @@ private: SdrModel& mrSdrModel; /// The SdrModel of the drawing manager. SdrPage& mrSdrPage; /// The SdrPage of the drawing manager. XclImpSolverContainer maSolverCont; /// The solver container for connector rules. - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > + css::uno::Reference< css::form::XForm > mxCtrlForm; /// Controls form of current drawing page. sal_Int32 mnLastCtrlIndex; /// Last insertion index of a form control (for macro events). bool mbHasCtrlForm; /// True = mxCtrlForm is initialized (but maybe still null). @@ -1169,7 +1169,7 @@ public: ScRange GetUsedArea( SCTAB nScTab ) const; /** Sets the container to receive overridden shape/ctrl names from the filter. */ - void SetOleNameOverrideInfo( const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& rxOverrideInfo ) { mxOleCtrlNameOverride = rxOverrideInfo; } + void SetOleNameOverrideInfo( const css::uno::Reference< css::container::XNameContainer >& rxOverrideInfo ) { mxOleCtrlNameOverride = rxOverrideInfo; } /** Returns the name of overridden name ( or zero length string ) for associated object id. */ OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ); @@ -1179,7 +1179,7 @@ private: typedef std::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef; typedef std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxOleCtrlNameOverride; + css::uno::Reference< css::container::XNameContainer > mxOleCtrlNameOverride; DefObjNameMap maDefObjNames; /// Default base names for all object types. SvMemoryStream maDggStrm; /// Copy of global DFF data (DGG container) in memory. XclImpSheetDrawingMap maSheetDrawings; /// Drawing managers of all sheets. diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index c575c4ead6ab..d5fc51a201be 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -55,8 +55,8 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -73,9 +73,9 @@ private: virtual XclImpDecrypter* OnClone() const = 0; /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) = 0; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) = 0; @@ -101,9 +101,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff5Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) override; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ @@ -111,7 +111,7 @@ private: private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; sal_uInt16 mnKey; sal_uInt16 mnHash; }; @@ -130,9 +130,9 @@ private: /** Implementation of cloning this object. */ virtual XclImpBiff8Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + virtual css::uno::Sequence< css::beans::NamedValue > OnVerifyPassword( const OUString& rPassword ) override; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; + virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ @@ -145,7 +145,7 @@ private: private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData; + css::uno::Sequence< css::beans::NamedValue > maEncryptionData; ::std::vector< sal_uInt8 > maSalt; ::std::vector< sal_uInt8 > maVerifier; ::std::vector< sal_uInt8 > maVerifierHash; diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 3c3234737455..0007685e956a 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1273,8 +1273,8 @@ struct XclChTextKey : public ::std::pair< XclChTextType, ::std::pair< sal_uInt16 }; /** Function prototype receiving a chart document and returning a title shape. */ -typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - (*XclChGetShapeFunc)( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument >& ); +typedef css::uno::Reference< css::drawing::XShape > + (*XclChGetShapeFunc)( const css::uno::Reference< css::chart::XChartDocument >& ); // Property helpers =========================================================== @@ -1287,7 +1287,7 @@ public: /** Returns a named formatting object from the chart document. */ css::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const css::uno::Any& rObj ); private: css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container. @@ -1398,7 +1398,7 @@ struct XclChRootData typedef std::shared_ptr< XclChObjectTable > XclChObjectTableRef; typedef std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > mxChartDoc; /// The chart document. Rectangle maChartRect; /// Position and size of the chart shape. XclChTypeProvRef mxTypeInfoProv; /// Provides info about chart types. @@ -1419,13 +1419,13 @@ struct XclChRootData /** Starts the API chart document conversion. Must be called once before any API access. */ void InitConversion( const XclRoot& rRoot, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc, + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc, const Rectangle& rChartRect ); /** Finishes the API chart document conversion. Must be called once before any API access. */ void FinishConversion(); /** Returns the drawing shape interface of the specified title object. */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; }; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index d877a6a07416..eacc4ff243d8 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -430,18 +430,18 @@ class XclControlHelper { public: /** Returns the API control model from the passed API shape object. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - GetControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + static css::uno::Reference< css::awt::XControlModel > + GetControlModel( css::uno::Reference< css::drawing::XShape > xShape ); /** Fills the macro descriptor according to the passed macro name. */ static bool FillMacroDescriptor( - ::com::sun::star::script::ScriptEventDescriptor& rDescriptor, + css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, const OUString& rXclMacroName, SfxObjectShell* pDocShell = 0 ); /** Tries to extract an Excel macro name from the passed macro descriptor. */ static OUString ExtractFromMacroDescriptor( - const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor, + const css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); }; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index b0afc1a9363a..67158c3bfa52 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -596,9 +596,9 @@ struct XclPTFieldInfo : public XclPTVisNameInfo /** Returns the API enum representing the orientation (first of row/col/page/data). @param nMask Restricts the axes taken into account. @return The first found axis orientation, that is allowed in nMask parameter. */ - ::com::sun::star::sheet::DataPilotFieldOrientation GetApiOrient( sal_uInt16 nMask ) const; + css::sheet::DataPilotFieldOrientation GetApiOrient( sal_uInt16 nMask ) const; /** Adds the axis orientation represented by the passed API enum. */ - void AddApiOrient( ::com::sun::star::sheet::DataPilotFieldOrientation eOrient ); + void AddApiOrient( css::sheet::DataPilotFieldOrientation eOrient ); /** Returns a vector of all set subtotal functions. */ void GetSubtotals( XclPTSubtotalVec& rSubtotals ) const; @@ -676,9 +676,9 @@ struct XclPTDataFieldInfo : public XclPTVisNameInfo explicit XclPTDataFieldInfo(); /** Returns the API enum representing the aggregation function. */ - ::com::sun::star::sheet::GeneralFunction GetApiAggFunc() const; + css::sheet::GeneralFunction GetApiAggFunc() const; /** Sets the aggregation function represented by the passed API enum. */ - void SetApiAggFunc( ::com::sun::star::sheet::GeneralFunction eAggFunc ); + void SetApiAggFunc( css::sheet::GeneralFunction eAggFunc ); /** Returns the API constant representing the result reference type. */ sal_Int32 GetApiRefType() const; diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 645fe797db82..80d1b74b07c7 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -181,7 +181,7 @@ public: /** Returns the default password used for stream encryption. */ inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; } /** Requests and verifies a password from the medium or the user. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + css::uno::Sequence< css::beans::NamedValue > RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const; /** Returns the OLE2 root storage of the imported/exported file. diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index f6b00a6590ed..f861cecd9bb7 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -361,7 +361,7 @@ struct XclFontData /** Returns the API font text encoding. */ sal_Int16 GetApiFontEncoding() const; /** Returns the API font posture. */ - ::com::sun::star::awt::FontSlant GetApiPosture() const; + css::awt::FontSlant GetApiPosture() const; /** Returns the API font weight. */ float GetApiWeight() const; /** Returns the API font underline style. */ @@ -376,7 +376,7 @@ struct XclFontData /** Sets the API font family. */ void SetApiFamily( sal_Int16 nApiFamily ); /** Sets the API font posture. */ - void SetApiPosture( ::com::sun::star::awt::FontSlant eApiPosture ); + void SetApiPosture( css::awt::FontSlant eApiPosture ); /** Sets the API font weight. */ void SetApiWeight( float fApiWeight ); /** Sets the API font underline style. */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 95319ce19566..1ee2fed11790 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -75,7 +75,7 @@ CellAddress ApiCellRangeList::getBaseAddress() const return CellAddress( mvAddresses.front().Sheet, mvAddresses.front().StartColumn, mvAddresses.front().StartRow ); } -com::sun::star::uno::Sequence< CellRangeAddress > ApiCellRangeList::toSequence() const +css::uno::Sequence< CellRangeAddress > ApiCellRangeList::toSequence() const { return ContainerHelper::vectorToSequence( mvAddresses ); } @@ -348,7 +348,7 @@ bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, } bool AddressConverter::convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) + css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) { orAddress.Sheet = nSheet; return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr); @@ -363,7 +363,7 @@ bool AddressConverter::convertToCellAddress( CellAddress& orAddress, } bool AddressConverter::convertToCellAddress( - com::sun::star::table::CellAddress& rAddress, + css::table::CellAddress& rAddress, const char* pStr, sal_Int16 nSheet, bool bTrackOverflow ) { if (!convertToCellAddressUnchecked(rAddress, pStr, nSheet)) diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index ef992e78f7a1..edb19721ce6a 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -151,7 +151,7 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) ); } -sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) { if ( XmlFilterBase::filter( rDescriptor ) ) return true; @@ -185,9 +185,9 @@ OUString ExcelFilter::getImplementationName() throw (css::uno::RuntimeException, } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_oox_xls_ExcelFilter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_oox_xls_ExcelFilter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new oox::xls::ExcelFilter(context)); } diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 896c898307b0..25864b6a1182 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -227,7 +227,7 @@ bool ExternalName::getDdeLinkData( OUString& orDdeServer, OUString& orDdeTopic, { PropertySet aDocProps( getDocument() ); Reference< XDDELinks > xDdeLinks( aDocProps.getAnyProperty( PROP_DDELinks ), UNO_QUERY_THROW ); - mxDdeLink = xDdeLinks->addDDELink( mrParentLink.getClassName(), mrParentLink.getTargetUrl(), maModel.maName, ::com::sun::star::sheet::DDELinkMode_DEFAULT ); + mxDdeLink = xDdeLinks->addDDELink( mrParentLink.getClassName(), mrParentLink.getTargetUrl(), maModel.maName, css::sheet::DDELinkMode_DEFAULT ); mbDdeLinkCreated = true; // ignore if setting results fails if( !maResults.empty() ) { @@ -428,19 +428,19 @@ ExternalLinkInfo ExternalLink::getLinkInfo() const case LINKTYPE_SELF: case LINKTYPE_SAME: case LINKTYPE_INTERNAL: - aLinkInfo.Type = ::com::sun::star::sheet::ExternalLinkType::SELF; + aLinkInfo.Type = css::sheet::ExternalLinkType::SELF; break; case LINKTYPE_EXTERNAL: - aLinkInfo.Type = ::com::sun::star::sheet::ExternalLinkType::DOCUMENT; + aLinkInfo.Type = css::sheet::ExternalLinkType::DOCUMENT; aLinkInfo.Data <<= maTargetUrl; break; case LINKTYPE_LIBRARY: // parser will return library function names in OPCODE_BAD string tokens - aLinkInfo.Type = ::com::sun::star::sheet::ExternalLinkType::SPECIAL; + aLinkInfo.Type = css::sheet::ExternalLinkType::SPECIAL; break; case LINKTYPE_DDE: { - aLinkInfo.Type = ::com::sun::star::sheet::ExternalLinkType::DDE; + aLinkInfo.Type = css::sheet::ExternalLinkType::DDE; DDELinkInfo aDdeLinkInfo; aDdeLinkInfo.Service = maClassName; aDdeLinkInfo.Topic = maTargetUrl; @@ -454,7 +454,7 @@ ExternalLinkInfo ExternalLink::getLinkInfo() const } break; default: - aLinkInfo.Type = ::com::sun::star::sheet::ExternalLinkType::UNKNOWN; + aLinkInfo.Type = css::sheet::ExternalLinkType::UNKNOWN; } return aLinkInfo; } diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index cdfc9227056b..e1d569557eb0 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1279,7 +1279,7 @@ bool OpCodeProviderImpl::fillEntrySeq( OpCodeEntrySequence& orEntrySeq, { try { - orEntrySeq = rxMapper->getAvailableMappings( ::com::sun::star::sheet::FormulaLanguage::ODFF, nMapGroup ); + orEntrySeq = rxMapper->getAvailableMappings( css::sheet::FormulaLanguage::ODFF, nMapGroup ); return orEntrySeq.hasElements(); } catch( Exception& ) @@ -1306,7 +1306,7 @@ bool OpCodeProviderImpl::fillFuncTokenMaps( ApiTokenMap& orIntFuncTokenMap, ApiT { orIntFuncTokenMap.clear(); orExtFuncTokenMap.clear(); - if( fillEntrySeq( orEntrySeq, rxMapper, ::com::sun::star::sheet::FormulaMapGroup::FUNCTIONS ) ) + if( fillEntrySeq( orEntrySeq, rxMapper, css::sheet::FormulaMapGroup::FUNCTIONS ) ) { const FormulaOpCodeMapEntry* pEntry = orEntrySeq.getConstArray(); const FormulaOpCodeMapEntry* pEntryEnd = pEntry + orEntrySeq.getLength(); @@ -1499,7 +1499,7 @@ ApiParserWrapper::ApiParserWrapper( OSL_ENSURE( mxParser.is(), "ApiParserWrapper::ApiParserWrapper - cannot create API formula parser object" ); maParserProps.set( mxParser ); maParserProps.setProperty( PROP_CompileEnglish, true ); - maParserProps.setProperty( PROP_FormulaConvention, ::com::sun::star::sheet::AddressConvention::XL_OOX ); + maParserProps.setProperty( PROP_FormulaConvention, css::sheet::AddressConvention::XL_OOX ); maParserProps.setProperty( PROP_IgnoreLeadingSpaces, false ); maParserProps.setProperty( PROP_OpCodeMap, getOoxParserMap() ); } diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 6481ba339b2b..b1bd17417dc7 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -345,7 +345,7 @@ FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry( maAddress(rAddr), maRange(rRange), maTokenStr(rTokenStr), mnSharedId(nSharedId) {} FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc( - const com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) : maAddress(rAddr), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {} @@ -466,7 +466,7 @@ void FormulaBuffer::createSharedFormulaMapEntry( rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr ) +void FormulaBuffer::setCellFormula( const css::table::CellAddress& rAddress, const OUString& rTokenStr ) { assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maCellFormulas.size() ); maCellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); @@ -480,7 +480,7 @@ void FormulaBuffer::setCellFormula( SharedFormulaDesc(rAddress, nSharedId, rCellValue, nValueType)); } -void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) +void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index b34ddb901f4c..5a8d1286ae20 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -66,7 +66,7 @@ struct BuiltinFormat /** Defines a built-in number format that maps to an own predefined format. */ #define NUMFMT_PREDEF( INDEX, PREDEFINED ) \ - { INDEX, 0, ::com::sun::star::i18n::NumberFormatIndex::PREDEFINED, -1 } + { INDEX, 0, css::i18n::NumberFormatIndex::PREDEFINED, -1 } /** Defines a built-in number format that is the same as the specified in nReuseId. */ #define NUMFMT_REUSE( INDEX, REUSED_INDEX ) \ diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 2abcb9a279ee..edf4ad94d824 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -166,9 +166,9 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( } // namespace oox -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_oox_xls_FormulaParser_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_oox_xls_FormulaParser_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new oox::xls::OOXMLFormulaParser()); } diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 3e9c17e7934f..7d33ba13d3fa 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -558,7 +558,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>& { Reference<text::XTextContent> xContent = createField( maFileNameService ); PropertySet aPropSet( xContent ); - aPropSet.setProperty( PROP_FileFormat, ::com::sun::star::text::FilenameDisplayFormat::NAME_AND_EXT ); + aPropSet.setProperty( PROP_FileFormat, css::text::FilenameDisplayFormat::NAME_AND_EXT ); appendField( xContent ); } break; @@ -568,7 +568,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>& Reference<text::XTextContent> xContent = createField( maFileNameService ); PropertySet aPropSet( xContent ); // FilenameDisplayFormat::PATH not supported by Calc - aPropSet.setProperty( PROP_FileFormat, ::com::sun::star::text::FilenameDisplayFormat::FULL ); + aPropSet.setProperty( PROP_FileFormat, css::text::FilenameDisplayFormat::FULL ); appendField( xContent ); /* path only is not supported -- if we find a '&Z&F' combination for path/name, skip the '&F' part */ @@ -988,7 +988,7 @@ void PageSettingsConverter::writePageSettingsProperties( if( !rModel.maGraphicUrl.isEmpty() ) { aPropMap.setProperty( PROP_BackGraphicURL, rModel.maGraphicUrl); - aPropMap.setProperty( PROP_BackGraphicLocation, ::com::sun::star::style::GraphicLocation_TILED); + aPropMap.setProperty( PROP_BackGraphicLocation, css::style::GraphicLocation_TILED); } rPropSet.setProperties( aPropMap ); diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 1fd07881d6ef..1c27461635cc 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -171,7 +171,7 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, sal_Int32 nStringI setBlankCell( rModel ); } -void SheetDataBuffer::setDateTimeCell( const CellModel& rModel, const ::com::sun::star::util::DateTime& rDateTime ) +void SheetDataBuffer::setDateTimeCell( const CellModel& rModel, const css::util::DateTime& rDateTime ) { // write serial date/time value into the cell double fSerial = getUnitConverter().calcSerialFromDateTime( rDateTime ); @@ -355,7 +355,7 @@ void addIfNotInMyMap( StylesBuffer& rStyles, std::map< FormatKeyPair, ApiCellRan } } -void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const ::com::sun::star::table::CellRangeAddress& rAddress, bool bProcessRowRange ) +void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, const css::table::CellRangeAddress& rAddress, bool bProcessRowRange ) { RowRangeStyle aStyleRows; aStyleRows.mnNumFmt.first = nXfId; diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index a3c126730c44..5fa5a5a93adf 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -549,7 +549,7 @@ ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : } ApiScriptFontName::ApiScriptFontName() : - mnFamily( ::com::sun::star::awt::FontFamily::DONTKNOW ), + mnFamily( css::awt::FontFamily::DONTKNOW ), mnTextEnc( RTL_TEXTENCODING_DONTKNOW ) { } @@ -560,18 +560,18 @@ ApiFontData::ApiFontData() : 220, // height 11 points 0, OUString(), - ::com::sun::star::awt::FontFamily::DONTKNOW, + css::awt::FontFamily::DONTKNOW, RTL_TEXTENCODING_DONTKNOW, - ::com::sun::star::awt::FontPitch::DONTKNOW, + css::awt::FontPitch::DONTKNOW, 100.0, - ::com::sun::star::awt::FontWeight::NORMAL, - ::com::sun::star::awt::FontSlant_NONE, - ::com::sun::star::awt::FontUnderline::NONE, - ::com::sun::star::awt::FontStrikeout::NONE, + css::awt::FontWeight::NORMAL, + css::awt::FontSlant_NONE, + css::awt::FontUnderline::NONE, + css::awt::FontStrikeout::NONE, 0.0, sal_False, sal_False, - ::com::sun::star::awt::FontType::DONTKNOW ), + css::awt::FontType::DONTKNOW ), mnColor( API_RGB_TRANSPARENT ), mnEscapement( API_ESCAPE_NONE ), mnEscapeHeight( API_ESCAPEHEIGHT_NONE ), @@ -1129,13 +1129,13 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign ) } ApiAlignmentData::ApiAlignmentData() : - meHorJustify( ::com::sun::star::table::CellHoriJustify_STANDARD ), - mnHorJustifyMethod( ::com::sun::star::table::CellJustifyMethod::AUTO ), - mnVerJustify( ::com::sun::star::table::CellVertJustify2::STANDARD ), - mnVerJustifyMethod( ::com::sun::star::table::CellJustifyMethod::AUTO ), - meOrientation( ::com::sun::star::table::CellOrientation_STANDARD ), + meHorJustify( css::table::CellHoriJustify_STANDARD ), + mnHorJustifyMethod( css::table::CellJustifyMethod::AUTO ), + mnVerJustify( css::table::CellVertJustify2::STANDARD ), + mnVerJustifyMethod( css::table::CellJustifyMethod::AUTO ), + meOrientation( css::table::CellOrientation_STANDARD ), mnRotation( 0 ), - mnWritingMode( ::com::sun::star::text::WritingMode2::PAGE ), + mnWritingMode( css::text::WritingMode2::PAGE ), mnIndent( 0 ), mbWrapText( false ), mbShrink( false ) @@ -1313,7 +1313,7 @@ void Alignment::finalizeImport() ::SvxFrameDirection Alignment::GetScFrameDir() const { - namespace csstxt = ::com::sun::star::text; + namespace csstxt = css::text; ::SvxFrameDirection eFrameDir = ::FRMDIR_ENVIRONMENT; switch( maApiData.mnWritingMode ) { @@ -1424,7 +1424,7 @@ void Protection::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const namespace { -bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder) +bool lcl_isBorder(const css::table::BorderLine& rBorder) { return (rBorder.InnerLineWidth > 0) || (rBorder.OuterLineWidth > 0); } @@ -2081,7 +2081,7 @@ Xf::Xf( const WorkbookHelper& rHelper ) : mnScNumFmt(0), maAlignment( rHelper ), maProtection( rHelper ), - meRotationRef( ::com::sun::star::table::CellVertJustify2::STANDARD ), + meRotationRef( css::table::CellVertJustify2::STANDARD ), mpStyleSheet( NULL ) { } @@ -2373,7 +2373,7 @@ Xf::createPattern( bool bSkipPoolDefs ) { if( (pAlignment->getApiData().mnRotation != 0) && pBorder->getApiData().hasAnyOuterBorder() ) { - meRotationRef = ::com::sun::star::table::CellVertJustify2::BOTTOM; + meRotationRef = css::table::CellVertJustify2::BOTTOM; eRotateMode = SVX_ROTATE_MODE_BOTTOM; } } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index d236b70f1c75..4ccbd136c40e 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -475,7 +475,7 @@ Reference< XDatabaseRange > WorkbookGlobals::createUnnamedDatabaseRangeObject( c { ScDocument& rDoc = getScDocument(); if( rDoc.GetTableCount() <= aDestRange.Sheet ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); ScRange aScRange; ScUnoConversion::FillScRange(aScRange, aDestRange); ScDBData* pNewDBData = new ScDBData( STR_DB_LOCAL_NONAME, aScRange.aStart.Tab(), diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index bf2d009ebd60..8f0e7cc33b63 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1626,19 +1626,19 @@ void WorksheetHelper::finalizeDrawingImport() mrSheetGlob.finalizeDrawingImport(); } -void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) +void WorksheetHelper::setCellFormula( const css::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellFormula( rTokenAddress, rTokenStr ); } void WorksheetHelper::setCellFormula( - const ::com::sun::star::table::CellAddress& rAddr, sal_Int32 nSharedId, + const css::table::CellAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) { getFormulaBuffer().setCellFormula(rAddr, nSharedId, rCellValue, nValueType); } -void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) +void WorksheetHelper::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellArrayFormula( rRangeAddress, rTokenAddress, rTokenStr ); } diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 89aa4768bb04..33bd72d262e7 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -158,7 +158,7 @@ void WorksheetSettings::importProtectedRange( const AttributeList& rAttribs ) if (!aRangeList.empty()) { ScRangeList* pRangeList = aProt.maRangeList = new ScRangeList; - for (::std::vector< ::com::sun::star::table::CellRangeAddress >::const_iterator itr( aRangeList.begin()), end( aRangeList.end()); itr != end; ++itr) + for (::std::vector< css::table::CellRangeAddress >::const_iterator itr( aRangeList.begin()), end( aRangeList.end()); itr != end; ++itr) { ScRange aRange; ScUnoConversion::FillScRange( aRange, *itr); diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index c671d464f8f7..7dfccb9a8a00 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -22,25 +22,25 @@ namespace { class OrcusFormatDetect : public ::cppu::WeakImplHelper< - ::com::sun::star::document::XExtendedFilterDetection, - ::com::sun::star::lang::XServiceInfo > + css::document::XExtendedFilterDetection, + css::lang::XServiceInfo > { public: explicit OrcusFormatDetect(); virtual ~OrcusFormatDetect(); 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; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) + throw( css::uno::RuntimeException, std::exception ) override; private: }; @@ -54,25 +54,25 @@ OrcusFormatDetect::~OrcusFormatDetect() } OUString OrcusFormatDetect::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return OUString(""); } sal_Bool OrcusFormatDetect::supportsService(const OUString& /*rServiceName*/) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return false; } css::uno::Sequence<OUString> OrcusFormatDetect::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<OUString>(); } OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>& rMediaDescSeq) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { utl::MediaDescriptor aMediaDescriptor( rMediaDescSeq ); bool bAborted = aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED(), false); @@ -101,9 +101,9 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* , - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(css::uno::XComponentContext* , + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new OrcusFormatDetect()); } diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 28a2e16a81bc..f71f2f639fa8 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -425,7 +425,7 @@ std::unique_ptr<XclExpOcxControlObj> XclEscherEx::CreateOCXCtrlObj( Reference< X // writes from xCtrlModel into mxCtlsStrm, raw class name returned in aClassName Reference< XOutputStream > xOut( new utl::OSeekableOutputStreamWrapper( *mxCtlsStrm ) ); - Reference< com::sun::star::frame::XModel > xModel( GetDocShell() ? GetDocShell()->GetModel() : NULL ); + Reference< css::frame::XModel > xModel( GetDocShell() ? GetDocShell()->GetModel() : NULL ); if( xModel.is() && xOut.is() && oox::ole::MSConvertOCXControls::WriteOCXExcelKludgeStream( xModel, xOut, xCtrlModel, xShape->getSize(), aClassName ) ) { sal_uInt32 nStrmSize = static_cast< sal_uInt32 >( mxCtlsStrm->Tell() - nStrmStart ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 70240646d7bf..51c72435b45c 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -816,7 +816,7 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje // orientation alignment const SvxWritingModeItem& rItem = static_cast< const SvxWritingModeItem& >( rItemSet.Get( SDRATTR_TEXTDIRECTION ) ); - if( rItem.GetValue() == com::sun::star::text::WritingMode_TB_RL ) + if( rItem.GetValue() == css::text::WritingMode_TB_RL ) mnRotation = EXC_OBJ_ORIENT_90CW; } } diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 7f350bca78fd..f2dfa3f7c8f7 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -35,8 +35,7 @@ using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), fIterationEpsilon(0.001), nIterationCount(100), @@ -103,8 +102,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -152,8 +150,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -185,8 +182,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference< css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -200,8 +196,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -243,8 +238,7 @@ ScXMLIterationContext::~ScXMLIterationContext() SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference< css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index e5a21029165e..0d18153c7c8d 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -27,7 +27,7 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext { - com::sun::star::util::Date aNullDate; + css::util::Date aNullDate; double fIterationEpsilon; sal_Int32 nIterationCount; sal_uInt16 nYear2000; @@ -43,17 +43,15 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - void SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } + void SetNullDate(const css::util::Date& aDate) { aNullDate = aDate; } void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } @@ -67,15 +65,13 @@ class ScXMLNullDateContext : public SvXMLImportContext public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -87,15 +83,13 @@ class ScXMLIterationContext : public SvXMLImportContext public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 0f35c6e53c19..3b790dd7ef7d 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -48,7 +48,7 @@ public: ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); virtual ~ScXMLCellRangeSourceContext(); @@ -56,7 +56,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 64ae6020e63c..75c9075facc3 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -45,7 +45,7 @@ class ScChangeTrackingExportHelper ScEditEngineTextObj* pEditTextObj; ScChangeActionMap* pDependings; OUString sChangeIDPrefix; - com::sun::star::uno::Reference<com::sun::star::text::XText> xText; + css::uno::Reference<css::text::XText> xText; OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 31dff197bd04..95cd28a3ab19 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -31,7 +31,7 @@ struct ScMyActionInfo { OUString sUser; OUString sComment; - com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; }; struct ScMyCellInfo @@ -172,17 +172,17 @@ typedef std::list<ScMyBaseAction*> ScMyActions; class ScXMLChangeTrackingImportHelper { - std::set<OUString> aUsers; + std::set<OUString> aUsers; ScMyActions aActions; - com::sun::star::uno::Sequence<sal_Int8> aProtect; + css::uno::Sequence<sal_Int8> aProtect; ScDocument* pDoc; ScChangeTrack* pTrack; ScMyBaseAction* pCurrentAction; - OUString sIDPrefix; + OUString sIDPrefix; sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; - bool bChangeTrack; + bool bChangeTrack; private: void ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime& aDateTime); @@ -199,7 +199,7 @@ public: ~ScXMLChangeTrackingImportHelper(); void SetChangeTrack(bool bValue) { bChangeTrack = bValue; } - void SetProtection(const com::sun::star::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } + void SetProtection(const css::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); sal_uInt32 GetIDFromString(const OUString& sID); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 78d18e7f6bf5..3cd6459cf152 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -25,13 +25,13 @@ class ScDocument; -class XMLCodeNameProvider : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess > +class XMLCodeNameProvider : public ::cppu::WeakImplHelper< css::container::XNameAccess > { ScDocument* mpDoc; OUString msDocName; OUString msCodeNameProp; - static bool _getCodeName( const ::com::sun::star::uno::Any& aAny, + static bool _getCodeName( const css::uno::Any& aAny, OUString& rCodeName ); public: @@ -39,23 +39,23 @@ public: virtual ~XMLCodeNameProvider(); 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; - 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 css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::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::Sequence< OUString > SAL_CALL getElementNames( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - 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 (::com::sun::star::uno::RuntimeException, std::exception ) override; + throw (css::uno::RuntimeException, std::exception ) override; - static void set( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); + static void set( const css::uno::Reference< css::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; #endif diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 57225c6c7c87..eb7c1d852575 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -45,14 +45,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLConsolidationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index cac22847bc0a..b150da76182d 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -42,10 +42,10 @@ public: // helper methods static ScDocument* GetScDocument( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ); + css::uno::Reference< css::frame::XModel > xModel ); // IMPORT: GeneralFunction / ScSubTotalFunc - static ::com::sun::star::sheet::GeneralFunction + static css::sheet::GeneralFunction GetFunctionFromString( const OUString& rString ); static ScSubTotalFunc GetSubTotalFuncFromString( @@ -54,7 +54,7 @@ public: // EXPORT: GeneralFunction / ScSubTotalFunc static void GetStringFromFunction( OUString& rString, - const ::com::sun::star::sheet::GeneralFunction eFunction, + const css::sheet::GeneralFunction eFunction, bool bAppendStr = false ); static void GetStringFromFunction( OUString& rString, @@ -62,14 +62,14 @@ public: bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation - static ::com::sun::star::sheet::DataPilotFieldOrientation + static css::sheet::DataPilotFieldOrientation GetOrientationFromString( const OUString& rString ); // EXPORT: DataPilotFieldOrientation static void GetStringFromOrientation( OUString& rString, - const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, + const css::sheet::DataPilotFieldOrientation eOrientation, bool bAppendStr = false ); // IMPORT: Detective @@ -123,12 +123,12 @@ enum ScXMLConditionToken struct ScXMLConditionParseResult { ScXMLConditionToken meToken; /// The leading condition token. - ::com::sun::star::sheet::ValidationType + css::sheet::ValidationType meValidation; /// A data validation type if existing. - ::com::sun::star::sheet::ConditionOperator + css::sheet::ConditionOperator meOperator; /// A comparison operator if existing. - OUString maOperand1; /// First operand of the token or comparison value. - OUString maOperand2; /// Second operand of 'between' conditions. + OUString maOperand1; /// First operand of the token or comparison value. + OUString maOperand2; /// Second operand of 'between' conditions. sal_Int32 mnEndIndex; /// Index of first character following the condition. }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 0f964f94b2a3..ceb7eba48a52 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -34,8 +34,7 @@ using namespace xmloff::token; ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -49,8 +48,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -70,8 +68,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ), aDDELinkTable(), aDDELinkRow(), @@ -92,8 +89,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -195,9 +191,8 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -239,8 +234,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -255,9 +249,8 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -270,8 +263,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = NULL; @@ -296,9 +288,8 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -329,8 +320,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -344,9 +334,8 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink), nRows(1) @@ -377,8 +366,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = NULL; @@ -400,9 +388,8 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), sValue(), fValue(), @@ -461,8 +448,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index aee1a06fbc35..cc2fb2c4c02f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -31,15 +31,13 @@ class ScXMLDDELinksContext : public SvXMLImportContext public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinksContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -71,15 +69,13 @@ class ScXMLDDELinkContext : public SvXMLImportContext public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinkContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; void SetApplication(const OUString& sValue) { sApplication = sValue; } void SetTopic(const OUString& sValue) { sTopic = sValue; } @@ -103,16 +99,14 @@ class ScXMLDDESourceContext : public SvXMLImportContext public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDESourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -126,16 +120,14 @@ class ScXMLDDETableContext : public SvXMLImportContext public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDETableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -149,16 +141,14 @@ class ScXMLDDEColumnContext : public SvXMLImportContext public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDEColumnContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -173,23 +163,21 @@ class ScXMLDDERowContext : public SvXMLImportContext public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDERowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; class ScXMLDDECellContext : public SvXMLImportContext { - OUString sValue; + OUString sValue; double fValue; sal_Int32 nCells; bool bString; @@ -203,16 +191,14 @@ class ScXMLDDECellContext : public SvXMLImportContext public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDECellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index dc2d0b071337..4c4ac911e1b7 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -92,7 +92,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -112,7 +112,7 @@ public: ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveHighlightedContext(); @@ -120,7 +120,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; @@ -139,14 +139,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLDetectiveOperationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index 05032da72793..e5b905356551 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -33,8 +33,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext() SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = new ScXMLEmptyContext(GetScImport(), nPrefix, rLName); diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index b6b6597cc43d..9cfe5ffe45a9 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -37,8 +37,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index 9e6d77464e15..cf1cb4083ad4 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -34,7 +34,7 @@ class ScXMLExportDDELinks public: ScXMLExportDDELinks(ScXMLExport& rExport); ~ScXMLExportDDELinks(); - void WriteDDELinks(::com::sun::star::uno::Reference < ::com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); + void WriteDDELinks(css::uno::Reference < css::sheet::XSpreadsheetDocument >& xSpreadDoc); }; #endif diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 7a605a4f3bfc..5c5338040c76 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -513,37 +513,37 @@ void ScXMLExportDataPilot::WriteDatePart(sal_Int32 nPart) { switch(nPart) { - case com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS : + case css::sheet::DataPilotFieldGroupBy::SECONDS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_SECONDS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES : + case css::sheet::DataPilotFieldGroupBy::MINUTES : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_MINUTES); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::HOURS : + case css::sheet::DataPilotFieldGroupBy::HOURS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_HOURS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS : + case css::sheet::DataPilotFieldGroupBy::DAYS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_DAYS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS : + case css::sheet::DataPilotFieldGroupBy::MONTHS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_MONTHS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS : + case css::sheet::DataPilotFieldGroupBy::QUARTERS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_QUARTERS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::YEARS : + case css::sheet::DataPilotFieldGroupBy::YEARS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_YEARS); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index e7fbf755407b..ab93df6fcca1 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -65,7 +65,7 @@ class ScXMLExportDataPilot public: ScXMLExportDataPilot(ScXMLExport& rExport); ~ScXMLExportDataPilot(); - void WriteDataPilots(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreaDoc); + void WriteDataPilots(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreaDoc); }; #endif diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 90f646531e91..31a232a76235 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -47,7 +47,7 @@ class ScFormatRangeStyles; class ScMyIteratorBase { protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) = 0; public: ScMyIteratorBase(); @@ -56,7 +56,7 @@ public: virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; - void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + void UpdateAddress( css::table::CellAddress& rCellAddress ); }; struct ScMyShape @@ -65,7 +65,7 @@ struct ScMyShape ScAddress aEndAddress; sal_Int32 nEndX; sal_Int32 nEndY; - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; + css::uno::Reference<css::drawing::XShape> xShape; bool operator<(const ScMyShape& aShape) const; }; @@ -77,7 +77,7 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); @@ -93,7 +93,7 @@ public: struct ScMyNoteShape { - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; + css::uno::Reference<css::drawing::XShape> xShape; ScAddress aPos; bool operator<(const ScMyNoteShape& aNote) const; @@ -106,7 +106,7 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); @@ -121,7 +121,7 @@ public: struct ScMyMergedRange { - com::sun::star::table::CellRangeAddress aCellRange; + css::table::CellRangeAddress aCellRange; sal_Int32 nRows; bool bIsFirst; bool operator<(const ScMyMergedRange& aRange) const; @@ -134,11 +134,11 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); - void AddRange(const com::sun::star::table::CellRangeAddress& rMergedRange); + void AddRange(const css::table::CellRangeAddress& rMergedRange); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ) override; @@ -152,7 +152,7 @@ struct ScMyAreaLink OUString sFilterOptions; OUString sURL; OUString sSourceStr; - ::com::sun::star::table::CellRangeAddress aDestRange; + css::table::CellRangeAddress aDestRange; sal_Int32 nRefresh; inline ScMyAreaLink() : nRefresh( 0 ) {} @@ -171,7 +171,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -185,9 +185,9 @@ public: void SkipTable(SCTAB nSkip); }; -struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress +struct ScMyCellRangeAddress : css::table::CellRangeAddress { - ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); + ScMyCellRangeAddress(const css::table::CellRangeAddress& rRange); bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; }; @@ -198,11 +198,11 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); - void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); + void AddNewEmptyDatabaseRange(const css::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ) override; @@ -212,10 +212,10 @@ public: struct ScMyDetectiveObj { - ::com::sun::star::table::CellAddress aPosition; - ::com::sun::star::table::CellRangeAddress aSourceRange; - ScDetectiveObjType eObjType; - bool bHasError; + css::table::CellAddress aPosition; + css::table::CellRangeAddress aSourceRange; + ScDetectiveObjType eObjType; + bool bHasError; bool operator<(const ScMyDetectiveObj& rDetObj) const; }; @@ -227,7 +227,7 @@ class ScMyDetectiveObjContainer : ScMyIteratorBase private: ScMyDetectiveObjList aDetectiveObjList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -247,9 +247,9 @@ public: struct ScMyDetectiveOp { - ::com::sun::star::table::CellAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + css::table::CellAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; bool operator<(const ScMyDetectiveOp& rDetOp) const; }; @@ -261,7 +261,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -279,9 +279,9 @@ struct ScMyCell { ScAddress maCellAddress; /// Use this instead of the UNO one. - com::sun::star::table::CellAddress aCellAddress; - com::sun::star::table::CellRangeAddress aMergeRange; - com::sun::star::table::CellRangeAddress aMatrixRange; + css::table::CellAddress aCellAddress; + css::table::CellRangeAddress aMergeRange; + css::table::CellRangeAddress aMatrixRange; ScMyAreaLink aAreaLink; ScMyShapeList aShapeList; @@ -293,7 +293,7 @@ struct ScMyCell sal_Int32 nValidationIndex; sal_Int32 nStyleIndex; sal_Int32 nNumberFormat; - com::sun::star::table::CellContentType nType; + css::table::CellContentType nType; ScRefCellValue maBaseCell; @@ -317,9 +317,9 @@ struct ScMyCell class ScMyNotEmptyCellsIterator : boost::noncopyable { - com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable; - com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange; - com::sun::star::table::CellAddress aLastAddress; + css::uno::Reference<css::sheet::XSpreadsheet> xTable; + css::uno::Reference<css::table::XCellRange> xCellRange; + css::table::CellAddress aLastAddress; ScMyShapesContainer* pShapes; ScMyNoteShapesContainer* pNoteShapes; @@ -336,7 +336,7 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable SCROW nCellRow; SCTAB nCurrentTable; - void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); + void UpdateAddress( css::table::CellAddress& rAddress ); void SetCellData( ScMyCell& rMyCell, const css::table::CellAddress& rAddress ); void HasAnnotation( ScMyCell& aCell ); @@ -362,7 +362,7 @@ public: { pDetectiveOp = pNewDetectiveOp; } void SetCurrentTable(const SCTAB nTable, - com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable); + css::uno::Reference<css::sheet::XSpreadsheet>& rxTable); void SkipTable(SCTAB nSkip); bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index a665358baa54..02dd6675d53b 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -28,13 +28,13 @@ struct ScMyDrawPage { - com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage; + css::uno::Reference<css::drawing::XDrawPage> xDrawPage; bool bHasForms; ScMyDrawPage() : bHasForms(false) {} }; -typedef std::list< com::sun::star::uno::Reference<com::sun::star::drawing::XShape> > ScMyTableXShapes; +typedef std::list< css::uno::Reference<css::drawing::XShape> > ScMyTableXShapes; typedef std::vector<ScMyTableXShapes> ScMyTableShapes; typedef std::vector<ScMyDrawPage> ScMyDrawPages; @@ -63,17 +63,17 @@ public: sal_Int32 GetLastRow(const sal_Int32 nTable) const; void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable); void SetDrawPageHasForms(const sal_Int32 nTable, bool bHasForms); - com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); + css::uno::Reference<css::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); bool HasDrawPage() const { return pDrawPages != NULL; } - bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage); + bool HasForm(const sal_Int32 nTable, css::uno::Reference<css::drawing::XDrawPage>& xDrawPage); void AddNewShape(const ScMyShape& aMyShape); void SortShapesContainer(); ScMyShapesContainer* GetShapesContainer() { return pShapesContainer; } bool HasShapes(); - void AddTableShape(const sal_Int32 nTable, const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& xShape); + void AddTableShape(const sal_Int32 nTable, const css::uno::Reference<css::drawing::XShape>& xShape); ScMyTableShapes* GetTableShapes() { return pTableShapes; } ScMyDetectiveObjContainer* GetDetectiveObjContainer() { return pDetectiveObjContainer; } - void AddNoteObj(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& xShape, const ScAddress& rPos); + void AddNoteObj(const css::uno::Reference<css::drawing::XShape>& xShape, const ScAddress& rPos); void SortNoteShapes(); ScMyNoteShapesContainer* GetNoteShapes() { return pNoteShapes; } }; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index ad2288e04ebc..12420877d49a 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -44,10 +44,10 @@ struct ScMyValidation OUString sImputTitle; OUString sFormula1; OUString sFormula2; - com::sun::star::table::CellAddress aBaseCell; - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + css::table::CellAddress aBaseCell; + css::sheet::ValidationAlertStyle aAlertStyle; + css::sheet::ValidationType aValidationType; + css::sheet::ConditionOperator aOperator; sal_Int16 nShowList; bool bShowErrorMessage; bool bShowImputMessage; @@ -86,10 +86,10 @@ private: public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); - bool AddValidation(const com::sun::star::uno::Any& aAny, + bool AddValidation(const css::uno::Any& aAny, sal_Int32& nValidationIndex); static OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - static OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + static OUString GetBaseCellAddress(ScDocument* pDoc, const css::table::CellAddress& aCell); static void WriteMessage(ScXMLExport& rExport, const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); @@ -168,11 +168,11 @@ typedef std::vector<OUString*> ScMyOUStringVec; struct ScMyFormatRange { - com::sun::star::table::CellRangeAddress aRangeAddress; - sal_Int32 nStyleNameIndex; - sal_Int32 nValidationIndex; - sal_Int32 nNumberFormat; - bool bIsAutoStyle; + css::table::CellRangeAddress aRangeAddress; + sal_Int32 nStyleNameIndex; + sal_Int32 nValidationIndex; + sal_Int32 nNumberFormat; + bool bIsAutoStyle; ScMyFormatRange(); bool operator< (const ScMyFormatRange& rRange) const; @@ -204,7 +204,7 @@ public: bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow); void GetFormatRanges(const sal_Int32 nStartColumn, const sal_Int32 nEndColumn, const sal_Int32 nRow, const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); - void AddRangeStyleName(const com::sun::star::table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, + void AddRangeStyleName(const css::table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 737ec96f7e68..fa747e4e3435 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -30,20 +30,16 @@ namespace com { namespace sun { namespace star { class XMLTableHeaderFooterContext: public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > xPropSet; - ::com::sun::star::uno::Reference < - ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; + css::uno::Reference< css::text::XTextCursor > xTextCursor; + css::uno::Reference< css::text::XTextCursor > xOldTextCursor; + css::uno::Reference< css::beans::XPropertySet > xPropSet; + css::uno::Reference< css::sheet::XHeaderFooterContent > xHeaderFooterContent; const OUString sOn; const OUString sShareContent; const OUString sContent; const OUString sContentLeft; - OUString sCont; + OUString sCont; bool bDisplay; bool bLeft; @@ -56,10 +52,8 @@ public: XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPageStylePropSet, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::beans::XPropertySet > & rPageStylePropSet, bool bFooter, bool bLft ); virtual ~XMLTableHeaderFooterContext(); @@ -67,7 +61,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; @@ -75,26 +69,23 @@ public: class XMLHeaderFooterRegionContext: public SvXMLImportContext { private: - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& xTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; + css::uno::Reference< css::text::XTextCursor >& xTextCursor; + css::uno::Reference< css::text::XTextCursor > xOldTextCursor; public: TYPEINFO_OVERRIDE(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor >& xCursor ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + css::uno::Reference< css::text::XTextCursor >& xCursor ); virtual ~XMLHeaderFooterRegionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index ef5bbb0e595c..3bf60088bc51 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -58,7 +58,7 @@ void XMLTableMasterPageExport::exportHeaderFooterContent( } } -void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter, +void XMLTableMasterPageExport::exportHeaderFooter(const css::uno::Reference < css::sheet::XHeaderFooterContent >& xHeaderFooter, const XMLTokenEnum aName, const bool bDisplay) { diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 4c8db3b83174..33a42186ab10 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -33,19 +33,17 @@ namespace com { namespace sun { namespace star { class XMLTableMasterPageExport : public XMLTextMasterPageExport { - void exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter, + void exportHeaderFooter(const css::uno::Reference < css::sheet::XHeaderFooterContent >& xHeaderFooter, const xmloff::token::XMLTokenEnum aName, const bool bDisplay); protected: virtual void exportHeaderFooterContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText >& rText, + const css::uno::Reference< css::text::XText >& rText, bool bAutoStyles, bool bProgress ) override; virtual void exportMasterPageContent( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, bool bAutoStyles ) override; public: diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index e94e3bb4d411..4ecc44db4af7 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -28,7 +28,7 @@ class ScXMLAnnotationContext; class XMLTableShapeImportHelper : public XMLShapeImportHelper { - ::com::sun::star::table::CellAddress aStartCell; + css::table::CellAddress aStartCell; ScXMLAnnotationContext* pAnnotationContext; bool bOnTable; @@ -37,12 +37,12 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); virtual ~XMLTableShapeImportHelper(); - static void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); - virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) override; + static void SetLayer(css::uno::Reference<css::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); + virtual void finishShape(css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes) override; - void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } + void SetCell (const css::table::CellAddress& rAddress) { aStartCell = rAddress; } void SetOnTable (const bool bTempOnTable) { bOnTable = bTempOnTable; } void SetAnnotation(ScXMLAnnotationContext* pAnnotation) { pAnnotationContext = pAnnotation; } diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index b0e7a28b92f7..aec8c79f7593 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -31,7 +31,7 @@ class ScDocument; struct ScMyToFixupOLE { - com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; + css::uno::Reference <css::drawing::XShape> xShape; OUString sRangeList; }; @@ -50,8 +50,8 @@ public: ScMyOLEFixer(ScXMLImport& rImport); ~ScMyOLEFixer(); - static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape); - void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + static bool IsOLE(css::uno::Reference< css::drawing::XShape >& rShape); + void AddOLE(css::uno::Reference <css::drawing::XShape>& rShape, const OUString &rRangeList); void FixupOLEs(); }; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 7062aa4c74b8..2650de14dfc0 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -28,8 +28,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -41,8 +40,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index bf62f5f4bd76..d813709c9395 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -30,15 +30,13 @@ class ScXMLTableShapesContext : public SvXMLImportContext public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableShapesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index ecb6d7b207b4..d66733e3f9b1 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -34,8 +34,7 @@ using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), sLink(), sTableName(), @@ -86,8 +85,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index e3ea662a5341..4a34619bc584 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -30,23 +30,21 @@ class ScXMLTableSourceContext : public SvXMLImportContext OUString sTableName; OUString sFilterName; OUString sFilterOptions; - sal_Int32 nRefresh; - com::sun::star::sheet::SheetLinkMode nMode; + sal_Int32 nRefresh; + css::sheet::SheetLinkMode nMode; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index db152cede361..368326371fda 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -51,15 +51,13 @@ class ScXMLChangeInfoContext : public SvXMLImportContext public: ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -72,15 +70,13 @@ class ScXMLBigRangeContext : public SvXMLImportContext public: ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -108,15 +104,13 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext public: ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -129,15 +123,13 @@ class ScXMLDependenceContext : public SvXMLImportContext public: ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -150,15 +142,13 @@ class ScXMLDependingsContext : public SvXMLImportContext public: ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -171,15 +161,13 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext public: ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -192,15 +180,13 @@ class ScXMLDeletionsContext : public SvXMLImportContext public: ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -209,12 +195,12 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - OUString sLName; - OUStringBuffer sText; + css::uno::Reference< css::xml::sax::XAttributeList> xAttrList; + OUString sLName; + OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; SvXMLImportContext* pTextPContext; - sal_uInt16 nPrefix; + sal_uInt16 nPrefix; ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -222,16 +208,14 @@ public: ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeCellContext* pChangeCellContext); virtual ~ScXMLChangeTextPContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; @@ -257,8 +241,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext public: ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScCellValue& rOldCell, OUString& sAddress, OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, @@ -268,8 +251,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; void CreateTextPContext(bool bIsNewParagraph); bool IsEditCell() { return pEditTextObj != 0; } @@ -298,15 +280,13 @@ class ScXMLPreviousContext : public SvXMLImportContext public: ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -320,15 +300,13 @@ class ScXMLContentChangeContext : public SvXMLImportContext public: ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -340,15 +318,13 @@ class ScXMLInsertionContext : public SvXMLImportContext public: ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -360,15 +336,13 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext public: ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -380,15 +354,13 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext public: ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -400,15 +372,13 @@ class ScXMLCutOffsContext : public SvXMLImportContext public: ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -420,15 +390,13 @@ class ScXMLDeletionContext : public SvXMLImportContext public: ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -442,15 +410,13 @@ class ScXMLMovementContext : public SvXMLImportContext public: ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -462,15 +428,13 @@ class ScXMLRejectionContext : public SvXMLImportContext public: ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -515,8 +479,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -556,9 +519,9 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, - ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : + ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), aInfo(), pChangeTrackingImportHelper(pTempChangeTrackingImportHelper), @@ -593,8 +556,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -706,8 +668,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -756,8 +717,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -826,8 +786,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -853,8 +812,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -908,8 +866,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -935,8 +892,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -961,8 +917,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : SvXMLImportContext( rImport, nPrfx, rLName ), xAttrList(xTempAttrList), @@ -982,8 +937,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList ) { SvXMLImportContext *pContext(0); @@ -1154,8 +1108,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1291,8 +1244,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1365,8 +1317,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1481,8 +1432,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1549,8 +1499,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -1613,8 +1562,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -1640,8 +1588,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1745,8 +1692,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1832,8 +1778,7 @@ ScXMLMovementContext::~ScXMLMovementContext() SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -1918,8 +1863,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 14d0d73ee84a..af0972a57be2 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -37,15 +37,13 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext public: ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index 3112e31bcbc9..65487b8fb6b8 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -25,11 +25,11 @@ class ScXMLCellTextParaContext : public ScXMLImportContext public: ScXMLCellTextParaContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLTableRowCellContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; void PushSpan(const OUString& rSpan, const OUString& rStyleName); void PushFieldSheetName(const OUString& rStyleName); @@ -49,11 +49,11 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext public: ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLCellTextParaContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -68,11 +68,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -87,11 +87,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -106,11 +106,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -127,11 +127,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -149,10 +149,10 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; #endif diff --git a/sc/source/filter/xml/datastreamimport.cxx b/sc/source/filter/xml/datastreamimport.cxx index 3c5f17de5a61..a764718e0c33 100644 --- a/sc/source/filter/xml/datastreamimport.cxx +++ b/sc/source/filter/xml/datastreamimport.cxx @@ -21,8 +21,7 @@ using namespace xmloff::token; ScXMLDataStreamContext::ScXMLDataStreamContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList>& xAttrList ) : + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) : ScXMLImportContext(rImport, nPrefix, rLocalName), mbRefreshOnEmpty(false), meInsertPos(sc::ImportPostProcessData::DataStream::InsertBottom) diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index 711cc7cda9aa..cae132bc4435 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -25,8 +25,7 @@ class ScXMLDataStreamContext : public ScXMLImportContext public: ScXMLDataStreamContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLDataStreamContext(); diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 10d161fa3e85..9063d4a4920f 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -111,7 +111,7 @@ ScXMLAnnotationContext::~ScXMLAnnotationContext() { } -void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) +void ScXMLAnnotationContext::StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) { if (pShapeContext) pShapeContext->StartElement(xAttrList); @@ -119,8 +119,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 9f6a364f7f6b..50cd2964e34f 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -45,9 +45,9 @@ struct ScXMLAnnotationStyleEntry struct ScXMLAnnotationData { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxShapes; OUString maAuthor; OUString maCreateDate; @@ -68,8 +68,7 @@ public: ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, ScXMLTableRowCellContext* pCellContext); @@ -77,18 +76,17 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; void SetShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const css::uno::Reference< css::drawing::XShapes >& rxShapes, const OUString& rStyleName, const OUString& rTextStyle ); void AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index a8db60e04e09..03da40290d6c 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -128,8 +128,7 @@ ScXMLBodyContext::~ScXMLBodyContext() SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index ce2450102e3c..4755f23f75c2 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -42,13 +42,12 @@ class ScXMLBodyContext : public SvXMLImportContext public: ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; }; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 3612f38c2ace..b0e48691458f 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -133,8 +133,7 @@ ScXMLTableRowCellContext::Field::~Field() ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, const bool bTempIsCovered, const sal_Int32 nTempRepeatedRows ) : ScXMLImportContext(rImport, nPrfx, rLName), @@ -667,8 +666,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -731,7 +729,7 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr XMLTableShapeImportHelper* pTableShapeImport = static_cast< XMLTableShapeImportHelper* >( rXMLImport.GetShapeImport().get() ); pTableShapeImport->SetOnTable(false); - com::sun::star::table::CellAddress aCellAddress; + css::table::CellAddress aCellAddress; ScUnoConversion::FillApiAddress( aCellAddress, aCellPos ); pTableShapeImport->SetCell(aCellAddress); pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext( diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 69df58e3c624..e11a07f38803 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -130,16 +130,14 @@ public: ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bIsCovered, const sal_Int32 nRepeatedRows ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + const bool bIsCovered, const sal_Int32 nRepeatedRows ); virtual ~ScXMLTableRowCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; void PushParagraphSpan(const OUString& rSpan, const OUString& rStyleName); void PushParagraphFieldDate(const OUString& rStyleName); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 956de1c60c87..7399136a9fa2 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -43,8 +43,7 @@ using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), sVisibility(GetXMLToken(XML_VISIBLE)) { @@ -93,8 +92,7 @@ ScXMLTableColContext::~ScXMLTableColContext() SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -163,8 +161,7 @@ void ScXMLTableColContext::EndElement() ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartCol(0), @@ -205,8 +202,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 9e3771ec3ff3..4f551a715e75 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -38,15 +38,13 @@ public: ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableColContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -68,16 +66,14 @@ public: ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); virtual ~ScXMLTableColsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 4f067cb37d4f..28744a53208d 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -30,8 +30,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rIm SvXMLImportContext* ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatsTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -58,7 +57,7 @@ void ScXMLConditionalFormatsContext::EndElement() } ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): + const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList): SvXMLImportContext( rImport, nPrfx, rLName ) { OUString sRange; @@ -92,8 +91,7 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo SvXMLImportContext* ScXMLConditionalFormatContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -149,8 +147,7 @@ ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetColorScaleTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -168,7 +165,7 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 } ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpDataBarFormat(NULL), @@ -292,8 +289,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -324,8 +320,7 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -384,8 +379,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -569,7 +563,8 @@ void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& } ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -643,7 +638,8 @@ void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const O } ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpFormatEntry( NULL ) @@ -694,7 +690,8 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor } ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pColorScaleEntry): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -770,7 +767,8 @@ condformat::ScCondFormatDateType getDateFromString(const OUString& rString) } ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 4a3c2a80ca1a..ca42c0b6eed5 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -33,8 +33,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -46,15 +45,13 @@ class ScXMLConditionalFormatContext : public SvXMLImportContext public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLConditionalFormatContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -77,8 +74,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; private: ScColorScaleFormat* pColorScaleFormat; @@ -91,16 +87,14 @@ class ScXMLDataBarFormatContext : public SvXMLImportContext public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); virtual ~ScXMLDataBarFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; private: ScDataBarFormat* mpDataBarFormat; @@ -118,16 +112,14 @@ public: ScXMLIconSetFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); virtual ~ScXMLIconSetFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; }; class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext @@ -137,8 +129,7 @@ class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat); virtual ~ScXMLColorScaleFormatEntryContext() {} @@ -154,8 +145,7 @@ class ScXMLFormattingEntryContext : public SvXMLImportContext public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pData); virtual ~ScXMLFormattingEntryContext() {} @@ -168,8 +158,7 @@ class ScXMLCondContext : public SvXMLImportContext public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); virtual ~ScXMLCondContext() {} @@ -182,8 +171,7 @@ class ScXMLDateContext : public SvXMLImportContext public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); virtual ~ScXMLDateContext() {} diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 7f5ba32ff476..dcbf27324a8c 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -32,8 +32,7 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, OUStringBuffer& sTempValue) : SvXMLImportContext( rImport, nPrfx, rLName ), sOUText(), @@ -47,8 +46,7 @@ ScXMLContentContext::~ScXMLContentContext() SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 913ab765cbe8..26ce61ae8b9b 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -35,16 +35,14 @@ public: ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, OUStringBuffer& sValue); virtual ~ScXMLContentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters( const OUString& rChars ) override; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 01f393d980ae..4a083dca5999 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -54,7 +54,7 @@ class ScXMLContentValidationContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } - com::sun::star::sheet::ValidationAlertStyle GetAlertStyle() const; + css::sheet::ValidationAlertStyle GetAlertStyle() const; void SetFormula( OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& reGrammar, const OUString& rCondition, const OUString& rGlobNmsp, FormulaGrammar::Grammar eGlobGrammar, bool bHasNmsp ) const; void GetCondition( ScMyImportValidation& rValidation ) const; @@ -63,15 +63,13 @@ public: ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -95,16 +93,14 @@ public: ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLHelpMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -125,16 +121,14 @@ public: ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLErrorMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -152,24 +146,21 @@ public: ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLErrorMacroContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -181,8 +172,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -207,8 +197,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), nShowList(sheet::TableValidationVisibility::UNSORTED), bAllowEmptyCell(true), @@ -271,8 +260,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -478,8 +466,7 @@ void ScXMLContentValidationContext::SetErrorMacro(const bool bExecute) ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sTitle(), @@ -516,8 +503,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -548,8 +534,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sTitle(), @@ -590,8 +575,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -622,8 +606,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sName(), @@ -658,8 +641,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = NULL; diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index d2a6afe0882b..7465cd366a8b 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -36,15 +36,13 @@ public: ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 0ee00a0320fc..a50915277e7a 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -57,8 +57,7 @@ using ::com::sun::star::xml::sax::XAttributeList; ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // has no Attributes @@ -72,8 +71,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -104,8 +102,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), pDoc(GetScImport().GetDocument()), pDPObject(NULL), @@ -223,8 +220,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -594,9 +590,8 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -637,8 +632,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -655,9 +649,8 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -693,8 +686,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -711,9 +703,8 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -749,8 +740,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -767,9 +757,8 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -820,8 +809,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -913,9 +901,8 @@ void ScXMLDataPilotGrandTotalContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -952,8 +939,8 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< + css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -978,9 +965,8 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable), pDim(NULL), @@ -1078,8 +1064,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1257,9 +1242,8 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1295,8 +1279,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1332,8 +1315,7 @@ void ScXMLDataPilotLevelContext::EndElement() ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1383,8 +1365,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1432,8 +1413,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1477,9 +1457,8 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField), nFunctionCount(0), @@ -1496,8 +1475,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1550,9 +1528,8 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotSubTotals(pTempDataPilotSubTotals) { @@ -1588,8 +1565,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -1606,9 +1582,8 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1621,8 +1596,8 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference< + css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1647,9 +1622,8 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField), bDisplay( true ), @@ -1700,8 +1674,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -1727,17 +1700,16 @@ void ScXMLDataPilotMemberContext::EndElement() ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { - OUString sGroupSource; - double fStart(0.0); - double fEnd(0.0); - double fStep(0.0); - sal_Int32 nGroupPart(0); + OUString sGroupSource; + double fStart(0.0); + double fEnd(0.0); + double fStep(0.0); + sal_Int32 nGroupPart(0); bool bDateValue(false); bool bAutoStart(true); bool bAutoEnd(true); @@ -1804,19 +1776,19 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, else if (IsXMLToken(aLocalName, XML_GROUPED_BY)) { if (IsXMLToken(sValue, XML_SECONDS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::SECONDS; else if (IsXMLToken(sValue, XML_MINUTES)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES; + nGroupPart = css::sheet::DataPilotFieldGroupBy::MINUTES; else if (IsXMLToken(sValue, XML_HOURS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::HOURS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::HOURS; else if (IsXMLToken(sValue, XML_DAYS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::DAYS; else if (IsXMLToken(sValue, XML_MONTHS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::MONTHS; else if (IsXMLToken(sValue, XML_QUARTERS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::QUARTERS; else if (IsXMLToken(sValue, XML_YEARS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::YEARS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::YEARS; } } pDataPilotField->SetGrouping(sGroupSource, fStart, fEnd, fStep, nGroupPart, bDateValue, bAutoStart, bAutoEnd); @@ -1828,8 +1800,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext() SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1852,9 +1823,8 @@ void ScXMLDataPilotGroupsContext::EndElement() ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1881,8 +1851,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext() SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -1906,9 +1875,8 @@ void ScXMLDataPilotGroupContext::EndElement() ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotGroupContext* pTempDataPilotGroup) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotGroupContext* pTempDataPilotGroup) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotGroup(pTempDataPilotGroup) { @@ -1935,8 +1903,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext() SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index b54681b6d7d4..17e5a327e5e9 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -56,15 +56,13 @@ public: ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTablesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -125,15 +123,13 @@ public: ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -169,16 +165,14 @@ public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -194,16 +188,14 @@ public: ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -219,16 +211,14 @@ public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -244,16 +234,14 @@ public: ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLSourceServiceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -265,23 +253,21 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ScXMLImport& GetScImport(); ScXMLDataPilotTableContext* mpTableContext; - OUString maDisplayName; + OUString maDisplayName; Orientation meOrientation; bool mbVisible; public: ScXMLDataPilotGrandTotalContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); virtual ~ScXMLDataPilotGrandTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -297,16 +283,14 @@ public: ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLSourceCellRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -347,16 +331,14 @@ public: ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDataPilotFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -365,10 +347,10 @@ public: void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } void AddMember(ScDPSaveMember* pMember); void SetSubTotalName(const OUString& rName); - void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } - void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } - void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } - void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } + void SetFieldReference(const css::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } + void SetAutoShowInfo(const css::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } + void SetSortInfo(const css::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } + void SetLayoutInfo(const css::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } void SetGrouping(const OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, bool bDate, bool bAutoSt, bool bAutoE) { @@ -387,7 +369,7 @@ public: class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldReference aReference; +// css::sheet::DataPilotFieldReference aReference; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -396,8 +378,7 @@ public: ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotFieldReferenceContext(); @@ -414,24 +395,20 @@ public: ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotLevelContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldAutoShowInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -439,8 +416,7 @@ public: ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotDisplayInfoContext(); @@ -448,8 +424,6 @@ public: class ScXMLDataPilotSortInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldSortInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -457,8 +431,7 @@ public: ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotSortInfoContext(); @@ -466,8 +439,6 @@ public: class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldLayoutInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -475,8 +446,7 @@ public: ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotLayoutInfoContext(); @@ -488,7 +458,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_Int16 nFunctionCount; sal_uInt16* pFunctions; - OUString maDisplayName; + OUString maDisplayName; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -496,16 +466,14 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotSubTotalsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; void AddFunction(sal_Int16 nFunction); @@ -523,16 +491,14 @@ public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); virtual ~ScXMLDataPilotSubTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -548,16 +514,14 @@ public: ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotMembersContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -579,16 +543,14 @@ public: ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -604,16 +566,14 @@ public: ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -632,16 +592,14 @@ public: ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotGroupContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -661,16 +619,14 @@ public: ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pDataPilotGroup); virtual ~ScXMLDataPilotGroupMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 935fdda49af4..c12fea50426c 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -61,8 +61,7 @@ using namespace xmloff::token; ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // has no attributes @@ -76,8 +75,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -105,8 +103,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), mpQueryParam(new ScQueryParam), sDatabaseRangeName(STR_DB_LOCAL_NONAME), @@ -225,8 +222,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -491,9 +487,8 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -535,8 +530,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -564,9 +558,8 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -603,8 +596,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -632,9 +624,8 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -671,8 +662,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -700,9 +690,8 @@ void ScXMLSourceQueryContext::EndElement() ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext( pTempDatabaseRangeContext ) { @@ -732,8 +721,7 @@ ScXMLConResContext::~ScXMLConResContext() SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -750,9 +738,8 @@ void ScXMLConResContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -793,8 +780,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -828,9 +814,8 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -894,8 +879,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; @@ -912,9 +896,8 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -945,8 +928,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -976,9 +958,8 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pSubTotalRuleContext(pTempSubTotalRuleContext) { @@ -1014,8 +995,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index b197e2b03182..004ad961b187 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -47,15 +47,13 @@ public: ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -63,21 +61,21 @@ public: struct ScSubTotalRule { sal_Int16 nSubTotalRuleGroupFieldNumber; - com::sun::star::uno::Sequence <com::sun::star::sheet::SubTotalColumn> aSubTotalColumns; + css::uno::Sequence <css::sheet::SubTotalColumn> aSubTotalColumns; }; class ScXMLDatabaseRangeContext : public SvXMLImportContext { std::unique_ptr<ScQueryParam> mpQueryParam; - ScRange maRange; - OUString sDatabaseRangeName; - OUString sConnectionResource; - OUString sDatabaseName; - OUString sSourceObject; - com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; + ScRange maRange; + OUString sDatabaseRangeName; + OUString sConnectionResource; + OUString sDatabaseName; + OUString sSourceObject; + css::uno::Sequence <css::beans::PropertyValue> aSortSequence; std::vector < ScSubTotalRule > aSubTotalRules; - com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; - com::sun::star::sheet::DataImportMode nSourceType; + css::table::CellRangeAddress aFilterConditionSourceRangeAddress; + css::sheet::DataImportMode nSourceType; sal_Int32 nRefresh; sal_Int16 nSubTotalsUserListIndex; bool mbValidRange; @@ -109,22 +107,20 @@ public: ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; void SetDatabaseName(const OUString& sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } void SetConnectionResource(const OUString& sTempConRes) { sConnectionResource = sTempConRes; } void SetSourceObject(const OUString& sTempSourceObject) { sSourceObject = sTempSourceObject; } - void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } + void SetSourceType(const css::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } void SetSubTotalsIsCaseSensitive(const bool bTemp) { bSubTotalsIsCaseSensitive = bTemp; } @@ -134,8 +130,8 @@ public: void SetSubTotalsAscending(const bool bTemp) { bSubTotalsAscending = bTemp; } void SetSubTotalsSortGroups(const bool bTemp) { bSubTotalsSortGroups = bTemp; } void AddSubTotalRule(const ScSubTotalRule& rRule) { aSubTotalRules.push_back(rRule); } - void SetSortSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; } - void SetFilterConditionSourceRangeAddress(const com::sun::star::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp; + void SetSortSequence(const css::uno::Sequence <css::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; } + void SetFilterConditionSourceRangeAddress(const css::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp; bFilterConditionSourceRange = true; } }; @@ -151,16 +147,14 @@ public: ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -177,16 +171,14 @@ public: ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -203,16 +195,14 @@ public: ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -228,16 +218,14 @@ public: ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLConResContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -253,16 +241,15 @@ public: ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSubTotalRulesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -278,16 +265,14 @@ public: ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSortGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -304,20 +289,18 @@ public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSubTotalRuleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; - void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn& rSubTotalColumn) + void AddSubTotalColumn(const css::sheet::SubTotalColumn& rSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); aSubTotalRule.aSubTotalColumns[aSubTotalRule.aSubTotalColumns.getLength() - 1] = rSubTotalColumn; } }; @@ -335,16 +318,14 @@ public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSubTotalRuleContext* pSubTotalRuleContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSubTotalRuleContext* pSubTotalRuleContext); virtual ~ScXMLSubTotalFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index ea9401bcb39e..6b13abc7d94d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -337,7 +337,7 @@ sal_Int16 ScXMLExport::GetMeasureUnit() } ScXMLExport::ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) : SvXMLExport( GetMeasureUnit(), rContext, implementationName, XML_SPREADSHEET, nExportFlag ), @@ -4973,8 +4973,8 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon } // XFilter -sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -4986,7 +4986,7 @@ sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< :: } void SAL_CALL ScXMLExport::cancel() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -4995,16 +4995,16 @@ void SAL_CALL ScXMLExport::cancel() } // XInitialization -void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::initialize(aArguments); } // XUnoTunnel -sal_Int64 SAL_CALL ScXMLExport::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SvXMLExport::getSomething(aIdentifier); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index beb35f3db0bf..2d91646b0925 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -73,10 +73,10 @@ class CompileFormulaContext; class ScXMLExport : public SvXMLExport { ScDocument* pDoc; - com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable; - com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange; + css::uno::Reference <css::sheet::XSpreadsheet> xCurrentTable; + css::uno::Reference <css::table::XCellRange> xCurrentTableCellRange; - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream; + css::uno::Reference<css::io::XInputStream> xSourceStream; sal_Int32 nSourceStreamPos; mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap; @@ -95,12 +95,12 @@ class ScXMLExport : public SvXMLExport typedef std::unordered_map<sal_Int32, sal_Int32> NumberFormatIndexMap; NumberFormatIndexMap aNumFmtIndexMap; ScMySharedData* pSharedData; - ScColumnStyles* pColumnStyles; - ScRowStyles* pRowStyles; + ScColumnStyles* pColumnStyles; + ScRowStyles* pRowStyles; ScFormatRangeStyles* pCellStyles; ScRowFormatRanges* pRowFormatRanges; - std::vector<OUString> aTableStyles; - com::sun::star::table::CellRangeAddress aRowHeaderRange; + std::vector<OUString> aTableStyles; + css::table::CellRangeAddress aRowHeaderRange; ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; ScMyDefaultStyles* pDefaults; @@ -143,9 +143,9 @@ class ScXMLExport : public SvXMLExport virtual void _ExportContent() override; virtual void _ExportMeta() override; - void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + void CollectInternalShape( css::uno::Reference< css::drawing::XShape > xShape ); - static com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, + static css::table::CellRangeAddress GetEndAddress(const css::uno::Reference<css::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); // ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks ); @@ -156,7 +156,7 @@ class ScXMLExport : public SvXMLExport const sal_Int32 nStyleIndex, const bool bIsVisible); void OpenHeaderColumn(); void CloseHeaderColumn(); - void ExportColumns(const sal_Int32 nTable, const com::sun::star::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader); + void ExportColumns(const sal_Int32 nTable, const css::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader); void ExportExternalRefCacheStyles(); void ExportCellTextAutoStyles(sal_Int32 nTable); void ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 nStartRow, @@ -171,23 +171,23 @@ class ScXMLExport : public SvXMLExport bool bHidden, bool bFiltered); void OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, const sal_Int32 nRepeatRow, ScXMLCachedRowAttrAccess& rRowAttr); void CloseRow(const sal_Int32 nRow); - void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, - bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, + void GetColumnRowHeader(bool& bHasColumnHeader, css::table::CellRangeAddress& aColumnHeaderRange, + bool& bHasRowHeader, css::table::CellRangeAddress& aRowHeaderRange, OUString& rPrintRanges) const; static void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); - bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, - const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable); + bool GetMerged (const css::table::CellRangeAddress* pCellRange, + const css::uno::Reference <css::sheet::XSpreadsheet>& xTable); - void WriteTable(sal_Int32 nTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet>& xTable); + void WriteTable(sal_Int32 nTable, const css::uno::Reference< css::sheet::XSpreadsheet>& xTable); void WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount); void WriteEditCell(const EditTextObject* pText); void WriteMultiLineFormulaResult(const ScFormulaCell* pCell); void WriteAreaLink(const ScMyCell& rMyCell); void WriteAnnotation(ScMyCell& rMyCell); void WriteDetective(const ScMyCell& rMyCell); - void ExportShape(const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, com::sun::star::awt::Point* pPoint); + void ExportShape(const css::uno::Reference < css::drawing::XShape >& xShape, css::awt::Point* pPoint); void WriteShapes(const ScMyCell& rMyCell); void WriteTableShapes(); void SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgress); @@ -196,11 +196,11 @@ class ScXMLExport : public SvXMLExport static bool IsEditCell(ScMyCell& rCell); bool IsCellEqual(ScMyCell& aCell1, ScMyCell& aCell2); - void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); + void WriteCalculationSettings(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteTableSource(); void WriteScenario(); // core implementation - void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); - void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, bool bColumn ); + void WriteTheLabelRanges(const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xSpreadDoc); + void WriteLabelRanges( const css::uno::Reference< css::container::XIndexAccess >& xRangesIAccess, bool bColumn ); void WriteNamedExpressions(); void WriteDataStream(); void WriteNamedRange(ScRangeName* pRangeName); @@ -211,14 +211,14 @@ class ScXMLExport : public SvXMLExport void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); void AddStyleFromCells( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties, - const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable, + const css::uno::Reference< css::beans::XPropertySet >& xProperties, + const css::uno::Reference< css::sheet::XSpreadsheet >& xTable, sal_Int32 nTable, const OUString* pOldName ); void AddStyleFromColumn( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, + const css::uno::Reference< css::beans::XPropertySet >& xColumnProperties, const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, + const css::uno::Reference< css::beans::XPropertySet >& xRowProperties, const OUString* pOldName, sal_Int32& rIndex ); void IncrementProgressBar(bool bFlush, sal_Int32 nInc = 1); @@ -234,7 +234,7 @@ protected: virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag); virtual ~ScXMLExport(); @@ -243,18 +243,18 @@ public: inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } bool IsMatrix (const ScAddress& aCell, - com::sun::star::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const; + css::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const; rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; } rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; } - void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream ); + void SetSourceStream( const css::uno::Reference<css::io::XInputStream>& xNewStream ); - void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; + void GetChangeTrackViewSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps); + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps) override; + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps) override; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) override; + virtual void exportAnnotationMeta( const css::uno::Reference < css::drawing::XShape >& xShape) override; void CreateSharedData(const sal_Int32 nTableCount); void SetSharedData(ScMySharedData* pTemp) { pSharedData = pTemp; } @@ -265,17 +265,17 @@ public: virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) 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; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, 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; virtual void DisposingModel() override; }; diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index fc90e5d28f2c..9193c491fd61 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -247,7 +247,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( mfCellValue(0.0), mnRepeatCount(1), mnNumberFormat(-1), - mnCellType(::com::sun::star::util::NumberFormat::UNDEFINED), + mnCellType(css::util::NumberFormat::UNDEFINED), mbIsNumeric(false), mbIsEmpty(true) { diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 51a0006a077c..7e6246de4304 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -31,16 +31,14 @@ class ScXMLExternalRefTabSourceContext : public SvXMLImportContext public: ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefTabSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -58,16 +56,14 @@ class ScXMLExternalRefRowsContext : public SvXMLImportContext public: ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -80,16 +76,14 @@ class ScXMLExternalRefRowContext : public SvXMLImportContext public: ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -103,16 +97,14 @@ class ScXMLExternalRefCellContext : public SvXMLImportContext public: ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -135,16 +127,14 @@ class ScXMLExternalRefCellTextContext : public SvXMLImportContext public: ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLExternalRefCellContext& rParent ); virtual ~ScXMLExternalRefCellTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void Characters(const OUString& rChar) override; diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f500690c9ed1..2c718ed11541 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -104,8 +104,7 @@ ScXMLFilterContext::~ScXMLFilterContext() SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -215,8 +214,7 @@ ScXMLAndContext::~ScXMLAndContext() SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -250,8 +248,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, + const Reference<css::xml::sax::XAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -267,8 +264,7 @@ ScXMLOrContext::~ScXMLOrContext() SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -531,9 +527,8 @@ void ScXMLSetItemContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTableContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTableContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTableContext), aFilterFields(), @@ -598,8 +593,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -657,9 +651,8 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ) { pFilterContext = pTempFilterContext; @@ -672,8 +665,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -707,9 +699,8 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext) { @@ -722,8 +713,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -758,9 +748,8 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext), sDataType(GetXMLToken(XML_TEXT)), @@ -815,8 +804,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 75415b1555d3..5c14bbe49773 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -49,8 +49,8 @@ class ScXMLFilterContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLDatabaseRangeContext* pDatabaseRangeContext; - com::sun::star::table::CellAddress aOutputPosition; - com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; + css::table::CellAddress aOutputPosition; + css::table::CellRangeAddress aConditionSourceRangeAddress; bool bSkipDuplicates; bool bCopyOutputData; bool bConditionSourceRange; @@ -63,8 +63,7 @@ public: ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -72,8 +71,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -94,8 +92,7 @@ public: ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -103,8 +100,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -121,8 +117,7 @@ public: ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -130,8 +125,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -155,8 +149,7 @@ public: ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -164,8 +157,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -180,8 +172,7 @@ class ScXMLSetItemContext : public SvXMLImportContext public: ScXMLSetItemContext(ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLConditionContext& rParent); virtual ~ScXMLSetItemContext(); @@ -189,8 +180,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; @@ -221,16 +211,14 @@ public: ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTableContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTableContext); virtual ~ScXMLDPFilterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -274,16 +262,14 @@ public: ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPAndContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -299,16 +285,14 @@ public: ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPOrContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -330,16 +314,14 @@ public: ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPConditionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; static void getOperatorXML( const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5d03cea81f69..b7902b3e900d 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1977,7 +1977,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, } ScXMLImport::ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag) : SvXMLImport( rContext, implementationName, nImportFlag ), pDoc( NULL ), @@ -2443,7 +2443,7 @@ void ScXMLImport::ExamineDefaultStyle() } } -void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps) +void ScXMLImport::SetChangeTrackingViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& rChangeProps) { if (pDoc) { @@ -2951,8 +2951,8 @@ void ScXMLImport::SetStylesToRangesFinished() } // XImporter -void SAL_CALL ScXMLImport::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) +void SAL_CALL ScXMLImport::setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) +throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::setTargetDocument( xDoc ); @@ -2972,9 +2972,9 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R xActionLockable->addActionLock(); } -// ::com::sun::star::xml::sax::XDocumentHandler +// css::xml::sax::XDocumentHandler void SAL_CALL ScXMLImport::startDocument() -throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::startDocument(); @@ -3188,8 +3188,8 @@ void ScXMLImport::SetStringRefSyntaxIfMissing() } void SAL_CALL ScXMLImport::endDocument() - throw(::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw(css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index b7e98b37737b..7ff29c70af15 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -805,15 +805,15 @@ struct ScMyImportValidation OUString sFormulaNmsp1; OUString sFormulaNmsp2; OUString sBaseCellAddress; // string is used directly - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; - formula::FormulaGrammar::Grammar eGrammar1; - formula::FormulaGrammar::Grammar eGrammar2; - sal_Int16 nShowList; - bool bShowErrorMessage; - bool bShowImputMessage; - bool bIgnoreBlanks; + css::sheet::ValidationAlertStyle aAlertStyle; + css::sheet::ValidationType aValidationType; + css::sheet::ConditionOperator aOperator; + formula::FormulaGrammar::Grammar eGrammar1; + formula::FormulaGrammar::Grammar eGrammar2; + sal_Int16 nShowList; + bool bShowErrorMessage; + bool bShowImputMessage; + bool bIgnoreBlanks; }; typedef std::vector<ScMyImportValidation> ScMyImportValidations; @@ -949,10 +949,10 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable std::vector<OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; - com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; - com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatTypes> xNumberFormatTypes; + css::uno::Reference <css::util::XNumberFormats> xNumberFormats; + css::uno::Reference <css::util::XNumberFormatTypes> xNumberFormatTypes; - com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; + css::uno::Reference <css::sheet::XSheetCellRangeContainer> xSheetCellRanges; OUString sPrevStyleName; OUString sPrevCurrency; @@ -973,13 +973,12 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual XMLShapeImportHelper* CreateShapeImport() override; public: ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag); virtual ~ScXMLImport() throw(); @@ -994,17 +993,17 @@ public: SvXMLImportContext *CreateMetaContext( const OUString& rLocalName ); SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateScriptContext( const OUString& rLocalName ); SvXMLImportContext *CreateStylesContext(const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, bool bAutoStyles ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( const OUString& rLocalName, - const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); - virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; + virtual void SetStatistics( const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; ScDocumentImport& GetDoc(); @@ -1141,15 +1140,15 @@ public: ScXMLChangeTrackingImportHelper* GetChangeTrackingImportHelper(); void InsertStyles(); - void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override; - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override; + void SetChangeTrackingViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& rChangeProps); + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); - void SetType(com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet>& rProperties, + void SetType(css::uno::Reference <css::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, const OUString& rCurrency); @@ -1160,7 +1159,7 @@ public: bool HasNewCondFormatData() { return mbHasNewCondFormatData; } private: - void AddStyleRange(const com::sun::star::table::CellRangeAddress& rCellRange); + void AddStyleRange(const css::table::CellRangeAddress& rCellRange); void SetStyleToRanges(); void ExamineDefaultStyle(); @@ -1174,13 +1173,13 @@ public: void SetStylesToRangesFinished(); // 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; virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw(::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw(css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void DisposingModel() override; diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index d12155e5203d..917e265c42dd 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -33,14 +33,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -60,14 +60,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangeContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index acd373ec346c..57a92722f208 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -63,8 +63,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -155,8 +154,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } @@ -217,8 +215,8 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference< + css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName );; } diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index dae6c93ad68d..5495378eecbd 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -73,16 +73,14 @@ public: ScXMLNamedExpressionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, Inserter* pInserter ); virtual ~ScXMLNamedExpressionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -99,16 +97,14 @@ public: ScXMLNamedRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); virtual ~ScXMLNamedRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -125,16 +121,14 @@ public: ScXMLNamedExpressionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); virtual ~ScXMLNamedExpressionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index bf0565dd3ec9..a3b30baf4f72 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -48,8 +48,7 @@ using namespace xmloff::token; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), sVisibility(GetXMLToken(XML_VISIBLE)), nRepeatedRows(1), @@ -106,8 +105,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -214,9 +212,9 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bTempHeader, const bool bTempGroup ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + const bool bTempHeader, + const bool bTempGroup ) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartRow(0), nGroupStartRow(0), @@ -256,8 +254,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index e8bdabec4604..3532944e01cc 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -39,15 +39,13 @@ public: ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -67,16 +65,14 @@ public: ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); virtual ~ScXMLTableRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 5bd4935a5929..b5a4625b5896 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -46,15 +46,13 @@ public: ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 0c6ceabfe93b..9c84b14bbfde 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -35,9 +35,9 @@ using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference< + css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext), sAlgorithm(), @@ -105,8 +105,7 @@ ScXMLSortContext::~ScXMLSortContext() SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -200,9 +199,8 @@ void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSortContext* pTempSortContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSortContext* pTempSortContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pSortContext(pTempSortContext), sDataType(GetXMLToken(XML_AUTOMATIC)), @@ -245,8 +243,7 @@ ScXMLSortByContext::~ScXMLSortByContext() SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 0f1db462a628..d91632e58738 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -33,10 +33,10 @@ class ScXMLSortContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; - com::sun::star::table::CellAddress aOutputPosition; + css::uno::Sequence <css::util::SortField> aSortFields; + css::table::CellAddress aOutputPosition; LanguageTagODF maLanguageTagODF; - OUString sAlgorithm; + OUString sAlgorithm; sal_Int16 nUserListIndex; bool bCopyOutputData; bool bBindFormatsToContent; @@ -50,16 +50,14 @@ public: ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSortContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -81,16 +79,14 @@ public: ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSortContext* pTempSortContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSortContext* pTempSortContext); virtual ~ScXMLSortByContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index ba5294caf0dc..aa8d133e5a40 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -675,7 +675,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( } void ScXMLAutoStylePoolP::exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, sal_Int32 nFamily, const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp @@ -805,8 +805,7 @@ ScXMLAutoStylePoolP::~ScXMLAutoStylePoolP() } void ScXMLStyleExport::exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) + const css::uno::Reference< css::style::XStyle > & rStyle ) { uno::Reference< beans::XPropertySet > xPropSet( rStyle, uno::UNO_QUERY ); if (xPropSet.is()) @@ -828,9 +827,7 @@ void ScXMLStyleExport::exportStyleAttributes( } } -void ScXMLStyleExport::exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & /* rStyle */ ) +void ScXMLStyleExport::exportStyleContent( const css::uno::Reference<css::style::XStyle > & /* rStyle */ ) { } @@ -949,8 +946,8 @@ XmlScPropHdl_CellProtection::~XmlScPropHdl_CellProtection() } bool XmlScPropHdl_CellProtection::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { util::CellProtection aCellProtection1, aCellProtection2; @@ -965,7 +962,7 @@ bool XmlScPropHdl_CellProtection::equals( bool XmlScPropHdl_CellProtection::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1038,7 +1035,7 @@ bool XmlScPropHdl_CellProtection::importXML( bool XmlScPropHdl_CellProtection::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1085,8 +1082,8 @@ XmlScPropHdl_PrintContent::~XmlScPropHdl_PrintContent() } bool XmlScPropHdl_PrintContent::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { util::CellProtection aCellProtection1, aCellProtection2; @@ -1099,7 +1096,7 @@ bool XmlScPropHdl_PrintContent::equals( bool XmlScPropHdl_PrintContent::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1129,7 +1126,7 @@ bool XmlScPropHdl_PrintContent::importXML( bool XmlScPropHdl_PrintContent::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1151,8 +1148,8 @@ XmlScPropHdl_JustifyMethod::~XmlScPropHdl_JustifyMethod() } bool XmlScPropHdl_JustifyMethod::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 nVal1(0), nVal2(0); @@ -1163,7 +1160,7 @@ bool XmlScPropHdl_JustifyMethod::equals( bool XmlScPropHdl_JustifyMethod::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval = false; @@ -1189,7 +1186,7 @@ bool XmlScPropHdl_JustifyMethod::importXML( bool XmlScPropHdl_JustifyMethod::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1225,8 +1222,8 @@ XmlScPropHdl_HoriJustify::~XmlScPropHdl_HoriJustify() } bool XmlScPropHdl_HoriJustify::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1237,7 +1234,7 @@ bool XmlScPropHdl_HoriJustify::equals( bool XmlScPropHdl_HoriJustify::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1279,7 +1276,7 @@ bool XmlScPropHdl_HoriJustify::importXML( bool XmlScPropHdl_HoriJustify::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1329,8 +1326,8 @@ XmlScPropHdl_HoriJustifySource::~XmlScPropHdl_HoriJustifySource() } bool XmlScPropHdl_HoriJustifySource::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1341,7 +1338,7 @@ bool XmlScPropHdl_HoriJustifySource::equals( bool XmlScPropHdl_HoriJustifySource::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1362,7 +1359,7 @@ bool XmlScPropHdl_HoriJustifySource::importXML( bool XmlScPropHdl_HoriJustifySource::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1390,8 +1387,8 @@ XmlScPropHdl_HoriJustifyRepeat::~XmlScPropHdl_HoriJustifyRepeat() } bool XmlScPropHdl_HoriJustifyRepeat::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1402,7 +1399,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals( bool XmlScPropHdl_HoriJustifyRepeat::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1423,7 +1420,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::importXML( bool XmlScPropHdl_HoriJustifyRepeat::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1451,8 +1448,8 @@ XmlScPropHdl_Orientation::~XmlScPropHdl_Orientation() } bool XmlScPropHdl_Orientation::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellOrientation aOrientation1, aOrientation2; @@ -1463,7 +1460,7 @@ bool XmlScPropHdl_Orientation::equals( bool XmlScPropHdl_Orientation::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1487,7 +1484,7 @@ bool XmlScPropHdl_Orientation::importXML( bool XmlScPropHdl_Orientation::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellOrientation nVal; @@ -1520,8 +1517,8 @@ XmlScPropHdl_RotateAngle::~XmlScPropHdl_RotateAngle() } bool XmlScPropHdl_RotateAngle::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aAngle1 = 0, aAngle2 = 0; @@ -1532,7 +1529,7 @@ bool XmlScPropHdl_RotateAngle::equals( bool XmlScPropHdl_RotateAngle::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1550,7 +1547,7 @@ bool XmlScPropHdl_RotateAngle::importXML( bool XmlScPropHdl_RotateAngle::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal = 0; @@ -1572,8 +1569,8 @@ XmlScPropHdl_RotateReference::~XmlScPropHdl_RotateReference() } bool XmlScPropHdl_RotateReference::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aReference1(0), aReference2(0); @@ -1584,7 +1581,7 @@ bool XmlScPropHdl_RotateReference::equals( bool XmlScPropHdl_RotateReference::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1620,7 +1617,7 @@ bool XmlScPropHdl_RotateReference::importXML( bool XmlScPropHdl_RotateReference::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1669,8 +1666,8 @@ XmlScPropHdl_VertJustify::~XmlScPropHdl_VertJustify() } bool XmlScPropHdl_VertJustify::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aReference1(0), aReference2(0); @@ -1681,7 +1678,7 @@ bool XmlScPropHdl_VertJustify::equals( bool XmlScPropHdl_VertJustify::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1723,7 +1720,7 @@ bool XmlScPropHdl_VertJustify::importXML( bool XmlScPropHdl_VertJustify::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1778,8 +1775,8 @@ XmlScPropHdl_BreakBefore::~XmlScPropHdl_BreakBefore() } bool XmlScPropHdl_BreakBefore::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { bool aBreak1 = false, aBreak2 = false; @@ -1790,7 +1787,7 @@ bool XmlScPropHdl_BreakBefore::equals( bool XmlScPropHdl_BreakBefore::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1814,7 +1811,7 @@ bool XmlScPropHdl_BreakBefore::importXML( bool XmlScPropHdl_BreakBefore::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1838,15 +1835,15 @@ XmlScPropHdl_IsTextWrapped::~XmlScPropHdl_IsTextWrapped() } bool XmlScPropHdl_IsTextWrapped::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { return (::cppu::any2bool(r1) == ::cppu::any2bool(r2)); } bool XmlScPropHdl_IsTextWrapped::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1867,7 +1864,7 @@ bool XmlScPropHdl_IsTextWrapped::importXML( bool XmlScPropHdl_IsTextWrapped::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1887,7 +1884,7 @@ bool XmlScPropHdl_IsTextWrapped::exportXML( } bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, - ::com::sun::star::uno::Any& /* rValue */, + css::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { OSL_FAIL("should never be called"); @@ -1895,7 +1892,7 @@ bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, } bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */, - const ::com::sun::star::uno::Any& /* rValue */, + const css::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { OSL_FAIL("should never be called"); @@ -1907,15 +1904,15 @@ XmlScPropHdl_Vertical::~XmlScPropHdl_Vertical() } bool XmlScPropHdl_Vertical::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { return (::cppu::any2bool(r1) == ::cppu::any2bool(r2)); } bool XmlScPropHdl_Vertical::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1936,7 +1933,7 @@ bool XmlScPropHdl_Vertical::importXML( bool XmlScPropHdl_Vertical::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index cf2fc4089c11..7b50eaf3f036 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -109,8 +109,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference<css::beans::XPropertySet > rPropSet ) const override; public: ScXMLCellExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -139,8 +138,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference<css::beans::XPropertySet > rPropSet ) const override; public: ScXMLRowExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -196,7 +194,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP ) const override; virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp @@ -212,11 +210,9 @@ public: class ScXMLStyleExport : public XMLStyleExport { virtual void exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< css::style::XStyle > & rStyle ) override; virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< css::style::XStyle > & rStyle ) override; public: ScXMLStyleExport( SvXMLExport& rExp, @@ -237,126 +233,126 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_CellProtection(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_PrintContent(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_JustifyMethod(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifySource(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Orientation(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateAngle(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateReference(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_VertJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_BreakBefore(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsTextWrapped(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsEqual() {} - virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const override { return true; } - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& /* r1 */, const css::uno::Any& /* r2 */ ) const override { return true; } + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Vertical(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index c23b949954fc..3bcfc6745bd5 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -1003,7 +1003,7 @@ SvXMLImportContext *ScMasterPageContext::CreateChildContext( SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, const bool /*bFirst*/ ) diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index d03227c94052..c2531750b471 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -93,21 +93,21 @@ public: XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; - virtual void FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + virtual void FillPropertySet(const css::uno::Reference< + css::beans::XPropertySet > & rPropSet ) override; virtual void SetDefaults() override; - void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); + void AddProperty(sal_Int16 nContextID, const css::uno::Any& aValue); XMLPropertyState* FindProperty(const sal_Int16 nContextID); sal_Int32 GetNumberFormat();// { return nNumberFormat; } @@ -115,7 +115,7 @@ public: SCTAB GetLastSheet() const { return nLastSheet; } void SetLastSheet(SCTAB nNew) { nLastSheet = nNew; } - void ApplyCondFormat( const com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>& xCellRanges ); + void ApplyCondFormat( const css::uno::Sequence<css::table::CellRangeAddress>& xCellRanges ); private: using XMLPropStyleContext::SetStyle; @@ -123,14 +123,10 @@ private: class XMLTableStylesContext : public SvXMLStylesContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xCellStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xColumnStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xRowStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xTableStyles; + css::uno::Reference< css::container::XNameContainer > xCellStyles; + css::uno::Reference< css::container::XNameContainer > xColumnStyles; + css::uno::Reference< css::container::XNameContainer > xRowStyles; + css::uno::Reference< css::container::XNameContainer > xTableStyles; const OUString sCellStyleServiceName; const OUString sColumnStyleServiceName; const OUString sRowStyleServiceName; @@ -156,19 +152,18 @@ protected: sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , const OUString& rLName , - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bAutoStyles ); virtual ~XMLTableStylesContext(); @@ -176,8 +171,7 @@ public: virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const override; - virtual ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > + virtual css::uno::Reference< css::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const override; virtual OUString GetServiceName( sal_uInt16 nFamily ) const override; @@ -189,13 +183,11 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; @@ -204,8 +196,7 @@ public: ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList); virtual ~ScXMLMasterStylesContext(); virtual void EndElement() override; @@ -217,7 +208,7 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; + css::uno::Reference<css::beans::XPropertySet> xPropSet; bool bContainsRightHeader; bool bContainsRightFooter; @@ -228,20 +219,19 @@ public: ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); virtual ~ScMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, const bool bFirst ) override; @@ -259,16 +249,14 @@ class ScCellTextStyleContext : public XMLTextStyleContext public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~ScCellTextStyleContext(); // override FillPropertySet to store style information virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; }; #endif diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 89d6d55c6e90..5ee58283bbc8 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -54,10 +54,10 @@ private: ScMyOLEFixer aFixupOLEs; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > xCurrentSheet; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; - ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; + css::uno::Reference< css::sheet::XSpreadsheet > xCurrentSheet; + css::uno::Reference< css::table::XCellRange > xCurrentCellRange; + css::uno::Reference< css::drawing::XDrawPage > xDrawPage; + css::uno::Reference < css::drawing::XShapes > xShapes; OUString sCurrentSheetName; ScAddress maCurrentCellPos; ScRangeList maMatrixRangeList; @@ -76,25 +76,25 @@ public: void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } - static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) + static bool IsOLE(css::uno::Reference< css::drawing::XShape >& rShape) { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; void AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - OUString GetCurrentSheetName() const { return sCurrentSheetName; } + OUString GetCurrentSheetName() const { return sCurrentSheetName; } SCTAB GetCurrentSheet() const { return (maCurrentCellPos.Tab() >= 0) ? maCurrentCellPos.Tab() : 0; } SCCOL GetCurrentColCount() const { return std::min<sal_Int32>(nCurrentColCount, MAXCOL); } SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > GetCurrentXSheet() const { return xCurrentSheet; } - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > GetCurrentXDrawPage(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > GetCurrentXShapes(); bool HasDrawPage(); bool HasXShapes(); - void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + void AddOLE(css::uno::Reference <css::drawing::XShape>& rShape, const OUString &rRangeList); void AddMatrixRange( const SCCOL nStartColumn, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index fb8ea43bba95..fa7d491335d8 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -138,8 +138,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), nStartOffset(-1), bStartFormPage(false), @@ -221,8 +220,7 @@ ScXMLTableContext::~ScXMLTableContext() SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { const SvXMLTokenMap& rTokenMap(GetScImport().GetTableElemTokenMap()); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLName); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 6217427ec0ad..c92309a85a2c 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -52,15 +52,13 @@ public: ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; @@ -72,15 +70,13 @@ class ScXMLTableProtectionContext : public SvXMLImportContext public: ScXMLTableProtectionContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableProtectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 77afa8384287..7d9e8716b921 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -329,20 +329,19 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError ) /** property map for export info set */ comphelper::PropertyMapEntry const aImportInfoMap[] = { - { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("NumberStyles"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PrivateData"), 0, cppu::UnoType<uno::XInterface>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("VBACompatibilityMode"), 0, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ScriptConfiguration"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("OrganizerMode"), 0, cppu::UnoType<bool>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("NumberStyles"), 0, cppu::UnoType<container::XNameAccess>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("PrivateData"), 0, cppu::UnoType<uno::XInterface>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("VBACompatibilityMode"), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ScriptConfiguration"), 0, cppu::UnoType<container::XNameAccess>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("OrganizerMode"), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(SC_UNO_ODS_LOCK_SOLAR_MUTEX), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(SC_UNO_ODS_IMPORT_STYLES), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -770,17 +769,17 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) /** property map for export info set */ comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("WrittenNumberStyles"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StyleNames"), 0, cppu::UnoType<uno::Sequence<OUString>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StyleFamilies"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("WrittenNumberStyles"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StyleNames"), 0, cppu::UnoType<uno::Sequence<OUString>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StyleFamilies"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 337d91b531f1..e50345fc7b29 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -509,8 +509,8 @@ static OUString ReplaceFourChar(const OUString& oldOUString) } uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -543,7 +543,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() } // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero. -uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 8cb2ab1b5bbc..b8d6f63d8084 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -316,7 +316,7 @@ bool ScAccessibleCellBase::IsEditable( } OUString SAL_CALL ScAccessibleCellBase::GetNote() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); @@ -365,7 +365,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote() #include <com/sun/star/table/ShadowFormat.hpp> OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -448,7 +448,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() #include <com/sun/star/table/BorderLine.hpp> OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -598,7 +598,7 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() //end of cell attributes OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString strNote; OUString strTrackText; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index d28c3ddeb933..5fb03c99b8fd 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -434,7 +434,7 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) } Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) + const css::uno::Sequence< OUString >& /* aRequestedAttributes */ ) throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -702,7 +702,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s // XInterface ----------------------------------------------------------------- -Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const ::com::sun::star::uno::Type& rType ) +Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const css::uno::Type& rType ) throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) ); @@ -728,9 +728,9 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) { - Sequence< ::com::sun::star::uno::Type > aSeq( 1 ); + Sequence< css::uno::Type > aSeq( 1 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } @@ -1191,7 +1191,7 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC // XInterface ----------------------------------------------------------------- -Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const ::com::sun::star::uno::Type& rType ) +Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType ) throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) ); @@ -1217,9 +1217,9 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) { - Sequence< ::com::sun::star::uno::Type > aSeq( 2 ); + Sequence< css::uno::Type > aSeq( 2 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get(); aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 6efa9389e3ff..4b01f4311f9e 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -110,7 +110,7 @@ struct ScAccessibleShapeData ~ScAccessibleShapeData(); mutable rtl::Reference< ::accessibility::AccessibleShape > pAccShape; mutable ScAddress* pRelationCell; // if it is NULL this shape is anchored on the table - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape; + css::uno::Reference< css::drawing::XShape > xShape; mutable bool bSelected; bool bSelectable; }; @@ -263,19 +263,17 @@ public: virtual bool ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel - (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetAccessibleCaption (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) + throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::accessibility::XAccessible> + GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException) override; ///===== Internal ======================================================== void SetDrawBroadcaster(); @@ -287,7 +285,7 @@ public: // gets the index of the shape starting on 0 (without the index of the table) // returns the selected shape bool IsSelected(sal_Int32 nIndex, - com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape) const; + css::uno::Reference<css::drawing::XShape>& rShape) const; bool SelectionChanged(); @@ -309,7 +307,7 @@ private: mutable SortedShapes maZOrderedShapes; // a null pointer represents the sheet in the correct order mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo; - mutable com::sun::star::uno::Reference<com::sun::star::view::XSelectionSupplier> xSelectionSupplier; + mutable css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier; mutable size_t mnSdrObjCount; mutable sal_uInt32 mnShapesSelected; ScTabViewShell* mpViewShell; @@ -317,7 +315,7 @@ private: ScSplitPos meSplitPos; void FillShapes(std::vector < uno::Reference < drawing::XShape > >& rShapes) const; - bool FindSelectedShapesChanges(const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& xShapes, bool bCommitChange) const; + bool FindSelectedShapesChanges(const css::uno::Reference<css::drawing::XShapes>& xShapes, bool bCommitChange) const; void FillSelectionSupplier() const; ScAddress* GetAnchor(const uno::Reference<drawing::XShape>& xShape) const; @@ -449,7 +447,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint) } bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo) throw (uno::RuntimeException) { @@ -494,7 +492,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC return bResult; } -::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException) +::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -514,9 +512,9 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC return NULL; } -::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > -ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) +css::uno::Reference < css::accessibility::XAccessible > +ScChildrenShapes::GetAccessibleCaption (const css::uno::Reference < css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -524,7 +522,7 @@ ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference < ScAccessibleShapeData* pShape = maZOrderedShapes[index]; if (pShape && pShape->xShape == xShape ) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pShape->pAccShape.get() ); + css::uno::Reference< css::accessibility::XAccessible > xNewChild( pShape->pAccShape.get() ); if(xNewChild.get()) return xNewChild; } @@ -1695,11 +1693,11 @@ uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType { uno::Any aAnyTmp; if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get()) - { - com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this; - aAnyTmp <<= AccFromXShape; + { + css::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this; + aAnyTmp <<= AccFromXShape; return aAnyTmp; - } + } uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); } @@ -1852,7 +1850,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessibleDocument::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2320,7 +2318,7 @@ ScAddress ScAccessibleDocument::GetCurCellAddress() const } uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2347,7 +2345,7 @@ uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() return anyAtrribute; } -com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence() +css::uno::Sequence< css::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence() { if ( getAccessibleChildCount() ) { @@ -2395,9 +2393,9 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: return aEmpty; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL ScAccessibleDocument::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< css::uno::Any > + SAL_CALL ScAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -2405,7 +2403,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: const sal_Int32 FINDREPLACEFLOWTO = 2; if ( nType == SPELLCHECKFLOWTO ) { - uno::Reference< ::com::sun::star::drawing::XShape > xShape; + uno::Reference< css::drawing::XShape > xShape; rAny >>= xShape; if ( xShape.is() ) { @@ -2451,9 +2449,9 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: uno::Reference < XAccessible > xChildSel = xAccChildSelection->getSelectedAccessibleChild( 0 ); if ( xChildSel.is() ) { - uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > xChildSelContext( xChildSel->getAccessibleContext() ); + uno::Reference < css::accessibility::XAccessibleContext > xChildSelContext( xChildSel->getAccessibleContext() ); if ( xChildSelContext.is() && - xChildSelContext->getAccessibleRole() == ::com::sun::star::accessibility::AccessibleRole::PARAGRAPH ) + xChildSelContext->getAccessibleRole() == css::accessibility::AccessibleRole::PARAGRAPH ) { uno::Sequence<uno::Any> aRet( 1 ); aRet[0] = uno::makeAny( xChildSel ); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index a2c06dc0049e..1e88efead19b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -572,7 +572,7 @@ struct ScShapeChild ScShapeChild(const ScShapeChild& rOld); ~ScShapeChild(); mutable rtl::Reference< ::accessibility::AccessibleShape > mpAccShape; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; sal_Int32 mnRangeId; }; @@ -631,10 +631,10 @@ public: virtual bool ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; ///===== Internal ======================================================== @@ -836,7 +836,7 @@ void ScShapeChildren::VisAreaChanged() const ///===== IAccessibleParent ============================================== bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /* _rxShape */, + const css::uno::Reference< css::drawing::XShape >& /* _rxShape */, const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */) throw (uno::RuntimeException) { @@ -1627,7 +1627,7 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() } OUString ScAccessibleDocumentPagePreview::getAccessibleName() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index f0dc5ef604a3..5d9cdfda931d 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -127,14 +127,14 @@ void ScAccessibleEditObject::GotFocus() //===== XInterface ========================================================== -com::sun::star::uno::Any SAL_CALL - ScAccessibleEditObject::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + ScAccessibleEditObject::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); + css::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, - static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this) + static_cast< css::accessibility::XAccessibleSelection* >(this) ); return aReturn; } @@ -397,13 +397,13 @@ void ScAccessibleEditObject::CreateTextHelper() } sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CCOLOR)); } sal_Int32 SAL_CALL ScAccessibleEditObject::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CELLBACK)); } @@ -464,7 +464,7 @@ throw ( IndexOutOfBoundsException, { if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleText > + uno::Reference< css::accessibility::XAccessibleText > xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index cefd8621a1f0..2cb914dfed5a 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -94,7 +94,7 @@ ScAccessibleFilterMenu::~ScAccessibleFilterMenu() // XAccessibleComponent -Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /*rPoint*/ ) +Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const css::awt::Point& /*rPoint*/ ) throw (RuntimeException, std::exception) { return this; @@ -160,18 +160,16 @@ OUString ScAccessibleFilterMenu::getImplementationName() // XAccessibleEventBroadcaster void ScAccessibleFilterMenu::addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::addAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true)); } void ScAccessibleFilterMenu::removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) + throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::removeAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false)); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 2a72f783073e..72ce834e4f78 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -82,8 +82,7 @@ struct Dispose } }; -ScAccessiblePageHeader::ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePageHeader::ScAccessiblePageHeader( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, bHeader ? AccessibleRole::HEADER : AccessibleRole::FOOTER ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index d1d83b9a98c2..d22ddfdd6acb 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -261,7 +261,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() } Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) @@ -278,7 +278,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const } Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 810befd1f879..54c2a246855c 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -46,9 +46,9 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewCell::ScAccessiblePreviewCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - ScPreviewShell* pViewShell, /* const */ ScAddress& rCellAddress, +ScAccessiblePreviewCell::ScAccessiblePreviewCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + ScPreviewShell* pViewShell, + /* const */ ScAddress& rCellAddress, sal_Int32 nIndex ) : ScAccessibleCellBase( rxParent, ( pViewShell ? &pViewShell->GetDocument() : NULL ), rCellAddress, nIndex ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 4fd177c0431d..5701e538bb88 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -77,8 +77,7 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, sal_Int32 nIndex ) : diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index c63bf05e2eed..947b988d81fd 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -46,8 +46,7 @@ using namespace ::com::sun::star::accessibility; //===== internal ============================================================ -ScAccessiblePreviewTable::ScAccessiblePreviewTable( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, +ScAccessiblePreviewTable::ScAccessiblePreviewTable( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, sal_Int32 nIndex ) : ScAccessibleContextBase( rxParent, AccessibleRole::TABLE ), mpViewShell( pViewShell ), diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 7744dda8cde6..8c85c4518c6d 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -472,14 +472,14 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint sal_uInt16 nTab = rViewData.GetTabNo(); ScRange aMarkRange; refScMarkData.GetMarkArea(aMarkRange); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); //Mark All if ( !bNewPosCellFocus && (bNewMarked || bIsMark || bIsMultMark ) && aMarkRange == ScRange( 0,0,nTab, MAXCOL,MAXROW,nTab ) ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); return ; } @@ -511,7 +511,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if( !bSelSmaller ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } m_aLastWithInMarkRange = aMarkRange; @@ -569,7 +569,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint if(CalcScRangeListDifferenceMax(mpMarkedRanges,&m_LastMarkedRanges,10,vecNew)) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } else @@ -725,7 +725,7 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData) { AccessibleEventObject aEvent; aEvent.Source = uno::Reference< XAccessible >(this); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); MAP_ADDR_XACC::iterator miRemove = m_mapSelectionSend.begin(); for(; miRemove != m_mapSelectionSend.end() ;) { @@ -1002,7 +1002,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP try { xAccessible = getAccessibleCellAt(nY, nX); } - catch(const ::com::sun::star::lang::IndexOutOfBoundsException &) + catch(const css::lang::IndexOutOfBoundsException &) { return NULL; } @@ -1039,7 +1039,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = NULL; if(mpAccDoc) @@ -1619,7 +1619,7 @@ void ScAccessibleSpreadsheet::NotifyRefMode() if ( nNewSize > 10 ) { aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN; - aEvent.NewValue <<= ::com::sun::star::uno::Any(); + aEvent.NewValue <<= css::uno::Any(); CommitChange(aEvent); } else @@ -1655,7 +1655,7 @@ void ScAccessibleSpreadsheet::RemoveFormulaSelection(bool bRemoveAll ) { AccessibleEventObject aEvent; aEvent.Source = uno::Reference< XAccessible >(this); - aEvent.OldValue <<= ::com::sun::star::uno::Any(); + aEvent.OldValue <<= css::uno::Any(); MAP_ADDR_XACC::iterator miRemove = m_mapFormulaSelectionSend.begin(); for(; miRemove != m_mapFormulaSelectionSend.end() ;) { diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 53bcf60cf887..8d28ef2ba354 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -448,7 +448,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c } bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& /* rFlavor */ ) + const css::datatransfer::DataFlavor& /* rFlavor */ ) { // called from SetObject, put data into stream @@ -486,7 +486,7 @@ bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi } { - com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) ); + css::uno::Reference<css::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) ); if( SvxDrawingLayerExport( pDrawModel, xDocOut ) ) rxOStm->Commit(); } @@ -776,12 +776,12 @@ namespace class theScDrawTransferObjUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScDrawTransferObjUnoTunnelId > {}; } -const com::sun::star::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() { return theScDrawTransferObjUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 9d5567df845b..56ccb3623d6a 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -703,13 +703,13 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) // Language is set separately, so the speller is needed only if online spelling is active if ( bOnlineSpell ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); + css::uno::Reference<css::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); pEngine->SetSpeller( xXSpellChecker1 ); } bool bHyphen = pLastPattern && static_cast<const SfxBoolItem&>(pLastPattern->GetItem(ATTR_HYPHENATE)).GetValue(); if ( bHyphen ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index ae0554381779..f50615cbd6df 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1109,12 +1109,12 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( pViewFrm ) { - Reference< com::sun::star::beans::XPropertySet > xPropSet( pViewFrm->GetFrame().GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( pViewFrm->GetFrame().GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } @@ -2023,7 +2023,7 @@ void ScTextWnd::ImplInitSettings() Invalidate(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScTextWnd::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible() { return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, OUString(ScResId(STR_ACC_EDITLINE_NAME)), diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index c1ba649ad4e2..37ac39c0f8fd 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -277,7 +277,7 @@ void ScDLL::Init() // Add 3DObject Factory E3dObjFactory(); - // Add ::com::sun::star::form::component::FormObject Factory + // Add css::form::component::FormObject Factory FmFormObjFactory(); pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<sal_uInt16>(pMod->GetAppOptions().GetAppMetric()) ) ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 833eaeef18ca..72982730cc0b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -551,7 +551,7 @@ void ScModule::Execute( SfxRequest& rReq ) css::uno::Reference < css::ui::dialogs::XExecutableDialog > xDialog = css::ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext()); xDialog->execute(); } - catch( ::com::sun::star::uno::RuntimeException& ) + catch( css::uno::RuntimeException& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -2256,9 +2256,9 @@ void ScModule::GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal SvtLinguOptions aOptions; aConfig.GetOptions( aOptions ); - rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN); - rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN); - rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX); + rDefLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, css::i18n::ScriptType::LATIN); + rCjkLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN); + rCtlLang = MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX); rAutoSpell = aOptions.bIsSpellAuto; } diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index f137e6562e8c..15ac5ad51f87 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -837,12 +837,12 @@ namespace class theScTransferUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScTransferUnoTunnelId> {}; } -const com::sun::star::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() +const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() { return theScTransferUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScTransferObj::getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 9a7998849075..0ffeb65b9061 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -177,10 +177,10 @@ SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const return new ScSortItem( *this ); } -bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const +bool ScSortItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion - rVal = com::sun::star::uno::Any(); + rVal = css::uno::Any(); return true; } @@ -312,10 +312,10 @@ SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const return new ScSubTotalItem( *this ); } -bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const +bool ScSubTotalItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion - rVal = com::sun::star::uno::Any(); + rVal = css::uno::Any(); return true; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 9fd856a41e90..b4881436ded6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -495,7 +495,7 @@ sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const return pDlg->GetFuncMask(); } -::com::sun::star::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const +css::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const { return pDlg->GetFieldRef(); } @@ -663,7 +663,7 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo } AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices, + const css::uno::Sequence<OUString>& rServices, int nId ) { VclPtr<ScDataPilotServiceDlg> pDlg; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 491514e8d229..75f73d39fcc4 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -293,7 +293,7 @@ class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg { DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg) virtual sal_uInt16 GetFuncMask() const override; - virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const override; + virtual css::sheet::DataPilotFieldReference GetFieldRef() const override; }; class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg @@ -417,7 +417,7 @@ public: bool bEnableExternal) override; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices, + const css::uno::Sequence<OUString>& rServices, int nId ) override; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) override; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 79d4b92b2b1e..db81464a9850 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -84,8 +84,8 @@ VclPtr<vcl::Window> ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. VclPtrInstance<ScZoomSliderWnd> pSlider( pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >( m_xFrame->getController(), - ::com::sun::star::uno::UNO_QUERY ), m_xFrame, 100 ); + css::uno::Reference< css::frame::XDispatchProvider >( m_xFrame->getController(), + css::uno::UNO_QUERY ), m_xFrame, 100 ); return pSlider.get(); } @@ -216,8 +216,10 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): +ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, + const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, + const css::uno::Reference< css::frame::XFrame >& _xFrame, + sal_uInt16 nCurrentZoom ): Window( pParent ), mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ), aLogicalSize( 115, 40 ), @@ -286,10 +288,10 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); - ::com::sun::star::uno::Any a; + css::uno::Any a; aZoomSliderItem.QueryValue( a ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; @@ -324,10 +326,10 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) // commit state change SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); - ::com::sun::star::uno::Any a; + css::uno::Any a; aZoomSliderItem.QueryValue( a ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "ScalingFactor"; aArgs[0].Value = a; @@ -351,7 +353,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) mpImpl->mnMaxZoom >= mpImpl->mnCurrentZoom && mpImpl->mnMaxZoom > mpImpl->mnSliderCenter, "Looks like the zoom slider item is corrupted" ); - const com::sun::star::uno::Sequence < sal_Int32 > rSnappingPoints = pZoomSliderItem->GetSnappingPoints(); + const css::uno::Sequence < sal_Int32 > rSnappingPoints = pZoomSliderItem->GetSnappingPoints(); mpImpl->maSnappingPointOffsets.clear(); mpImpl->maSnappingPointZooms.clear(); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e28d4284a880..8db25e49938f 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -33,13 +33,13 @@ namespace { /** Date part flags in order of the list box entries. */ static const sal_Int32 spnDateParts[] = { - com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS, - com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES, - com::sun::star::sheet::DataPilotFieldGroupBy::HOURS, - com::sun::star::sheet::DataPilotFieldGroupBy::DAYS, - com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS, - com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS, - com::sun::star::sheet::DataPilotFieldGroupBy::YEARS + css::sheet::DataPilotFieldGroupBy::SECONDS, + css::sheet::DataPilotFieldGroupBy::MINUTES, + css::sheet::DataPilotFieldGroupBy::HOURS, + css::sheet::DataPilotFieldGroupBy::DAYS, + css::sheet::DataPilotFieldGroupBy::MONTHS, + css::sheet::DataPilotFieldGroupBy::QUARTERS, + css::sheet::DataPilotFieldGroupBy::YEARS }; static const sal_uInt16 nDatePartResIds[] = @@ -238,7 +238,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, maEndHelper.SetValue( rInfo.mbAutoEnd, rInfo.mfEnd ); if( nDatePart == 0 ) - nDatePart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS; + nDatePart = css::sheet::DataPilotFieldGroupBy::MONTHS; for( size_t nIdx = 0; nIdx < nCount; ++nIdx ) mpLbUnits->CheckEntryPos( static_cast< sal_uInt16 >( nIdx ), (nDatePart & spnDateParts[ nIdx ]) != 0 ); @@ -321,7 +321,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const { // return DAYS for special "number of days" mode if( mpRbNumDays->IsChecked() ) - return com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; + return css::sheet::DataPilotFieldGroupBy::DAYS; // return listbox contents for "units" mode sal_Int32 nDatePart = 0; diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 5adb2108a3bd..df1829fcbf8d 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -101,7 +101,7 @@ void ScAreaLink::Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& /* rEn } ::sfx2::SvBaseLink::UpdateResult ScAreaLink::DataChanged( - const OUString&, const ::com::sun::star::uno::Any& ) + const OUString&, const css::uno::Any& ) { // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im // LinkManager zu setzen, ohne die Daten im Dokument zu aendern diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 81c3555e1369..0fb15fdce41c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -431,7 +431,7 @@ void processDataStream( ScDocShell& rShell, const sc::ImportPostProcessData& rDa } -bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor ) +bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css::embed::XStorage >& xStor ) { LoadMediumGuard aLoadGuard(&aDocument); @@ -513,7 +513,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R return bRet; } -bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor ) +bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const css::uno::Reference< css::embed::XStorage >& xStor ) { aDocument.EnableIdle(false); @@ -569,7 +569,7 @@ bool ScDocShell::Load( SfxMedium& rMedium ) if (GetMedium()) { const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; } { @@ -984,7 +984,7 @@ bool ScDocShell::LoadFrom( SfxMedium& rMedium ) if (GetMedium()) { const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; } // until loading/saving only the styles in XML is implemented, @@ -1053,7 +1053,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) rMedium.GetPhysicalName(); //! Call CreateFileStream directly, if available const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); - nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; + nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; const SfxFilter* pFilter = rMedium.GetFilter(); if (pFilter) @@ -2646,7 +2646,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : bDocumentModifiedPending( false ), bUpdateEnabled ( true ), nDocumentLock ( 0 ), - nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( NULL ), pDocHelper ( NULL ), pAutoStyleList ( NULL ), @@ -2691,7 +2691,7 @@ ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags ) : bDocumentModifiedPending( false ), bUpdateEnabled ( true ), nDocumentLock ( 0 ), - nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), + nCanUpdate (css::document::UpdateDocMode::ACCORDING_TO_CONFIG), pOldAutoDBRange ( NULL ), pDocHelper ( NULL ), pAutoStyleList ( NULL ), @@ -3157,13 +3157,13 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) // when password protection is applied change tracking must always be active SetChangeRecording( true ); - ::com::sun::star::uno::Sequence< sal_Int8 > aProtectionHash; + css::uno::Sequence< sal_Int8 > aProtectionHash; SvPasswordHelper::GetHashPassword( aProtectionHash, rNewPassword ); pChangeTrack->SetProtection( aProtectionHash ); } else { - pChangeTrack->SetProtection( ::com::sun::star::uno::Sequence< sal_Int8 >() ); + pChangeTrack->SetProtection( css::uno::Sequence< sal_Int8 >() ); } bRes = true; @@ -3177,7 +3177,7 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } -bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) +bool ScDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index d93d7d6b1cab..91e064a24636 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -418,9 +418,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) nSet=aAppOptions.GetLinkMode(); } - if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE) + if (nCanUpdate == css::document::UpdateDocMode::NO_UPDATE) nSet = LM_NEVER; - else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE) + else if (nCanUpdate == css::document::UpdateDocMode::FULL_UPDATE) nSet = LM_ALWAYS; if (nSet == LM_ALWAYS @@ -480,8 +480,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) bool bDone = false; ScDBCollection* pDBColl = aDocument.GetDBCollection(); - if ((nCanUpdate != com::sun::star::document::UpdateDocMode::NO_UPDATE) && - (nCanUpdate != com::sun::star::document::UpdateDocMode::QUIET_UPDATE)) + if ((nCanUpdate != css::document::UpdateDocMode::NO_UPDATE) && + (nCanUpdate != css::document::UpdateDocMode::QUIET_UPDATE)) { ScRange aRange; ScTabViewShell* pViewSh = GetBestViewShell(); @@ -1173,7 +1173,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus bDone = true; else pChangeTrack->SetProtection( - com::sun::star::uno::Sequence< sal_Int8 > (0) ); + css::uno::Sequence< sal_Int8 > (0) ); } else { @@ -1184,7 +1184,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus } else { - com::sun::star::uno::Sequence< sal_Int8 > aPass; + css::uno::Sequence< sal_Int8 > aPass; SvPasswordHelper::GetHashPassword( aPass, aPassword ); pChangeTrack->SetProtection( aPass ); } @@ -2090,7 +2090,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, #if defined WNT bool ScDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) + css::uno::Any & rValue ) { if( SotClipboardFormatId::STRING == SotExchange::GetFormatIdFromMimeType( rMimeType ) ) { @@ -2098,7 +2098,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, { OString aFmtByte(OUStringToOString(aDdeTextFmt, osl_getThreadTextEncoding())); - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aFmtByte.getStr()), aFmtByte.getLength() + 1 ); return true; @@ -2116,7 +2116,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, if( aObj.ExportByteString( aData, osl_getThreadTextEncoding(), SotClipboardFormatId::SYLK ) ) { - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aData.getStr()), aData.getLength() + 1 ); return true; @@ -2138,7 +2138,7 @@ bool ScDocShell::DdeGetData( const OUString& rItem, bool ScDocShell::DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) + const css::uno::Any & rValue ) { if( SotClipboardFormatId::STRING == SotExchange::GetFormatIdFromMimeType( rMimeType )) { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e96f182b0c6f..6150dabfeac1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -943,7 +943,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec Reference< XNameContainer > xLib; if( xLibContainer.is() ) { - com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName ); + css::uno::Any aLibAny = xLibContainer->getByName( aLibName ); aLibAny >>= xLib; } if( xLib.is() ) @@ -951,7 +951,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec xLib->getByName( sSrcCodeName ) >>= sSource; } } - catch ( const com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource ); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1e6f46ce5e05..04654b36ba69 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -473,7 +473,7 @@ void ScDocShell::SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoadi { // switch native symbols to English. ScCompiler aComp(NULL, ScAddress()); - ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH); + ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(css::sheet::FormulaLanguage::ENGLISH); ScCompiler::SetNativeSymbols(xMap); } else diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 5813bd2b9ec9..3d877f6edb12 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -170,15 +170,15 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& try { ::ucbhelper::Content aDestPath( aDestPathObj.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); + uno::Reference< css::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); OUString aTransferName = "transfer"; if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( - ::com::sun::star::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::NO_DECODE), aName, - ::com::sun::star::ucb::NameClash::ERROR ) ) ); + css::ucb::TransferInfo( bMoveData, rSourceObj.GetMainURL(INetURLObject::NO_DECODE), aName, + css::ucb::NameClash::ERROR ) ) ); } else { @@ -203,7 +203,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString( "delete" ), comphelper::makeBoolAny( true ) ); @@ -223,7 +223,7 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); bRet = aCnt.isDocument(); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 01c8d6d9723f..7089b0786381 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -255,14 +255,14 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } bool ScImportExport::ImportData( const OUString& /* rMimeType */, - const ::com::sun::star::uno::Any & /* rValue */ ) + const css::uno::Any & /* rValue */ ) { OSL_ENSURE( false, "Implementation is missing" ); return false; } bool ScImportExport::ExportData( const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) + css::uno::Any & rValue ) { SvMemoryStream aStrm; // mba: no BaseURL for data exchange @@ -270,7 +270,7 @@ bool ScImportExport::ExportData( const OUString& rMimeType, SotExchange::GetFormatIdFromMimeType( rMimeType ) )) { aStrm.WriteUChar( 0 ); - rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rValue <<= css::uno::Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aStrm.GetData()), aStrm.Seek( STREAM_SEEK_TO_END ) ); return true; diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 0470b7cd79b2..fee703f749c7 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -99,7 +99,7 @@ ScMacroManager::~ScMacroManager() { } -typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; +typedef ::cppu::WeakImplHelper< css::container::XContainerListener > ContainerListenerHelper; class VBAProjectListener : public ContainerListenerHelper { diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 4e2d7a32baeb..be22512cb0fb 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -132,7 +132,7 @@ void ScServerObject::EndListeningAll() } bool ScServerObject::GetData( - ::com::sun::star::uno::Any & rData /*out param*/, + css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool /* bSynchron */ ) { if (!pDocSh) @@ -173,7 +173,7 @@ bool ScServerObject::GetData( OString aByteData; if( aObj.ExportByteString( aByteData, osl_getThreadTextEncoding(), SotClipboardFormatId::SYLK ) ) { - rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >( + rData <<= css::uno::Sequence< sal_Int8 >( reinterpret_cast<const sal_Int8*>(aByteData.getStr()), aByteData.getLength() + 1 ); return true; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index fc2846680478..cfe790a21ee0 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -120,7 +120,7 @@ void ScTableLink::Edit( vcl::Window* pParent, const Link<SvBaseLink&,void>& rEnd } ::sfx2::SvBaseLink::UpdateResult ScTableLink::DataChanged( - const OUString&, const ::com::sun::star::uno::Any& ) + const OUString&, const css::uno::Any& ) { sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument().GetLinkManager(); if (pLinkManager!=NULL) diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index dd8303e809e8..2a302f4c4864 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -92,7 +92,7 @@ static void lcl_setModified( SfxObjectShell* pShell ) { if ( pShell ) { - com::sun::star::uno::Reference< com::sun::star::util::XModifiable > xModif( pShell->GetModel(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XModifiable > xModif( pShell->GetModel(), css::uno::UNO_QUERY ); if ( xModif.is() ) xModif->setModified( sal_True ); } @@ -341,7 +341,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ) aNamesItem.AddEvent( ScResId(RID_SCSTR_ONCLICK), OUString(), SFX_EVENT_MOUSECLICK_OBJECT ); pItemSet->Put( aNamesItem, SID_EVENTCONFIG ); - com::sun::star::uno::Reference < com::sun::star::frame::XFrame > xFrame; + css::uno::Reference < css::frame::XFrame > xFrame; if (GetViewShell()) xFrame = GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 4c2c62e7ddb7..1b07ca88bd57 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1140,7 +1140,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) bLeftToRight = false; } else - bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; + bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == css::text::WritingMode_LR_TB; if ( bDisableVerticalText ) { diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 223b2b7227f5..7942caf032d6 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -94,7 +94,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) SfxItemSet aAttr( pView->GetModel()->GetItemPool(), SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, 0 ); aAttr.Put( SvxWritingModeItem( nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? - com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL, + css::text::WritingMode_LR_TB : css::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); pView->SetAttributes( aAttr ); pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6a5338681f64..7aad2937845d 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -123,7 +123,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie { // connect to Calc data (if no range string, leave chart alone, with its own data) - uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; + uno::Reference< css::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); @@ -494,7 +494,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV uno::Reference < embed::XEmbeddedObject > xObj = pViewShell->GetObjectShell()->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID_60 ).GetByteSequence(), aName ); - uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; + uno::Reference< css::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index a464473e53f8..8f00c253d26c 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -96,7 +96,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) { // use hyphenator only if hyphenation attribute is set if ( pObj && static_cast<const SfxBoolItem&>(pObj->GetMergedItem(EE_PARA_HYPHENATE)).GetValue() ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xHyphenator( LinguMgr::GetHyphenator() ); rOutliner.SetHyphenator( xHyphenator ); } } diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 165a96806c7e..1b6df14fbd61 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -36,21 +36,21 @@ class ScAccWinFocusLostHint : public SfxHint { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xOldAccessible; public: ScAccWinFocusLostHint( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); + const css::uno::Reference< css::uno::XInterface >& xOld ); virtual ~ScAccWinFocusLostHint(); }; class ScAccWinFocusGotHint : public SfxHint { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xNewAccessible; public: ScAccWinFocusGotHint( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); + const css::uno::Reference< css::uno::XInterface >& xNew ); virtual ~ScAccWinFocusGotHint(); }; @@ -59,7 +59,7 @@ class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint ScSplitPos eOldGridWin; public: ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); + const css::uno::Reference< css::uno::XInterface >& xOld ); virtual ~ScAccGridWinFocusLostHint(); ScSplitPos GetOldGridWin() const { return eOldGridWin; } @@ -70,7 +70,7 @@ class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint ScSplitPos eNewGridWin; public: ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); + const css::uno::Reference< css::uno::XInterface >& xNew ); virtual ~ScAccGridWinFocusGotHint(); ScSplitPos GetNewGridWin() const { return eNewGridWin; } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 0006aa8d2af3..ed58ccc6e0ee 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -33,7 +33,7 @@ class ScTabViewShell; class ScAccessibleDocument; -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleExtendedAttributes> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleExtendedAttributes> ScAccessibleCellAttributeImpl; /** @descr @@ -47,8 +47,7 @@ class ScAccessibleCell { public: static rtl::Reference<ScAccessibleCell> create( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScAddress& rCellAddress, sal_Int32 nIndex, @@ -57,8 +56,7 @@ public: private: ScAccessibleCell( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScAddress& rCellAddress, sal_Int32 nIndex, @@ -86,22 +84,21 @@ public: ///===== 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; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -110,25 +107,25 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// Return the set of current states. - 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 ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -136,22 +133,22 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // Override this method to handle cell's ParaIndent attribute specially. - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccDoc; @@ -159,14 +156,11 @@ private: ScSplitPos meSplitPos; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsSelected(); static ScDocument* GetDocument(ScTabViewShell* mpViewShell); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index c0074270bed7..558aea6fab0b 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <cppuhelper/implbase1.hxx> -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue> ScAccessibleCellBaseImpl; class ScAccessibleCellBase @@ -36,8 +36,7 @@ class ScAccessibleCellBase public: //===== internal ======================================================== ScAccessibleCellBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, sal_Int32 nIndex); @@ -46,13 +45,13 @@ protected: public: virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (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; @@ -61,48 +60,48 @@ public: ///===== XAccessibleComponent ============================================ 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 ============================================== /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getCurrentValue() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + setCurrentValue( const css::uno::Any& aNumber ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -110,20 +109,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: ScAddress maCellAddress; @@ -134,18 +133,17 @@ protected: private: virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); protected: OUString SAL_CALL GetNote() - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); OUString SAL_CALL GetAllDisplayNote() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); OUString SAL_CALL getShadowAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); OUString SAL_CALL getBorderAttrs() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); public: const ScAddress& GetCellAddress() const { return maCellAddress; } }; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 333803693e2d..c1503eee740c 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -49,15 +49,15 @@ class Rectangle; */ typedef cppu::WeakAggComponentImplHelper5< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo > ScAccessibleContextBaseWeakImpl; typedef cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleEventListener + css::accessibility::XAccessibleEventListener > ScAccessibleContextBaseImplEvent; class ScAccessibleContextBase @@ -69,8 +69,7 @@ class ScAccessibleContextBase public: //===== internal ======================================================== ScAccessibleContextBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, const sal_Int16 aRole); virtual void Init(); @@ -80,10 +79,10 @@ protected: public: bool SAL_CALL isShowing( ) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); ///===== SfxListener ===================================================== @@ -91,9 +90,9 @@ public: ///===== 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; @@ -102,98 +101,96 @@ public: ///===== XAccessible ===================================================== /// Return the XAccessibleContext. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) + 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 ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Return a reference to the parent. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the set of current states. - 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; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + throw (css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; ///===== XAccessibleEventBroadcaster ===================================== @@ -202,27 +199,25 @@ public: */ 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; ///===== XAccessibleEventListener ======================================== virtual void SAL_CALL - disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyEvent( - const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::accessibility::AccessibleEventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -230,58 +225,58 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception); public: /// Calls all Listener to tell they the change. void - CommitChange(const com::sun::star::accessibility::AccessibleEventObject& rEvent) const; + CommitChange(const css::accessibility::AccessibleEventObject& rEvent) const; protected: /// Calls all FocusListener to tell they that the focus is gained. @@ -293,7 +288,7 @@ protected: bool IsDefunc() const { return rBHelper.bDisposed; } void IsObjectValid() const - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); /// Use this method to set initial Name without notification void SetName(const OUString& rName) { msName = rName; } @@ -301,8 +296,7 @@ protected: void SetDescription(const OUString& rDesc) { msDescription = rDesc; } /// Reference to the parent object. - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference<css::accessibility::XAccessible> mxParent; private: /** Description of this object. This is not a constant because it can diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 49c31cbdf1d2..9b8838fc37c9 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -52,16 +52,16 @@ public: virtual void SAL_CALL disposing() override; /** Returns true, if the control is visible. */ - virtual bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override; // XAccessibleComponent --------------------------------------------------- /** Returns the child at the specified point (cell returns NULL). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Sets the focus to this control. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() throw( css::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: @@ -83,22 +83,22 @@ public: // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns whether the object is alive. Must be called with locked mutex. */ inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } /** Throws an exception, if the object is disposed/disposing or any pointer is missing. Should be used with locked mutex! */ - void ensureAlive() const throw( ::com::sun::star::lang::DisposedException ); + void ensureAlive() const throw( css::lang::DisposedException ); /** Returns the VCL control. Assumes a living object. */ ScCsvControl& implGetControl() const; /** Returns the first child of rxParentObj, which has the role nRole. */ static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); @@ -111,9 +111,7 @@ protected: class ScCsvRuler; -typedef ::cppu::ImplHelper1< - ::com::sun::star::accessibility::XAccessibleText > - ScAccessibleCsvRulerImpl; +typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleText > ScAccessibleCsvRulerImpl; /** Accessible class representing the CSV ruler control. */ class ScAccessibleCsvRuler : public ScAccessibleCsvControl, public ScAccessibleCsvRulerImpl @@ -128,90 +126,90 @@ public: // XAccessibleComponent ----------------------------------------------------- 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 ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception (the ruler does not have children). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( 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; /** Returns the relation to the grid control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ 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; // XAccessibleText -------------------------------------------------------- /** Return the position of the caret. */ - virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCaretPosition() throw( css::uno::RuntimeException, std::exception ) override; /** Sets the position of the caret. */ virtual sal_Bool SAL_CALL setCaretPosition( 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; /** Returns the specified character. */ virtual sal_Unicode SAL_CALL getCharacter( 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; /** Returns the attributes of the specified character. */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the screen coordinates of the specified character. */ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( 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; /** Returns the count of characters. */ - virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected text (ruler returns empty string). */ - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the start index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionStart() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the end index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw( css::uno::RuntimeException, std::exception ) override; /** Selects a part of the text (ruler does nothing). */ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the entire text. */ - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified range [Start,End) of the text. */ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the specified text portion. */ - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; /** Copies the specified text range into the clipboard (ruler does nothing). */ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - 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( 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; @@ -221,17 +219,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - 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; /** Returns an implementation ID. */ - 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; // events ----------------------------------------------------------------- public: @@ -242,27 +240,27 @@ public: private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ void ensureValidIndex( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified character position is invalid (outside 0..len). */ void ensureValidIndexWithEnd( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified character range [Start,End) is invalid. @descr If Start>End, swaps Start and End before checking. */ void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Returns the VCL ruler control. Assumes a living object. */ ScCsvRuler& implGetRuler() const; /** Builds the entire string buffer. */ - void constructStringBuffer() throw( ::com::sun::star::uno::RuntimeException ); + void constructStringBuffer() throw( css::uno::RuntimeException ); /** Returns the character count of the text. */ sal_Int32 implGetTextLength() const; @@ -278,16 +276,15 @@ private: class ScCsvGrid; typedef ::cppu::ImplHelper2< - ::com::sun::star::accessibility::XAccessibleTable, - ::com::sun::star::accessibility::XAccessibleSelection > + css::accessibility::XAccessibleTable, + css::accessibility::XAccessibleSelection > ScAccessibleCsvGridImpl; /** Accessible class representing the CSV grid control. */ class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl { protected: - typedef ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > XAccessibleTableRef; + typedef css::uno::Reference< css::accessibility::XAccessibleTable > XAccessibleTableRef; public: explicit ScAccessibleCsvGrid( ScCsvGrid& rGrid ); @@ -297,146 +294,146 @@ public: /** Returns the cell at the specified point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - 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 ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified child cell. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( 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; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ 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; // XAccessibleTable ------------------------------------------------------- /** Returns the number of rows in the table. */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the number of columns in the table. */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the description of the specified row in the table. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the description text of the specified column in the table. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the row headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the column headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected rows as a sequence. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the selected columns as a sequence. */ - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() + throw( css::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified row is selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified column is selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the accessible cell object at the specified position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the caption object of the table. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the summary description object of the table. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns true, if the cell at a specified position is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the child index of the cell at the specified position. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Returns the row index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleRow( 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; /** Returns the column index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( 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; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ 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; /** Returns true, if the specified child is selected. */ 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; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Selects all cells. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the count of selected children. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the child with the specified index in all selected children. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; /** Deselects the child with the specified index in all selected children. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - 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( 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; @@ -446,17 +443,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - 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; /** Returns an implementation ID. */ - 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; // events ----------------------------------------------------------------- public: @@ -473,17 +470,17 @@ public: private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Throws an exception, if nIndex is not a valid child index. */ void ensureValidIndex( sal_Int32 nIndex ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Throws an exception, if the specified position is invalid. */ void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const - throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::lang::IndexOutOfBoundsException ); /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; @@ -542,35 +539,35 @@ public: // XAccessibleComponent --------------------------------------------------- /** Sets the focus to the column of this cell. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() 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 ----------------------------------------------------- /** Returns the child count. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( 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; /** Returns the index of this cell in the table. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ 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; // XInterface ------------------------------------------------------------- @@ -584,22 +581,22 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index b2c208f489b1..70b2c37b6c84 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -44,22 +44,21 @@ namespace utl <code>AccessibleContext</code> service. */ -typedef cppu::ImplHelper3< ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::accessibility::XAccessibleExtendedAttributes, - ::com::sun::star::view::XSelectionChangeListener > +typedef cppu::ImplHelper3< css::accessibility::XAccessibleSelection, + css::accessibility::XAccessibleExtendedAttributes, + css::view::XSelectionChangeListener > ScAccessibleDocumentImpl; class ScAccessibleDocument : public ScAccessibleDocumentBase, public ScAccessibleDocumentImpl, - public com::sun::star::accessibility::XAccessibleGetAccFlowTo, + public css::accessibility::XAccessibleGetAccFlowTo, public accessibility::IAccessibleViewForwarder { public: //===== internal ======================================================== ScAccessibleDocument( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); @@ -83,9 +82,9 @@ public: ///===== 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; @@ -93,81 +92,81 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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; /// Return the set of current states. - 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 getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, 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 nSelectedChildIndex ) - 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; ///===== XSelectionListener ============================================= - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; - 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; ///===== XServiceInfo =================================================== @@ -175,26 +174,26 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== IAccessibleViewForwarder ======================================== @@ -234,28 +233,27 @@ public: utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; - ::com::sun::star::uno::Reference - < ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetAccessibleSpreadsheet(); protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; @@ -263,7 +261,7 @@ private: rtl::Reference<ScAccessibleSpreadsheet> mpAccessibleSpreadsheet; ScChildrenShapes* mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; - com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> mxTempAcc; + css::uno::Reference<css::accessibility::XAccessible> mxTempAcc; Rectangle maVisArea; bool mbCompleteSheetSelected; @@ -276,30 +274,29 @@ private: bool IsTableSelected() const; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); - void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); - void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); + void AddChild(const css::uno::Reference<css::accessibility::XAccessible>& xAcc, bool bFireEvent); + void RemoveChild(const css::uno::Reference<css::accessibility::XAccessible>& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; static OUString GetCurrentCellDescription(); Rectangle GetVisibleArea_Impl() const; - com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence(); + css::uno::Sequence< css::uno::Any > GetScAccFlowToSequence(); public: ScDocument *GetDocument() const ; ScAddress GetCurCellAddress() const; //===== XAccessibleGetAccFromXShape ============================================ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< css::uno::Any > + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + 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; }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 78af5575d62b..607917d126d9 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -28,8 +28,7 @@ class ScAccessibleDocumentBase public: //===== internal ======================================================== ScAccessibleDocumentBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent); + const css::uno::Reference<css::accessibility::XAccessible>& rxParent); protected: virtual ~ScAccessibleDocumentBase(); }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index c982b2252b1a..d72a417d102c 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -38,8 +38,7 @@ class ScAccessibleDocumentPagePreview public: //===== internal ======================================================== ScAccessibleDocumentPagePreview( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell ); protected: virtual ~ScAccessibleDocumentPagePreview(); @@ -57,56 +56,56 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Return the set of current states. - 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 getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== internal ======================================================== @@ -114,22 +113,22 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -140,8 +139,7 @@ private: ScAccessiblePageHeader* mpFooter; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); ScNotesChildren* GetNotesChildren(); ScShapeChildren* GetShapeChildren(); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4cae0a782321..359f1e8bea7e 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -39,7 +39,7 @@ namespace vcl { class Window; } */ class ScAccessibleEditObject : public ScAccessibleContextBase, - public ::com::sun::star::accessibility::XAccessibleSelection + public css::accessibility::XAccessibleSelection { public: enum EditObjectType @@ -50,8 +50,7 @@ public: }; ScAccessibleEditObject( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType); @@ -70,28 +69,28 @@ public: void GotFocus(); ///===== 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; ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -100,56 +99,56 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// Return the set of current states. - 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; //===== 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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - 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 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleEventBroadcaster ===================================== @@ -159,16 +158,14 @@ public: */ 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; ///===== XServiceInfo ==================================================== @@ -176,15 +173,15 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: accessibility::AccessibleTextHelper* mpTextHelper; @@ -194,8 +191,7 @@ private: bool mbHasFocus; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); ScDocument *m_pScDoc; @@ -203,10 +199,10 @@ private: ///===== XAccessibleComponent ============================================ 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; sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 01eebff0b94c..86877e1d55cf 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -31,8 +31,7 @@ class ScPreviewShell; class ScAccessiblePageHeader : public ScAccessibleContextBase { public: - ScAccessiblePageHeader( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePageHeader( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ); protected: @@ -50,35 +49,35 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - 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; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -89,8 +88,7 @@ private: sal_Int32 mnChildCount; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust); }; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 4cc234a828bf..e32b2c29972d 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -36,8 +36,7 @@ class ScAccessiblePageHeaderArea public: //===== internal ======================================================== ScAccessiblePageHeaderArea( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const EditTextObject* pEditObj, bool bHeader, @@ -56,10 +55,10 @@ public: ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) + throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== @@ -67,20 +66,20 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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; /// Return the set of current states. - 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; ///===== XServiceInfo ==================================================== @@ -88,29 +87,29 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 7bf645fc626d..72dc4eca95ee 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -34,8 +34,7 @@ class ScAccessiblePreviewCell : public ScAccessibleCellBase public: //===== internal ======================================================== ScAccessiblePreviewCell( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, /* const */ ScAddress& rCellAddress, sal_Int32 nIndex ); protected: @@ -53,41 +52,41 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - 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::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - 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 =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -95,14 +94,11 @@ private: accessibility::AccessibleTextHelper* mpTextHelper; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 1aa83bc78e96..1c1cfb8a89be 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -33,7 +33,7 @@ namespace accessibility { class AccessibleTextHelper; } -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue> ScAccessiblePreviewHeaderCellImpl; class ScAccessiblePreviewHeaderCell : @@ -41,8 +41,7 @@ class ScAccessiblePreviewHeaderCell : public ScAccessiblePreviewHeaderCellImpl { public: - ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, sal_Int32 nIndex ); @@ -62,9 +61,9 @@ public: ///===== 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; @@ -72,55 +71,55 @@ public: //===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMaximumValue() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMinimumValue() 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& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - 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 + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -132,8 +131,7 @@ private: mutable ScPreviewTableInfo* mpTableInfo; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); void FillTableInfo() const; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 1aaef208436e..ae52d1afe220 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -27,7 +27,7 @@ class ScPreviewShell; class ScPreviewTableInfo; -typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleTable> +typedef cppu::ImplHelper1< css::accessibility::XAccessibleTable> ScAccessiblePreviewTableImpl; class ScAccessiblePreviewTable : @@ -35,8 +35,7 @@ class ScAccessiblePreviewTable : public ScAccessiblePreviewTableImpl { public: - ScAccessiblePreviewTable( const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + ScAccessiblePreviewTable( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell, sal_Int32 nIndex ); protected: @@ -54,9 +53,9 @@ public: ///===== 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; @@ -65,115 +64,115 @@ public: //===== XAccessibleTable ================================================ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, - std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, + std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL + getAccessibleRowHeaders() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL + getAccessibleColumnHeaders() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + 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 getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleCaption() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleSummary() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + 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& aPoint ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, + 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 i ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - 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 + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::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< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) override; protected: virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -181,8 +180,7 @@ private: mutable ScPreviewTableInfo* mpTableInfo; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 16fdaf30dfb0..9ff0c09588d9 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -102,111 +102,108 @@ private: ///===== XAccessibleTable ================================================ /// Returns the row headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the Accessible at a specified row and column in the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn); /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; ///===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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 ============================================== /// Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the set of current states. - 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; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + 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 nSelectedChildIndex ) - 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, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -215,21 +212,21 @@ private: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XAccessibleEventBroadcaster ===================================== @@ -238,31 +235,30 @@ private: */ 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; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; @@ -279,11 +275,9 @@ private: bool mbIsFocusSend; bool IsDefunc( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsEditable( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); bool IsFocused(); bool IsCompleteSheetSelected(); @@ -294,7 +288,7 @@ private: Rectangle GetVisCells(const Rectangle& rVisArea); typedef std::vector<ScMyAddress> VEC_MYADDR; - typedef std::map<ScMyAddress,com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > + typedef std::map<ScMyAddress,css::uno::Reference< css::accessibility::XAccessible > > MAP_ADDR_XACC; MAP_ADDR_XACC m_mapSelectionSend; void RemoveSelection(ScMarkData &refScMarkData); @@ -333,7 +327,7 @@ public: VEC_COL m_vecTempCol; OUString m_strOldTabName; - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetActiveCell(); + css::uno::Reference < css::accessibility::XAccessible > GetActiveCell(); bool IsScAddrFormulaSel (const ScAddress &addr) const; bool IsFormulaMode(); ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 9cab4afe0b0e..33ffbf50dac0 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -33,20 +33,19 @@ <code>AccessibleTable</code> service. */ -typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleTable, - ::com::sun::star::accessibility::XAccessibleSelection> +typedef cppu::ImplHelper2< css::accessibility::XAccessibleTable, + css::accessibility::XAccessibleSelection> ScAccessibleTableBaseImpl; class ScAccessibleTableBase : public ScAccessibleContextBase, - public ::com::sun::star::accessibility::XAccessibleTableSelection, + public css::accessibility::XAccessibleTableSelection, public ScAccessibleTableBaseImpl { public: //===== internal ======================================================== ScAccessibleTableBase( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScRange& rRange); protected: @@ -58,9 +57,9 @@ public: ///===== 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; @@ -71,27 +70,27 @@ public: /// Returns the number of rows in the table. virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Returns the number of columns in the table. virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Returns the description of the specified row in the table. virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the description text of the specified column in the table. virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /** Returns the number of rows occupied by the Accessible at a specified row and column in the table. @@ -99,8 +98,8 @@ public: */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /** Returns the number of columns occupied by the Accessible at a specified row and column in the table. @@ -108,66 +107,66 @@ public: */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the row headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the Accessible at a specified row and column in the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the caption for the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns the summary description of the table. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; ///===== XAccessibleExtendedTable ======================================== @@ -175,22 +174,22 @@ public: /// Returns the index of the cell on the given position. virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; //===== XAccessibleContext ============================================== @@ -199,91 +198,88 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand - 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, + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; public: /// Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the set of current states. // perhaps sometimes to be implemented - 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; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + 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, + 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 nSelectedChildIndex ) - 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 nSelectedChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; ///===== XServiceInfo =================================================== @@ -292,20 +288,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: /// contains the range of the table, because it could be a subrange of the complete table diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 65617cc58e32..e4f5c7d5a822 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -27,8 +27,8 @@ class ScTabViewShell; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::lang::XServiceInfo > + css::view::XSelectionChangeListener, + css::lang::XServiceInfo > ScChartRangeSelectionListener_Base; class ScChartRangeSelectionListener : @@ -42,13 +42,13 @@ public: protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component @@ -56,12 +56,12 @@ protected: // ____ 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: ScTabViewShell * m_pViewShell; diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 69eef5f7b06e..bde6810533d4 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -28,7 +28,7 @@ class SdrModel; class ScDrawModelBroadcaster : public SfxListener, - public ::cppu::WeakImplHelper< com::sun::star::document::XEventBroadcaster > + public ::cppu::WeakImplHelper< css::document::XEventBroadcaster > { mutable ::osl::Mutex maListenerMutex; ::cppu::OInterfaceContainerHelper maEventListeners; @@ -39,10 +39,10 @@ public: ScDrawModelBroadcaster( SdrModel *pDrawModel ); virtual ~ScDrawModelBroadcaster(); - virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::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::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index fdfc94a8aeec..c6717110e988 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -248,7 +248,7 @@ public: virtual bool Notify(NotifyEvent& rNEvt) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual vcl::Window* GetPreferredKeyInputWindow() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void setMemberSize(size_t n); void addDateMember(const OUString& rName, double nVal, bool bVisible); diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index e2c295059c76..bb11c1a75f70 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -48,7 +48,7 @@ class XSheetCellRanges; } } } -class ScCondFormatsObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormats>, +class ScCondFormatsObj : public cppu::WeakImplHelper<css::sheet::XConditionalFormats>, public SfxListener { public: @@ -60,18 +60,18 @@ public: // XConditionalFormats virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByID( const sal_Int32 nID ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getLength() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; ScConditionalFormatList* getCoreObject(); @@ -81,8 +81,8 @@ private: ScDocShell* mpDocShell; }; -class ScCondFormatObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormat, - com::sun::star::beans::XPropertySet> +class ScCondFormatObj : public cppu::WeakImplHelper<css::sheet::XConditionalFormat, + css::beans::XPropertySet> { public: ScCondFormatObj(ScDocShell* pDocShell, rtl::Reference<ScCondFormatsObj> xCondFormats, sal_Int32 nKey); @@ -93,70 +93,66 @@ public: // XConditionalFormat virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getCount() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) override; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - 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; ScConditionalFormat* getCoreObject(); @@ -167,8 +163,8 @@ private: sal_Int32 mnKey; }; -class ScConditionEntryObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScConditionEntryObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: @@ -180,48 +176,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - 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; private: ScDocShell* mpDocShell; @@ -230,8 +222,8 @@ private: const ScCondFormatEntry* mpFormat; }; -class ScColorScaleFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScColorScaleFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: @@ -240,51 +232,47 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; ScColorScaleFormat* getCoreObject(); // 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -292,30 +280,30 @@ private: const ScColorScaleFormat* mpFormat; }; -class ScColorScaleEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XColorScaleEntry> +class ScColorScaleEntryObj : public cppu::WeakImplHelper<css::sheet::XColorScaleEntry> { public: ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> xParent, size_t nPos); virtual ~ScColorScaleEntryObj(); - virtual com::sun::star::util::Color SAL_CALL getColor() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getColor() + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColor(com::sun::star::util::Color aColor) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColor(css::util::Color aColor) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -324,8 +312,8 @@ private: size_t mnPos; }; -class ScDataBarFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScDataBarFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScDataBarFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -336,48 +324,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -385,7 +369,7 @@ private: const ScDataBarFormat* mpFormat; }; -class ScDataBarEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XDataBarEntry> +class ScDataBarEntryObj : public cppu::WeakImplHelper<css::sheet::XDataBarEntry> { public: ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> xParent, size_t nPos); @@ -393,16 +377,16 @@ public: virtual ~ScDataBarEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -411,8 +395,8 @@ private: size_t mnPos; }; -class ScIconSetFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScIconSetFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScIconSetFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -423,48 +407,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -472,7 +452,7 @@ private: const ScIconSetFormat* mpFormat; }; -class ScIconSetEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XIconSetEntry> +class ScIconSetEntryObj : public cppu::WeakImplHelper<css::sheet::XIconSetEntry> { public: ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> xParent, size_t nPos); @@ -480,16 +460,16 @@ public: virtual ~ScIconSetEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -498,8 +478,8 @@ private: size_t mnPos; }; -class ScCondDateFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, - com::sun::star::sheet::XConditionEntry> +class ScCondDateFormatObj : public cppu::WeakImplHelper<css::beans::XPropertySet, + css::sheet::XConditionEntry> { public: ScCondDateFormatObj(rtl::Reference<ScCondFormatObj> xParent, @@ -511,48 +491,44 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - 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; private: rtl::Reference<ScCondFormatObj> mxParent; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index d0a424767747..2855769e898e 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -61,7 +61,7 @@ private: public: ScDataPilotServiceDlg( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rServices ); + const css::uno::Sequence<OUString>& rServices ); virtual ~ScDataPilotServiceDlg(); virtual void dispose() override; diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 714a2dbcceda..4b47afed54df 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -66,8 +66,7 @@ public: bool bAddrInsert = false ); bool DoImportUno( const ScAddress& rPos, - const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue>& aArgs ); + const css::uno::Sequence<css::beans::PropertyValue>& aArgs ); static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 207fdbfdbce9..f5a1238a0a08 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -93,7 +93,7 @@ public: void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL); void ShowDataPilotSourceData( ScDPObject& rDPObj, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); + const css::uno::Sequence< css::sheet::DataPilotFieldFilter >& rFilters ); void MakeOutline( bool bColumns, bool bRecord = true ); void RemoveOutline( bool bColumns, bool bRecord = true ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 824178fab8d6..a190472a3b73 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -130,8 +130,8 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDocShell & mrDocShell; }; - SAL_DLLPRIVATE bool LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); + SAL_DLLPRIVATE bool LoadXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& ); + SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& ); SAL_DLLPRIVATE SCTAB GetSaveTab(); SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium ); @@ -151,7 +151,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SAL_DLLPRIVATE void UnlockDocument_Impl(sal_uInt16 nNew); SAL_DLLPRIVATE void EnableSharedSettings( bool bEnable ); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); + SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel > LoadSharedDocument(); SAL_DLLPRIVATE void UseSheetSaveEntries(); @@ -192,7 +192,7 @@ public: virtual std::set<Color> GetDocColors() override; - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; + virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& ) override; virtual bool Load( SfxMedium& rMedium ) override; virtual bool LoadFrom( SfxMedium& rMedium ) override; virtual bool ConvertFrom( SfxMedium &rMedium ) override; @@ -205,7 +205,7 @@ public: virtual bool IsInformationLost() override; virtual void LoadStyles( SfxObjectShell &rSource ) override; - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; // SfxInPlaceObject + virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& ) override; // SfxInPlaceObject virtual bool DoSaveCompleted( SfxMedium * pNewStor) override; // SfxObjectShell virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) override; @@ -365,9 +365,9 @@ public: #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) override; + css::uno::Any & rValue ) override; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) override; + const css::uno::Any & rValue ) override; #endif virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override; @@ -422,7 +422,7 @@ public: virtual bool HasChangeRecordProtection() const override; virtual void SetChangeRecording( bool bActivate ) override; virtual bool SetProtectionPassword( const OUString &rPassword ) override; - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) override; + virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override; void SnapVisArea( Rectangle& rRect ) const; @@ -479,8 +479,8 @@ namespace HelperNotifyChanges inline void Notify(ScModelObj &rModelObj, const ScRangeList &rChangeRanges, const OUString &rType = OUString("cell-change"), - 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 >()) { rModelObj.NotifyChanges(rType, rChangeRanges, rProperties); } diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 3828c1b064ef..bf8312eb5abb 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -137,7 +137,7 @@ public: inline void UnlockInternalLayer() { LockInternalLayer( false ); } SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0) - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); + css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable(); SdrObject* GetObjectByName(const OUString& rName); bool GetObjectIsMarked( SdrObject * pObject ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 70e6b4634831..da714a053910 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -77,7 +77,7 @@ public: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; @@ -95,8 +95,8 @@ public: sal_uInt16 GetDragSourceFlags() const { return nDragSourceFlags; } static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; - static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; } }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 1b2b5fd736a7..92be94f60270 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -44,8 +44,8 @@ class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog { ScFormulaReferenceHelper m_aHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; + css::uno::Reference< css::sheet::XFormulaParser> m_xParser; + css::uno::Reference< css::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; static ScDocument* pDoc; static ScAddress aCursorPos; @@ -75,10 +75,10 @@ public: virtual OUString getCurrentFormula() const override; virtual formula::IFunctionManager* getFunctionManager() override; - virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; - virtual ::com::sun::star::table::CellAddress getReferencePosition() const override; + virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) override; + virtual css::uno::Reference< css::sheet::XFormulaParser> getFormulaParser() const override; + virtual css::uno::Reference< css::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; + virtual css::table::CellAddress getReferencePosition() const override; virtual bool Close() override; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index c99f2ddafa5b..c5db4f197f39 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -339,7 +339,7 @@ public: /// Get the cell selection, coordinates are in logic units. void GetCellSelection(std::vector<Rectangle>& rLogicRects); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void FakeButtonUp(); @@ -367,7 +367,7 @@ public: void LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ); void LaunchDPFieldMenu( SCCOL nCol, SCROW nRow ); - ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; + css::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; void DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo, OutputDevice* pContentDev); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index b0466152367b..feaff387777b 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -129,9 +129,9 @@ public: bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); static bool ImportData( const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); + const css::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); + css::uno::Any & rValue ); // after import bool IsOverflowRow() const { return bOverflowRow; } diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 27192c58194b..d9763a1ca35f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -82,7 +82,7 @@ public: virtual void SetFormulaMode( bool bSet ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index c96511cf7660..893ffcdf7bd4 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -69,14 +69,14 @@ class ScOptSolverSave OUString maVariable; std::vector<ScOptConditionRow> maConditions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; public: ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, const OUString& rTarget, const OUString& rVariable, const std::vector<ScOptConditionRow>& rConditions, const OUString& rEngine, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); + const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); const OUString& GetObjective() const { return maObjective; } bool GetMax() const { return mbMax; } @@ -86,7 +86,7 @@ public: const OUString& GetVariable() const { return maVariable; } const std::vector<ScOptConditionRow>& GetConditions() const { return maConditions; } const OUString& GetEngine() const { return maEngine; } - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties() const + const css::uno::Sequence<css::beans::PropertyValue>& GetProperties() const { return maProperties; } }; @@ -175,10 +175,10 @@ private: std::vector<ScOptConditionRow> maConditions; long nScrollPos; - com::sun::star::uno::Sequence<OUString> maImplNames; - com::sun::star::uno::Sequence<OUString> maDescriptions; + css::uno::Sequence<OUString> maImplNames; + css::uno::Sequence<OUString> maDescriptions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; void Init(const ScAddress& rCursorPos); bool CallSolver(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 729629958a5a..0291e72aa1fc 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -113,7 +113,7 @@ protected: virtual void GetFocus() override; virtual void LoseFocus() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; public: ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 22567c77260e..e242d9396630 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -46,7 +46,7 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell VclPtr<ScrollBar> pVerScroll; VclPtr<vcl::Window> pCorner; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData + css::uno::Sequence< css::beans::PropertyValue > aSourceData; // ViewData TriState nSourceDesignMode; // form design mode from TabView SvxZoomType eZoom; long nMaxVertPos; @@ -71,8 +71,8 @@ protected: virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) override; - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence (css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence (const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; public: TYPEINFO_OVERRIDE(); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 81871e7b0a74..9a364c99c91e 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -63,7 +63,7 @@ public: virtual ~ScDPFunctionDlg(); virtual void dispose() override; sal_uInt16 GetFuncMask() const; - ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const; + css::sheet::DataPilotFieldReference GetFieldRef() const; private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 35f4e516cce4..76ca857eb9c1 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -54,7 +54,7 @@ public: ScServerObject( ScDocShell* pShell, const OUString& rItem ); virtual ~ScServerObject(); - virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual bool GetData( css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool bSynchron = false ) override; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 64b46d191f2e..0ebb12d248b0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -40,10 +40,10 @@ class ScSolverOptionsDialog : public ModalDialog VclPtr<PushButton> m_pBtnEdit; SvLBoxButtonData* mpCheckButtonData; - com::sun::star::uno::Sequence<OUString> maImplNames; - com::sun::star::uno::Sequence<OUString> maDescriptions; + css::uno::Sequence<OUString> maImplNames; + css::uno::Sequence<OUString> maDescriptions; OUString maEngine; - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; + css::uno::Sequence<css::beans::PropertyValue> maProperties; DECL_LINK_TYPED( EngineSelectHdl, ListBox&, void ); DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); @@ -56,16 +56,16 @@ class ScSolverOptionsDialog : public ModalDialog public: ScSolverOptionsDialog( vcl::Window* pParent, - const com::sun::star::uno::Sequence<OUString>& rImplNames, - const com::sun::star::uno::Sequence<OUString>& rDescriptions, + const css::uno::Sequence<OUString>& rImplNames, + const css::uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); + const css::uno::Sequence<css::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog(); virtual void dispose() override; // already updated in selection handler const OUString& GetEngine() const { return maEngine; } - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); + const css::uno::Sequence<css::beans::PropertyValue>& GetProperties(); }; class ScSolverIntegerDialog : public ModalDialog diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index 37107d04e1e7..7d9667e520f0 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -31,10 +31,10 @@ namespace com { namespace sun { namespace star { class ScSolverUtil { public: - static void GetImplementations( com::sun::star::uno::Sequence<OUString>& rImplNames, - com::sun::star::uno::Sequence<OUString>& rDescriptions ); - static com::sun::star::uno::Reference<com::sun::star::sheet::XSolver> GetSolver( const OUString& rImplName ); - static com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> GetDefaults( const OUString& rImplName ); + static void GetImplementations( css::uno::Sequence<OUString>& rImplNames, + css::uno::Sequence<OUString>& rDescriptions ); + static css::uno::Reference<css::sheet::XSolver> GetSolver( const OUString& rImplName ); + static css::uno::Sequence<css::beans::PropertyValue> GetDefaults( const OUString& rImplName ); }; #endif diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c5fffce05396..24be8c0c43b4 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -436,8 +436,7 @@ public: void AddHighlightRange( const ScRange& rRange, const Color& rColor ); void ClearHighlightRanges(); - void DoChartSelection( const ::com::sun::star::uno::Sequence< - ::com::sun::star::chart2::data::HighlightedRange > & rHilightRanges ); + void DoChartSelection( const css::uno::Sequence< css::chart2::data::HighlightedRange > & rHilightRanges ); long GetGridWidth( ScHSplitPos eWhich ); long GetGridHeight( ScVSplitPos eWhich ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 31208b35f628..6f94a6088d15 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -119,8 +119,7 @@ private: ::editeng::SvxBorderLine* pCurFrameLine; - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProviderInterceptor > + css::uno::Reference< css::frame::XDispatchProviderInterceptor > xDisProvInterceptor; Point aWinPos; @@ -180,8 +179,7 @@ private: SfxShell* GetMySubShell() const; void DoReadUserData( const OUString& rData ); - void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rSettings ); + void DoReadUserDataSequence( const css::uno::Sequence< css::beans::PropertyValue >& rSettings ); DECL_LINK_TYPED( SimpleRefClose, const OUString*, void ); DECL_LINK_TYPED( SimpleRefDone, const OUString&, void ); @@ -211,8 +209,8 @@ protected: virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) override; - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence (css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence (const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; virtual void UIDeactivated( SfxInPlaceClient* pClient ) override; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index fefff1f6dc79..b362a02d255a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -68,7 +68,7 @@ public: void SetNumType(SvxNumType eNumType); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; } void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; } @@ -91,7 +91,7 @@ private: ScEditWindowLocation eLocation; bool mbRTL; - com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc; + css::uno::WeakReference< css::accessibility::XAccessible > xAcc; ScAccessibleEditObject* pAcc; Link<ScEditWindow&,void> aObjectSelectLink; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 855cc50c10b8..f69b21c810c2 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -46,7 +46,7 @@ private: TransferableObjectDescriptor aObjDesc; SfxObjectShellRef aDocShellRef; SfxObjectShellRef aDrawPersistRef; - com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges; + css::uno::Reference<css::sheet::XSheetCellRanges> xDragSourceRanges; SCCOL nDragHandleX; SCROW nDragHandleY; SCTAB nVisibleTab; @@ -74,7 +74,7 @@ public: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 493d24a5124a..3e73bf22163f 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -145,7 +145,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSortParam& GetSortData () const { return theSortData; } @@ -197,7 +197,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 630693cd79fe..ea119050865a 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -142,11 +142,11 @@ private: ScViewDataTable(); void WriteUserDataSequence( - com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings, + css::uno::Sequence <css::beans::PropertyValue>& rSettings, const ScViewData& rViewData, SCTAB nTab ) const; void ReadUserDataSequence( - const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings, + const css::uno::Sequence <css::beans::PropertyValue>& rSettings, ScViewData& rViewData, SCTAB nTab, bool& rHasZoom); public: ~ScViewDataTable(); @@ -251,8 +251,8 @@ public: void ReadUserData(const OUString& rData); void WriteExtOptions( ScExtDocOptions& rOpt ) const; void ReadExtOptions( const ScExtDocOptions& rOpt ); - void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings) const; - void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + void WriteUserDataSequence(css::uno::Sequence <css::beans::PropertyValue>& rSettings) const; + void ReadUserDataSequence(const css::uno::Sequence <css::beans::PropertyValue>& rSettings); ScDocument* GetDocument() const; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 836d5ac5058f..84bf390b170c 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -115,35 +115,32 @@ public: SC_DLLPUBLIC void PasteFromSystem(); SC_DLLPUBLIC bool PasteFromSystem( SotClipboardFormatId nFormatId, bool bApi = false ); - void PasteFromTransferable( const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + void PasteFromTransferable( const css::uno::Reference< + css::datatransfer::XTransferable >& rxTransferable ); void PasteDraw(); void PasteDraw( const Point& rLogicPos, SdrModel* pModel, bool bGroup, const OUString& rSrcShellID, const OUString& rDestShellID ); bool PasteOnDrawObjectLinked( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SdrObject& rHitObj); bool PasteDataFormat( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL, bool bLink = false, bool bAllowDialogs = false ); bool PasteFile( const Point&, const OUString&, bool bLink=false ); - bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); + bool PasteObject( const Point&, const css::uno::Reference < css::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT ); bool PasteBitmapEx( const Point&, const BitmapEx& ); bool PasteMetaFile( const Point&, const GDIMetaFile& ); bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, const OUString& rFile, const OUString& rFilter ); bool PasteBookmark( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ); - bool PasteLink( const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + bool PasteLink( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ); void InsertBookmark( const OUString& rDescription, const OUString& rURL, SCCOL nPosX, SCROW nPosY, const OUString* pTarget = NULL, @@ -338,8 +335,7 @@ protected: private: void PasteRTF( SCCOL nCol, SCROW nStartRow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ); bool PasteMultiRangesFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, ScPasteFunc nFunction, bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs, diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 1b87ed40a282..24932223c6f1 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -127,7 +127,7 @@ void ScEditWindow::dispose() // delete Accessible object before deleting EditEngine and EditView if (pAcc) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is()) pAcc->dispose(); } @@ -285,7 +285,7 @@ void ScEditWindow::GetFocus() pEdView->ShowCursor(); pActiveEdWnd = this; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) { pAcc->GotFocus(); @@ -298,7 +298,7 @@ void ScEditWindow::GetFocus() void ScEditWindow::LoseFocus() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc; + css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) { pAcc->LostFocus(); @@ -308,7 +308,7 @@ void ScEditWindow::LoseFocus() Control::LoseFocus(); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ScEditWindow::CreateAccessible() { OUString sName; OUString sDescription(GetHelpText()); @@ -332,7 +332,7 @@ void ScEditWindow::LoseFocus() } pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, OUString(sName), OUString(sDescription), ScAccessibleEditObject::EditControl); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc; + css::uno::Reference< css::accessibility::XAccessible > xAccessible = pAcc; xAcc = xAccessible; return pAcc; } diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 9041722dec95..42e541b2b3e1 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1103,7 +1103,7 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) if (pOwnClip) { // keep a reference in case the clipboard is changed during PasteFromClip - com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> aOwnClipRef( pOwnClip ); + css::uno::Reference<css::datatransfer::XTransferable> aOwnClipRef( pOwnClip ); pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(), aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose, aPasteOptions.bAsLink, aPasteOptions.eMoveMode, InsertDeleteFlags::NONE, diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index a7dd0827e338..f7694235ab8d 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -41,10 +41,10 @@ namespace calc class OCellListSource; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::form::binding::XListEntrySource - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakAggComponentImplHelper4 < css::form::binding::XListEntrySource + , css::util::XModifyListener + , css::lang::XServiceInfo + , css::lang::XInitialization > OCellListSource_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellListSource_PBase; @@ -58,9 +58,9 @@ namespace calc ,public OCellListSource_PABase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; /// the document where our cell lives - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > + css::uno::Reference< css::table::XCellRange > m_xRange; /// the range of cells we're bound to ::cppu::OInterfaceContainerHelper m_aListEntryListeners; /// our listeners @@ -68,7 +68,7 @@ namespace calc public: OCellListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument ); using OCellListSource_PBase::getFastPropertyValue; @@ -84,36 +84,36 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() override; // 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; + 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; // 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; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - 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; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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 modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; @@ -123,7 +123,7 @@ namespace calc @precond our m_xRange is not <NULL/> */ - ::com::sun::star::table::CellRangeAddress + css::table::CellRangeAddress getRangeAddress( ) const; /** retrievs the text of a cell within our range diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index eb3cd065dada..e816b07d2c37 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2999,7 +2999,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas // XIndent -void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3011,7 +3011,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R } } -void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::incrementIndent() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3390,7 +3390,7 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R } } -double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException, std::exception) +double SAL_CALL ScCellRangesBase::getNotANumber() throw(css::uno::RuntimeException, std::exception) { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return DBL_MIN; @@ -4303,7 +4303,7 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange(static_cast<SCCOL>(rRange.StartColumn), @@ -4324,8 +4324,8 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScR } void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress& rRange ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4373,7 +4373,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount(rRanges.getLength()); @@ -4394,8 +4394,8 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel } void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRangeSeq ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { // use sometimes a better/faster implementation sal_uInt32 nCount(rRangeSeq.getLength()); @@ -8407,7 +8407,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn sal_Int16 nValue = 0; if (aValue >>= nValue) { - if (nValue == com::sun::star::text::WritingMode2::RL_TB) + if (nValue == css::text::WritingMode2::RL_TB) rFunc.SetLayoutRTL(nTab, true, true); else rFunc.SetLayoutRTL(nTab, false, true); @@ -8584,9 +8584,9 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn else if ( pEntry->nWID == SC_WID_UNO_TABLAYOUT ) { if (rDoc.IsLayoutRTL(nTab)) - rAny <<= sal_Int16(com::sun::star::text::WritingMode2::RL_TB); + rAny <<= sal_Int16(css::text::WritingMode2::RL_TB); else - rAny <<= sal_Int16(com::sun::star::text::WritingMode2::LR_TB); + rAny <<= sal_Int16(css::text::WritingMode2::LR_TB); } else if ( pEntry->nWID == SC_WID_UNO_AUTOPRINT ) { diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 6f47116c58da..4979a5e979d6 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -42,11 +42,11 @@ namespace calc class OCellValueBinding; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper5 < ::com::sun::star::form::binding::XValueBinding - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XModifyBroadcaster - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakAggComponentImplHelper5 < css::form::binding::XValueBinding + , css::lang::XServiceInfo + , css::util::XModifyBroadcaster + , css::util::XModifyListener + , css::lang::XInitialization > OCellValueBinding_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellValueBinding_PBase; @@ -60,11 +60,11 @@ namespace calc ,public OCellValueBinding_PABase { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; /// the document where our cell lives - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > + css::uno::Reference< css::table::XCell > m_xCell; /// the cell we're bound to, for double value access - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > + css::uno::Reference< css::text::XTextRange > m_xCellText; /// the cell we're bound to, for text access ::cppu::OInterfaceContainerHelper m_aModifyListeners; /// our modify listeners @@ -73,7 +73,7 @@ namespace calc public: OCellValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument, bool _bListPos ); @@ -90,43 +90,43 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw (css::form::binding::IncompatibleTypesException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() override; // 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; + 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; // 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; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - 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; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( 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 ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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 css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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 modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; - void checkValueType( const ::com::sun::star::uno::Type& _rType ) const; + void checkValueType( const css::uno::Type& _rType ) const; void checkInitialized(); /** notifies our modify listeners diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 5542341923c4..373d1717ffd0 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -97,7 +97,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { {OUString(SC_UNONAME_HIDDENVALUES), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 }, - {OUString(SC_UNONAME_ROLE), 0, cppu::UnoType<com::sun::star::chart2::data::DataSequenceRole>::get(), 0, 0 }, + {OUString(SC_UNONAME_ROLE), 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 }, {OUString(SC_UNONAME_INCLUDEHIDDENCELLS), 0, cppu::UnoType<bool>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -105,10 +105,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() } template< typename T > -::com::sun::star::uno::Sequence< T > lcl_VectorToSequence( - const ::std::vector< T > & rCont ) +css::uno::Sequence< T > lcl_VectorToSequence( const ::std::vector< T > & rCont ) { - ::com::sun::star::uno::Sequence< T > aResult( rCont.size()); + css::uno::Sequence< T > aResult( rCont.size()); ::std::copy( rCont.begin(), rCont.end(), aResult.getArray()); return aResult; } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 10dc39106a11..aef5ea31a7f8 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -166,7 +166,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index c166330882b6..4fc02fabc82d 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -169,7 +169,7 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( // XEventListener void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -333,8 +333,8 @@ void SAL_CALL ScDispatch::removeStatusListener( // XSelectionChangeListener -void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventObject& /* aEvent */ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEvent */ ) + throw (css::uno::RuntimeException, std::exception) { // currently only called for URL cURLDocDataSource @@ -368,8 +368,8 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO // XEventListener -void SAL_CALL ScDispatch::disposing( const ::com::sun::star::lang::EventObject& rSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScDispatch::disposing( const css::lang::EventObject& rSource ) + throw (css::uno::RuntimeException, std::exception) { uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY); xSupplier->removeSelectionChangeListener(this); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index db76dd0610d7..8391905ba969 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -906,12 +906,12 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) uno::Any aRet(SfxBaseModel::queryInterface( rType )); if ( !aRet.hasValue() - && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get() - && rType != cppu::UnoType<com::sun::star::frame::XController>::get() - && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get() - && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get() - && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get() - && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get()) + && rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get() + && rType != cppu::UnoType<css::frame::XController>::get() + && rType != cppu::UnoType<css::frame::XFrame>::get() + && rType != cppu::UnoType<css::script::XInvocation>::get() + && rType != cppu::UnoType<css::beans::XFastPropertySet>::get() + && rType != cppu::UnoType<css::awt::XWindow>::get()) { GetFormatter(); if ( xNumberAgg.is() ) @@ -1775,7 +1775,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, s return nRet; } -void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SfxBaseModel::lockControllers(); @@ -1783,7 +1783,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (::com::sun::star::uno::Runtim pDocShell->LockPaint(); } -void SAL_CALL ScModelObj::unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (hasControllersLocked()) diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index c22f8d312fa8..5e663bf908c6 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -194,9 +194,9 @@ OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescri return aType; } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_calc_ExcelBiffFormatDetector_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_calc_ExcelBiffFormatDetector_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScExcelBiffDetect(context)); } diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 12901ce85614..22e91ad6d9fb 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -19,20 +19,20 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}} -class ScExcelBiffDetect : public cppu::WeakImplHelper<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo> +class ScExcelBiffDetect : public cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> { public: - ScExcelBiffDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + ScExcelBiffDetect( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~ScExcelBiffDetect(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) 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; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetection - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 293bfc017096..0521434d79af 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -692,7 +692,7 @@ SvxFieldData* ScEditFieldObj::getData() return mpData.get(); } -void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal) +void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::Any& rVal) { OUString aStrVal; if (mpEditSource) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 0258478524fc..5d2694e75757 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1399,7 +1399,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( const OUString& aApplication, const OUString& aTopic, - const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aItem, css::sheet::DDELinkMode nMode ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 9f187786be2a..a1149acb3bca 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -218,29 +218,29 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme } OUString SAL_CALL ScIndexEnumeration::getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::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 ScIndexEnumeration::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] = sServiceName; return aRet; } -ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess>& rNameObj ) : +ScNameToIndexAccess::ScNameToIndexAccess( const css::uno::Reference< + css::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) { //! test for XIndexAccess interface at rNameObj, use that instead! @@ -255,15 +255,15 @@ ScNameToIndexAccess::~ScNameToIndexAccess() // XIndexAccess -sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(css::uno::RuntimeException, std::exception) { return aNames.getLength(); } -::com::sun::star::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() && nIndex >= 0 && nIndex < aNames.getLength() ) return xNameAccess->getByName( aNames.getConstArray()[nIndex] ); @@ -273,8 +273,8 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno // XElementAccess -::com::sun::star::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) + throw(css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() ) return xNameAccess->getElementType(); @@ -282,7 +282,7 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno return uno::Type(); } -sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(css::uno::RuntimeException, std::exception) { return getCount() > 0; } diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 80b67b4d4056..73b15fd6824b 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -224,7 +224,7 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru // XSheetAnnotationShapeSupplier uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape() - throw(::com::sun::star::uno::RuntimeException, + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 8d29d6e0e10d..12a11be841e0 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -322,7 +322,7 @@ sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName ) return cppu::supportsService(this, sServiceName); } -com::sun::star::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() +css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> seqServiceNames(1); @@ -330,9 +330,9 @@ com::sun::star::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames return seqServiceNames; } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_calc_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_calc_FormatDetector_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ScFilterDetect(context)); } diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 1dca02c3b02e..7c1af7015c14 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -36,21 +36,21 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } }}} -class ScFilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > +class ScFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo > { public: - ScFilterDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + ScFilterDetect( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~ScFilterDetect(); /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetect - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 9ba379bf67cd..3562d3c50531 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -92,7 +92,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -135,16 +135,16 @@ public: return maCachedObject.hasValue(); } - ::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 + css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) - throw ::com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; ScDocument& rDoc = mpDocShell->GetDocument(); @@ -161,8 +161,8 @@ public: return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return sal_True; } + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return sal_True; } }; diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index bd93e98715d4..1eed0551b3d5 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1181,7 +1181,7 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) throw (::uno::RuntimeException) { bool bReturn(false); - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) + if ( e.Buttons == css::awt::MouseButton::LEFT ) mbLeftMousePressed = true; uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y)); @@ -1274,7 +1274,7 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException) { - if ( e.Buttons == ::com::sun::star::awt::MouseButton::LEFT ) + if ( e.Buttons == css::awt::MouseButton::LEFT ) { try { @@ -2212,8 +2212,8 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa return pRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() - throw (::com::sun::star::uno::RuntimeException, +css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2240,9 +2240,9 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa return xTransferable; } -void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) - throw (::com::sun::star::datatransfer::UnsupportedFlavorException, - ::com::sun::star::uno::RuntimeException, +void SAL_CALL ScTabViewObj::insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) + throw (css::datatransfer::UnsupportedFlavorException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 7cd16bb60420..4f7d181b05ae 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -334,7 +334,7 @@ ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeExcept } uno::Any SAL_CALL -ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaApplication::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) { return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) ); } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 9612438681a6..7760d9e06514 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -45,8 +45,8 @@ public: void removeByName(const OUString& _sChartName); // XChartObjects - virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (css::script::BasicErrorException, std::exception) override; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, std::exception) override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XElementAccess diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index f6477be468c9..7b98034c9815 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -151,7 +151,7 @@ ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException, std::exception) return getApplication()->getThisWorkbook(); } void SAL_CALL -ScVbaGlobals::Calculate() throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) +ScVbaGlobals::Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) { return getApplication()->Calculate(); } diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index b7d72fad2bea..b2195d40e81f 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -34,37 +34,34 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; - class ScVbaGlobals : public ScVbaGlobals_BASE - { - css::uno::Reference< ov::excel::XApplication > mxApplication; - css::uno::Reference< - ov::excel::XApplication > SAL_CALL getApplication() +class ScVbaGlobals : public ScVbaGlobals_BASE +{ + css::uno::Reference< ov::excel::XApplication > mxApplication; + css::uno::Reference< ov::excel::XApplication > SAL_CALL getApplication() throw (css::uno::RuntimeException); - public: +public: - ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, - css::uno::Reference< css::uno::XComponentContext >const& rxContext ); - //ScVbaGlobals( - // css::uno::Reference< css::uno::XComponentContext >const& rxContext, ); - virtual ~ScVbaGlobals(); + ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, + css::uno::Reference< css::uno::XComponentContext >const& rxContext ); + virtual ~ScVbaGlobals(); - // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; + // XGlobals + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; @@ -82,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScV // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; - }; -#endif +}; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 700a0a1c53d7..8abd91c14f25 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -53,8 +53,8 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 86554ff299b5..0fce307c647e 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1679,7 +1679,7 @@ ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException, } uno::Any -ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } @@ -1691,7 +1691,7 @@ ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeExcepti } uno::Any -ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::getFormula() throw (css::uno::RuntimeException, std::exception) { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } @@ -2846,7 +2846,7 @@ getPasteFormulaBits( sal_Int32 Operation) return nFormulaBits; } void SAL_CALL -ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 59c326b102b6..bdbebac2f32a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -56,8 +56,8 @@ SCTAB, OUStringHash, typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; typedef ::cppu::WeakImplHelper< container::XEnumerationAccess - , com::sun::star::container::XIndexAccess - , com::sun::star::container::XNameAccess + , css::container::XIndexAccess + , css::container::XNameAccess > SelectedSheets_BASE; class SelectedSheetsEnum : public ::cppu::WeakImplHelper< container::XEnumeration > diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 09d52ff62c6c..e9a7d0dc33d1 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -104,8 +104,8 @@ public: }; typedef ::cppu::WeakImplHelper< container::XEnumerationAccess - , com::sun::star::container::XIndexAccess - , com::sun::star::container::XNameAccess + , css::container::XIndexAccess + , css::container::XNameAccess > WindowsAccessImpl_BASE; class WindowsAccessImpl : public WindowsAccessImpl_BASE diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 9876b9c75822..8735dd0c8f72 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -39,7 +39,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XWindows - virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (css::uno::RuntimeException, std::exception) override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index a7fc1ac49b70..0160826d043c 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -305,7 +305,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep } void SAL_CALL -ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (css::uno::RuntimeException, std::exception) { OUString sFileName; FileName >>= sFileName; diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 699f8d359043..49d434ced9f8 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -52,7 +52,7 @@ public: virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 1e7aa38fd686..e5e57307c682 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -163,7 +163,7 @@ openNewDoc(const OUString& aSheetName ) uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( OUString( "private:factory/scalc" ), OUString( "_blank" ), 0, - uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); + uno::Sequence < css::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) { diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 58d17a17dc29..d61c5d8e0e73 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -75,7 +75,7 @@ public: { return mxModel; } css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } - static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( const OUString& ); css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index a0bb2d29ef03..676febee36e7 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -165,11 +165,11 @@ public: }; -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) ) { } -ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) +ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel) { } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index e1ddb60e97cf..cf4b59012ae7 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -783,7 +783,7 @@ bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& // of days with a "Number of days" value. rOldInfo = pNumGroupDim->GetInfo(); - rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts + rParts = css::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts bFoundParts = true; bFound = true; } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 2f192fbc33ac..4d2f2504d281 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -403,20 +403,20 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) const SfxStringItem* pFamilyItem = rReq.GetArg<SfxStringItem>(SID_STYLE_FAMILYNAME); if ( pFamilyItem && pNameItem ) { - com::sun::star::uno::Reference< com::sun::star::style::XStyleFamiliesSupplier > xModel(pDocSh->GetModel(), com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(pDocSh->GetModel(), css::uno::UNO_QUERY); try { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xStyles; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xCont = xModel->getStyleFamilies(); + css::uno::Reference< css::container::XNameAccess > xStyles; + css::uno::Reference< css::container::XNameAccess > xCont = xModel->getStyleFamilies(); xCont->getByName(pFamilyItem->GetValue()) >>= xStyles; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo; + css::uno::Reference< css::beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; OUString aUIName; xInfo->getPropertyValue("DisplayName") >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 6c523cc8e477..8037a8a11497 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2811,13 +2811,13 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) SfxViewFrame* pViewFrame = pViewData->GetViewShell()->GetViewFrame(); if (pViewFrame) { - com::sun::star::uno::Reference<com::sun::star::frame::XController> xController = pViewFrame->GetFrame().GetController(); + css::uno::Reference<css::frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); if (pImp && pImp->IsMouseListening()) { - ::com::sun::star::awt::MouseEvent aEvent; + css::awt::MouseEvent aEvent; lcl_InitMouseEvent( aEvent, *rNEvt.GetMouseEvent() ); if ( rNEvt.GetWindow() ) aEvent.Source = rNEvt.GetWindow()->GetComponentInterface(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 947d20b07ad7..2e044cb7e048 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -450,10 +450,10 @@ void ScGridWindow::HideNoteMarker() mpNoteMarker.reset(); } -com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > +css::uno::Reference< css::accessibility::XAccessible > ScGridWindow::CreateAccessible() { - com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc= GetAccessible(false); + css::uno::Reference< css::accessibility::XAccessible > xAcc= GetAccessible(false); if (xAcc.is()) { return xAcc; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index d36dbb54eb76..72d88495c93a 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2448,7 +2448,7 @@ void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor) if ( !mbHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { // set hyphenator the first time it is needed - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); mpEngine->SetHyphenator( xXHyphenator ); mbHyphenatorSet = true; } @@ -4802,7 +4802,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if ( !bHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { // set hyphenator the first time it is needed - com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); + css::uno::Reference<css::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = true; } diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 37851a06f621..d1f4a3f2baf8 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1514,9 +1514,9 @@ void ScPreview::LoseFocus() Window::LoseFocus(); } -com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPreview::CreateAccessible() +css::uno::Reference<css::accessibility::XAccessible> ScPreview::CreateAccessible() { - com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> xAcc= GetAccessible(false); + css::uno::Reference<css::accessibility::XAccessible> xAcc= GetAccessible(false); if (xAcc.is()) { return xAcc; diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index f6a4a9de8f7e..ca8c67e62e4e 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -471,7 +471,7 @@ void ScTabControl::DoDrag( const vcl::Region& /* rRegion */ ) // maSize is set in ScTransferObj ctor ScTransferObj* pTransferObj = new ScTransferObj( pClipDoc, aObjDesc ); - com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> xTransferable( pTransferObj ); + css::uno::Reference<css::datatransfer::XTransferable> xTransferable( pTransferObj ); pTransferObj->SetDragSourceFlags( SC_DROP_TABLE ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 88787fdf1f80..6e390531885c 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2144,7 +2144,7 @@ void ScTabView::SetNewVisArea() if (pViewFrame) { SfxFrame& rFrame = pViewFrame->GetFrame(); - com::sun::star::uno::Reference<com::sun::star::frame::XController> xController = rFrame.GetController(); + css::uno::Reference<css::frame::XController> xController = rFrame.GetController(); if (xController.is()) { ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index adaad13dbf72..d8bbc2f34b45 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -69,7 +69,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) return; sal_Int8 nType( pGalleryItem->GetType() ); - if ( nType == com::sun::star::gallery::GalleryItemType::GRAPHIC ) + if ( nType == css::gallery::GalleryItemType::GRAPHIC ) { MakeDrawLayer(); @@ -79,7 +79,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) OUString aPath, aFilter; PasteGraphic( aPos, aGraphic, aPath, aFilter ); } - else if ( nType == com::sun::star::gallery::GalleryItemType::MEDIA ) + else if ( nType == css::gallery::GalleryItemType::MEDIA ) { // for sounds (linked or not), insert a hyperlink button, // like in Impress and Writer diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index aa1daef67f97..a899178b50d5 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -3043,7 +3043,7 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const if ( bOnlineSpell ) { - com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); + css::uno::Reference<css::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() ); rOutl.SetSpeller( xXSpellChecker1 ); } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 42a7c37d3781..d84f3e078a31 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -481,7 +481,7 @@ void ScViewFunc::PasteFromSystem() SotClipboardFormatId nFormat; // output param for GetExchangeAction sal_uInt16 nEventAction; // output param for GetExchangeAction - uno::Reference<com::sun::star::datatransfer::XTransferable> xTransferable( aDataHelper.GetXTransferable() ); + uno::Reference<css::datatransfer::XTransferable> xTransferable( aDataHelper.GetXTransferable() ); sal_uInt16 nAction = SotExchange::GetExchangeAction( aDataHelper.GetDataFlavorExVector(), nDestination, diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 241106dd0e5a..9db01ae474fd 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -77,8 +77,7 @@ using namespace com::sun::star; bool bPasteIsDrop = false; void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ) { TransferableDataHelper aDataHelper( rxTransferable ); if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ) @@ -669,8 +668,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink } bool ScViewFunc::PasteBookmark( SotClipboardFormatId nFormatId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable >& rxTransferable, + const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ) { INetBookmark aBookmark; @@ -764,7 +762,7 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent ) // doesn't have a field item data. return false; - if (pField->GetClassId() != com::sun::star::text::textfield::Type::URL) + if (pField->GetClassId() != css::text::textfield::Type::URL) // not a URL field. return false; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index c8b8ea0af7eb..ee60d8c6370b 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -497,7 +497,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, pModel->GetItemPool().FreezeIdRanges(); xStm->Seek(0); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); + css::uno::Reference< css::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); SvxDrawingLayerImport( pModel.get(), xInputStream ); // set everything to right layer: diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1308f905bbfe..2da15480a718 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1225,7 +1225,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, ScModelObj* pModelObj = HelperNotifyChanges::getMustPropagateChangesModel(*pDocSh); if (pModelObj) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aProperties; + css::uno::Sequence< css::beans::PropertyValue > aProperties; sal_Int32 nCount = 0; const SfxItemPropertyMap& rMap = ScCellObj::GetCellPropertyMap(); PropertyEntryVector_t aPropVector = rMap.getPropertyEntries(); @@ -1239,7 +1239,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, { if ( aIt->nWID == nWhich ) { - ::com::sun::star::uno::Any aVal; + css::uno::Any aVal; pItem->QueryValue( aVal, aIt->nMemberId ); aProperties.realloc( nCount + 1 ); aProperties[ nCount ].Name = aIt->sName; diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index e878df4f3fe2..aba3a38b5e55 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -104,31 +104,31 @@ sal_Int32 ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID ) switch ( nSlotID ) { case SID_TRANSLITERATE_SENTENCE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::SENTENCE_CASE; + nType = css::i18n::TransliterationModulesExtra::SENTENCE_CASE; break; case SID_TRANSLITERATE_TITLE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::TITLE_CASE; + nType = css::i18n::TransliterationModulesExtra::TITLE_CASE; break; case SID_TRANSLITERATE_TOGGLE_CASE: - nType = com::sun::star::i18n::TransliterationModulesExtra::TOGGLE_CASE; + nType = css::i18n::TransliterationModulesExtra::TOGGLE_CASE; break; case SID_TRANSLITERATE_UPPER: - nType = com::sun::star::i18n::TransliterationModules_LOWERCASE_UPPERCASE; + nType = css::i18n::TransliterationModules_LOWERCASE_UPPERCASE; break; case SID_TRANSLITERATE_LOWER: - nType = com::sun::star::i18n::TransliterationModules_UPPERCASE_LOWERCASE; + nType = css::i18n::TransliterationModules_UPPERCASE_LOWERCASE; break; case SID_TRANSLITERATE_HALFWIDTH: - nType = com::sun::star::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH; + nType = css::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH; break; case SID_TRANSLITERATE_FULLWIDTH: - nType = com::sun::star::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH; + nType = css::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH; break; case SID_TRANSLITERATE_HIRAGANA: - nType = com::sun::star::i18n::TransliterationModules_KATAKANA_HIRAGANA; + nType = css::i18n::TransliterationModules_KATAKANA_HIRAGANA; break; case SID_TRANSLITERATE_KATAGANA: - nType = com::sun::star::i18n::TransliterationModules_HIRAGANA_KATAKANA; + nType = css::i18n::TransliterationModules_HIRAGANA_KATAKANA; break; } return nType; diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 4ec33382a4f9..7689afe85b86 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -108,7 +108,7 @@ UString ScTestAddIn::getImplementationName_Static() return L"stardiv.StarCalc.ScTestAddIn"; } -::com::sun::star::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() +css::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -310,24 +310,24 @@ void ScTestAddIn::setLocale(const lang::Locale& eLocale) THROWS( (UsrSystemExcep aFuncLoc = eLocale; } -::com::sun::star::lang::Locale SAL_CALL ScTestAddIn::getLocale( ) throw(::com::sun::star::uno::RuntimeException) +css::lang::Locale SAL_CALL ScTestAddIn::getLocale( ) throw(css::uno::RuntimeException) { return aFuncLoc; } // XTestAddIn -sal_Int32 SAL_CALL ScTestAddIn::countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ScTestAddIn::countParams( const css::uno::Sequence< css::uno::Any >& aArgs ) throw(css::uno::RuntimeException) { return aArgs.getLength(); } -double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException) +double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(css::uno::RuntimeException) { return fValue + 1.0; } -OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(css::uno::RuntimeException) { String aRet; String aStrStr = OUStringToString( aStr, CHARSET_SYSTEM ); @@ -337,7 +337,7 @@ OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount return StringToOUString( aRet, CHARSET_SYSTEM ); } -OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getDateString( const css::uno::Reference< css::beans::XPropertySet >& xCaller, double fValue ) throw(css::uno::RuntimeException) { uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" ); { @@ -361,7 +361,7 @@ OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Refer return L"**ERROR**"; } -sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const css::uno::Reference< css::table::XCellRange >& xRange ) throw(css::uno::RuntimeException) { uno::Reference<beans::XPropertySet> xProp( xRange, uno::UNO_QUERY ); if (xProp.is()) @@ -402,7 +402,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, return 0.0; // error } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL ScTestAddIn::transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL ScTestAddIn::transpose( const css::uno::Sequence< css::uno::Sequence< double > >& aMatrix ) throw(css::uno::RuntimeException) { long nRowCount = aMatrix.getLength(); long nColCount = 0; @@ -422,7 +422,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL ScTestAddIn::transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Sequence< sal_Int32 > > SAL_CALL ScTestAddIn::transposeInt( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aMatrix ) throw(css::uno::RuntimeException) { long nRowCount = aMatrix.getLength(); long nColCount = 0; @@ -442,7 +442,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, return aRet; } -OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const css::uno::Any& aFirst, const css::uno::Sequence< css::uno::Any >& aFollow ) throw(css::uno::RuntimeException) { String aSeparator; if ( !aFirst.hasValue() ) // not specified @@ -478,7 +478,7 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su return StringToOUString(aRet, CHARSET_SYSTEM); } -::com::sun::star::uno::Any SAL_CALL ScTestAddIn::getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Any SAL_CALL ScTestAddIn::getStrOrVal( sal_Int32 nFlag ) throw(css::uno::RuntimeException) { uno::Any aRet; @@ -504,7 +504,7 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su return aRet; } -::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(css::uno::RuntimeException) { String aStr = OUStringToString( aString, CHARSET_SYSTEM ); char c = (char) aStr; @@ -523,23 +523,23 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su } // XServiceName -OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(css::uno::RuntimeException) { return SCTESTADDIN_SERVICE; // name of specific AddIn service } // XServiceInfo -OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(css::uno::RuntimeException) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(css::uno::RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 04eab3b4d213..5ad56228b099 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -27,19 +27,19 @@ #include <cppuhelper/implbase.hxx> -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScTestAddIn_CreateInstance( - const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& ); +css::uno::Reference<css::uno::XInterface> ScTestAddIn_CreateInstance( + const css::uno::Reference<css::lang::XMultiServiceFactory>& ); class ScTestAddIn : public cppu::WeakImplHelper< - com::sun::star::sheet::XAddIn, + css::sheet::XAddIn, stardiv::starcalc::test::XTestAddIn, - com::sun::star::lang::XServiceName, - com::sun::star::lang::XServiceInfo > + css::lang::XServiceName, + css::lang::XServiceInfo > { private: - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xAlphaResult; //! Test - com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xNumResult; //! Test - com::sun::star::lang::Locale aFuncLoc; + css::uno::Reference<css::sheet::XVolatileResult> xAlphaResult; //! Test + css::uno::Reference<css::sheet::XVolatileResult> xNumResult; //! Test + css::lang::Locale aFuncLoc; public: ScTestAddIn(); @@ -51,40 +51,40 @@ public: // virtual XIdlClassRef getIdlClass(); static UString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(css::uno::RuntimeException); // XLocalizable - virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) throw(css::uno::RuntimeException); + virtual css::lang::Locale SAL_CALL getLocale( ) throw(css::uno::RuntimeException); // XTestAddIn - virtual sal_Int32 SAL_CALL countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL countParams( const css::uno::Sequence< css::uno::Any >& aArgs ) throw(css::uno::RuntimeException); + virtual double SAL_CALL addOne( double fValue ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDateString( const css::uno::Reference< css::beans::XPropertySet >& xCaller, double fValue ) throw(css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColorValue( const css::uno::Reference< css::table::XCellRange >& xRange ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL transpose( const css::uno::Sequence< css::uno::Sequence< double > >& aMatrix ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aMatrix ) throw(css::uno::RuntimeException); + virtual css::uno::Reference< css::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const css::uno::Any& aFirst, const css::uno::Sequence< css::uno::Any >& aFollow ) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(css::uno::RuntimeException); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); }; #endif diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 2bf201756b35..122c2c876433 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -62,7 +62,7 @@ ScAddInResult::~ScAddInResult() // XVolatileResult -void SAL_CALL ScAddInResult::addResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ScAddInResult::addResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException) { uno::Reference<sheet::XResultListener> *pObj = new uno::Reference<sheet::XResultListener>( aListener ); aListeners.Insert( pObj, aListeners.Count() ); @@ -75,7 +75,7 @@ void SAL_CALL ScAddInResult::addResultListener( const ::com::sun::star::uno::Ref } } -void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ScAddInResult::removeResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException) { acquire(); diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index e887ce69c1bb..7fd7ed989af2 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -30,8 +30,7 @@ typedef boost::ptr_vector<css::uno::Reference< css::sheet::XResultListener >*> XResultListenerArr_Impl; -class ScAddInResult : public cppu::WeakImplHelper< - com::sun::star::sheet::XVolatileResult> +class ScAddInResult : public cppu::WeakImplHelper< css::sheet::XVolatileResult> { private: String aArg; @@ -48,8 +47,8 @@ public: virtual ~ScAddInResult(); // XVolatileResult - virtual void SAL_CALL addResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException); + virtual void SAL_CALL removeResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException); }; #endif |