diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 09:14:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-03 13:38:44 +0200 |
| commit | 7dc5e8731fdc3a11ca429e717ec4a05e67ea1d21 (patch) | |
| tree | 104e82c3fdda21d4b33c4f427cee9023377b731f /dbaccess/source/ui | |
| parent | 5edd744d1021b41f59528a6e3a8adebfe63e6b6e (diff) | |
com::sun::star->css in dbaccess
Change-Id: I4fbdd3fb7d1e0ad4423148aaaed3a15aebb26d14
Diffstat (limited to 'dbaccess/source/ui')
187 files changed, 2466 insertions, 2469 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 38abcabf5f62..274bd3b98e39 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1510,7 +1510,7 @@ OApplicationView* OApplicationController::getContainer() const return static_cast< OApplicationView* >( getView() ); } -// ::com::sun::star::container::XContainerListener +// css::container::XContainerListener void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 776c51da9be5..195864b288b7 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -174,7 +174,7 @@ void OApplicationController::openDialog( const OUString& _sServiceName ) Sequence< Any > aArgs(3); sal_Int32 nArgPos = 0; - Reference< ::com::sun::star::awt::XWindow> xWindow = getTopMostContainerWindow(); + Reference< css::awt::XWindow> xWindow = getTopMostContainerWindow(); if ( !xWindow.is() ) { OSL_ENSURE( getContainer(), "OApplicationController::Construct: have no view!" ); @@ -657,7 +657,7 @@ bool OApplicationController::isRenameDeleteAllowed(ElementType _eType, bool _bDe return bEnabled; } -void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) +void OApplicationController::onLoadedMenu(const Reference< css::frame::XLayoutManager >& _xLayoutManager) { if ( _xLayoutManager.is() ) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 7dd979ea4a20..d7723afd2c58 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1036,7 +1036,7 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent) Reference<XCommandProcessor> xContent(_xContent,UNO_QUERY); if ( xContent.is() ) { - com::sun::star::ucb::Command aCommand; + css::ucb::Command aCommand; if ( m_ePreviewMode == E_DOCUMENT ) aCommand.Name = "preview"; else diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index b4219a36fb01..d6c73cfcd261 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -78,7 +78,7 @@ namespace dbaui class OAppDetailPageHelper : public vcl::Window { VclPtr<DBTreeListBox> m_pLists[ELEMENT_COUNT]; - OAppBorderWindow& m_rBorderWin; + OAppBorderWindow& m_rBorderWin; VclPtr<FixedLine> m_aFL; VclPtr<ToolBox> m_aTBPreview; VclPtr<Window> m_aBorder; @@ -87,13 +87,13 @@ namespace dbaui m_aDocumentInfo; VclPtr<vcl::Window> m_pTablePreview; ::std::unique_ptr<PopupMenu> m_aMenu; - PreviewMode m_ePreviewMode; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > - m_xFrame; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XPersist > - m_xDocInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > - m_xWindow; + PreviewMode m_ePreviewMode; + css::uno::Reference < css::frame::XFrame2 > + m_xFrame; + css::uno::Reference < css::io::XPersist > + m_xDocInfo; + css::uno::Reference< css::awt::XWindow > + m_xWindow; /// returns the index of the visible control int getVisibleControlIndex() const; @@ -120,7 +120,7 @@ namespace dbaui @param _pParent The parent of the entries to be inserted. */ - void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, + void fillNames( const css::uno::Reference< css::container::XNameAccess >& _xContainer, const ElementType _eType, const sal_uInt16 _nImageId, SvTreeListEntry* _pParent ); @@ -179,7 +179,7 @@ namespace dbaui @param _xConnection The connection to get the table names */ - void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + void createTablesPage(const css::uno::Reference< css::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. @param _eType @@ -187,7 +187,7 @@ namespace dbaui @param _xContainer The container of the elements to be inserted. */ - void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); + void createPage(ElementType _eType,const css::uno::Reference< css::container::XNameAccess >& _xContainer); /** returns the current visible tree list box */ @@ -219,21 +219,21 @@ namespace dbaui */ void describeCurrentSelectionForControl( const Control& _rControl, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** describes the current selection for the given ElementType */ void describeCurrentSelectionForType( const ElementType _eType, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** select all names on the currently selected container. Non existence names where ignored. * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); + void selectElements(const css::uno::Sequence< OUString>& _aNames); /** return the qualified name. @param _pEntry @@ -287,7 +287,7 @@ namespace dbaui */ SvTreeListEntry* elementAdded(ElementType eType ,const OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject ); + ,const css::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -332,7 +332,7 @@ namespace dbaui @param _xContent The content which must support the "preview" command. */ - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); + void showPreview(const css::uno::Reference< css::ucb::XContent >& _xContent); /** shows the Preview of a table or query @param _sDataSourceName diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 6405dc17f5e1..9e0bf5055922 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -169,7 +169,7 @@ namespace dbaui @param _xConnection The connection to get the table names */ - void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + void createTablesPage(const css::uno::Reference< css::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. @param _eType @@ -177,7 +177,7 @@ namespace dbaui @param _xContainer The container of the elements to be inserted. */ - void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); + void createPage(ElementType _eType,const css::uno::Reference< css::container::XNameAccess >& _xContainer); void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ); @@ -264,21 +264,21 @@ namespace dbaui */ void describeCurrentSelectionForControl( const Control& _rControl, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** describes the current selection for the given ElementType */ void describeCurrentSelectionForType( const ElementType _eType, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** select all names on the currently selected container. Non existence names where ignored. * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); + void selectElements(const css::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -292,7 +292,7 @@ namespace dbaui */ SvTreeListEntry* elementAdded(ElementType eType ,const OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject ); + ,const css::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -337,7 +337,7 @@ namespace dbaui @param _xContent The content which must support the "preview" command. */ - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); + void showPreview(const css::uno::Reference< css::ucb::XContent >& _xContent); /** shows the Preview of a table or query @param _sDataSourceName @@ -358,8 +358,8 @@ namespace dbaui private: void impl_createPage( ElementType _eType, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxNonTableElements + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::container::XNameAccess >& _rxNonTableElements ); const TaskPaneData& impl_getTaskPaneData( ElementType _eType ); diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 4c56fa87ba3f..1ce3a3f0e8e5 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -496,7 +496,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) } void OApplicationView::showPreview( const OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _sName, bool _bTable) { @@ -541,7 +541,7 @@ void OApplicationView::GetFocus() } } -void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) +void OApplicationView::_disposing( const css::lang::EventObject& /*_rSource*/ ) { if ( m_pWin && getDetailView() ) showPreview(NULL); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 41f30c85b99e..5392c030fafc 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -77,8 +77,8 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::lang::Locale m_aLocale; + css::uno::Reference< css::lang::XComponent > m_xObject; VclPtr<OAppBorderWindow> m_pWin; IApplicationController& m_rAppController; @@ -93,13 +93,13 @@ namespace dbaui virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; // OEventListenerAdapter - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: OApplicationView( vcl::Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& + ,const css::uno::Reference< css::uno::XComponentContext >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode ); @@ -117,7 +117,7 @@ namespace dbaui virtual void GetFocus() SAL_OVERRIDE; inline IApplicationController& getAppController() const { return m_rAppController; } - inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} + inline const css::lang::Locale& getLocale() const { return m_aLocale;} // IClipboardTest virtual bool isCutAllowed() SAL_OVERRIDE; @@ -197,21 +197,21 @@ namespace dbaui */ void describeCurrentSelectionForControl( const Control& _rControl, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** describes the current selection for the given ElementType */ void describeCurrentSelectionForType( const ElementType _eType, - ::com::sun::star::uno::Sequence< ::com::sun::star::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects + css::uno::Sequence< css::sdb::application::NamedDatabaseObject >& _out_rSelectedObjects ); /** select all names on the currently selected container. Non existence names where ignored. * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); + void selectElements(const css::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -225,7 +225,7 @@ namespace dbaui */ SvTreeListEntry* elementAdded(ElementType _eType ,const OUString& _rName - ,const ::com::sun::star::uno::Any& _rObject ); + ,const css::uno::Any& _rObject ); /** replaces a objects name with a new one @param _eType @@ -276,7 +276,7 @@ namespace dbaui @param _xContent The content which must support the "preview" command. */ - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); + void showPreview(const css::uno::Reference< css::ucb::XContent >& _xContent); /** shows the Preview of a table or query @param _sDataSourceName @@ -290,7 +290,7 @@ namespace dbaui @return void */ void showPreview( const OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _sName, bool _bTable); diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx index 8e17c4b07501..bfc48a23f60c 100644 --- a/dbaccess/source/ui/app/IApplicationController.hxx +++ b/dbaccess/source/ui/app/IApplicationController.hxx @@ -77,7 +77,7 @@ namespace dbaui virtual void previewChanged( sal_Int32 _nMode ) = 0; /// called when an object container of any kind was found during enumerating tree view elements - virtual void containerFound( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) = 0; + virtual void containerFound( const css::uno::Reference< css::container::XContainer >& _xContainer) = 0; protected: ~IApplicationController() {} diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 74a34e39178b..dd6237612bc1 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -37,7 +37,7 @@ namespace dbaui class OApplicationController; // SubComponentManager - typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > SubComponentManager_Base; class SubComponentManager : public SubComponentManager_Base { @@ -48,13 +48,13 @@ namespace dbaui void disposing(); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDatabaseDocumentUI helpers - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> > + css::uno::Sequence< css::uno::Reference< css::lang::XComponent> > getSubComponents() const; bool closeSubComponents(); @@ -63,7 +63,7 @@ namespace dbaui const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& + const css::uno::Reference< css::lang::XComponent >& _rxComponent ); bool empty() const; @@ -78,7 +78,7 @@ namespace dbaui const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_rComponent + css::uno::Reference< css::lang::XComponent >& o_rComponent ) const; /** closes all frames of the given component @@ -107,7 +107,7 @@ namespace dbaui <TRUE/> if and only if the component was found */ bool lookupSubComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent, + const css::uno::Reference< css::lang::XComponent >& i_rComponent, OUString& o_rName, sal_Int32& o_rComponentType ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 6647b0457747..1f05479f4727 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -113,7 +113,7 @@ using namespace ::svt; catch(SQLException& e) \ { \ SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \ - ::com::sun::star::sdb::SQLErrorEvent aEvent; \ + css::sdb::SQLErrorEvent aEvent; \ aEvent.Reason <<= aError; \ errorOccured(aEvent); \ } \ @@ -150,8 +150,8 @@ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyVal // (we can't derive from XFormController as it's base class is XTabController and the XTabController::getModel collides // with the XController::getModel implemented in our base class SbaXDataBrowserController) class SbaXDataBrowserController::FormControllerImpl - : public ::cppu::WeakAggImplHelper2< ::com::sun::star::form::runtime::XFormController, - ::com::sun::star::frame::XFrameActionListener > + : public ::cppu::WeakAggImplHelper2< css::form::runtime::XFormController, + css::frame::XFrameActionListener > { friend class SbaXDataBrowserController; ::cppu::OInterfaceContainerHelper m_aActivateListeners; @@ -161,82 +161,82 @@ public: explicit FormControllerImpl(SbaXDataBrowserController* pOwner); // XFormController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext >& _context ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild, base of XFormController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent, base of XFormController - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess, base of XFormController - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess, base of XIndexAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess, base of XElementAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster, base of XFormController - 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) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfirmDeleteBroadcaster, base of XFormController - virtual void SAL_CALL addConfirmDeleteListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeConfirmDeleteListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSQLErrorBroadcaster, base of XFormController - virtual void SAL_CALL addSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRowSetApproveBroadcaster, base of XFormController - virtual void SAL_CALL addRowSetApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDatabaseParameterBroadcaster2, base of XFormController - virtual void SAL_CALL addDatabaseParameterListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeDatabaseParameterListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDatabaseParameterBroadcaster, base of XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addParameterListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeParameterListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModeSelector, base of XFormController - virtual void SAL_CALL setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabController, base of XFormController - virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & _Container) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual ~FormControllerImpl(); @@ -260,17 +260,17 @@ Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormCo return FormOperations::createWithFormController( m_pOwner->m_xContext, this ); } -Reference< ::com::sun::star::awt::XControl > SbaXDataBrowserController::FormControllerImpl::getCurrentControl() throw( RuntimeException, std::exception ) +Reference< css::awt::XControl > SbaXDataBrowserController::FormControllerImpl::getCurrentControl() throw( RuntimeException, std::exception ) { - return m_pOwner->getBrowserView() ? m_pOwner->getBrowserView()->getGridControl() : Reference< ::com::sun::star::awt::XControl > (); + return m_pOwner->getBrowserView() ? m_pOwner->getBrowserView()->getGridControl() : Reference< css::awt::XControl > (); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addActivateListener(const Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addActivateListener(const Reference< css::form::XFormControllerListener > & l) throw( RuntimeException, std::exception ) { m_aActivateListeners.addInterface(l); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListener(const Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListener(const Reference< css::form::XFormControllerListener > & l) throw( RuntimeException, std::exception ) { m_aActivateListeners.removeInterface(l); } @@ -440,36 +440,36 @@ sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( c return aMode == "DataMode"; } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< css::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException, std::exception ) { SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !"); } -Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel() throw( RuntimeException, std::exception ) +Reference< css::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel() throw( RuntimeException, std::exception ) { return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< ::com::sun::star::awt::XControlContainer > & /*_Container*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< css::awt::XControlContainer > & /*_Container*/) throw( RuntimeException, std::exception ) { SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !"); } -Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer() throw( RuntimeException, std::exception ) +Reference< css::awt::XControlContainer > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) return m_pOwner->getBrowserView()->getContainer(); - return Reference< ::com::sun::star::awt::XControlContainer > (); + return Reference< css::awt::XControlContainer > (); } -Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls() throw( RuntimeException, std::exception ) +Sequence< Reference< css::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) { - Reference< ::com::sun::star::awt::XControl > xGrid = m_pOwner->getBrowserView()->getGridControl(); - return Sequence< Reference< ::com::sun::star::awt::XControl > >(&xGrid, 1); + Reference< css::awt::XControl > xGrid = m_pOwner->getBrowserView()->getGridControl(); + return Sequence< Reference< css::awt::XControl > >(&xGrid, 1); } - return Sequence< Reference< ::com::sun::star::awt::XControl > >(); + return Sequence< Reference< css::awt::XControl > >(); } void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder() throw( RuntimeException, std::exception ) @@ -494,11 +494,11 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast() thro m_pOwner->getBrowserView()->getVclControl()->ActivateCell(); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::frameAction(const ::com::sun::star::frame::FrameActionEvent& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::frameAction(const css::frame::FrameActionEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) { // nothing to do // we don't add ourself as listener to any broadcasters, so we are not resposible for removing us @@ -531,7 +531,7 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw return aRet; } -SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun::star::uno::XComponentContext >& _rM) +SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::XComponentContext >& _rM) :SbaXDataBrowserController_Base(_rM) ,m_nRowSetPrivileges(0) ,m_pClipbordNotifier( NULL ) @@ -686,7 +686,7 @@ bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoa void SbaXDataBrowserController::initFormatter() { // create a formatter working with the connections format supplier - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); + Reference< css::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); if(xSupplier.is()) { @@ -750,7 +750,7 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) // marry them - Reference< ::com::sun::star::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY); + Reference< css::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY); { OUString sText(ModuleRes(STR_DATASOURCE_GRIDCONTROL_NAME)); xNameCont->insertByName(OUString(sText), makeAny(m_xGridModel)); @@ -815,16 +815,16 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) xFormSet->addPropertyChangeListener(PROPERTY_HAVING_CLAUSE, static_cast<XPropertyChangeListener*>(this)); xFormSet->addPropertyChangeListener(PROPERTY_APPLYFILTER, static_cast<XPropertyChangeListener*>(this)); } - Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); + Reference< css::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) - xFormError->addSQLErrorListener(static_cast<com::sun::star::sdb::XSQLErrorListener*>(this)); + xFormError->addSQLErrorListener(static_cast<css::sdb::XSQLErrorListener*>(this)); if (m_xLoadable.is()) m_xLoadable->addLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) - xFormParameter->addParameterListener(static_cast<com::sun::star::form::XDatabaseParameterListener*>(this)); + xFormParameter->addParameterListener(static_cast<css::form::XDatabaseParameterListener*>(this)); addModelListeners(getControlModel()); addControlListeners(getBrowserView()->getGridControl()); @@ -855,26 +855,26 @@ Reference< XRowSet > SbaXDataBrowserController::CreateForm() UNO_QUERY); } -Reference< ::com::sun::star::form::XFormComponent > SbaXDataBrowserController::CreateGridModel() +Reference< css::form::XFormComponent > SbaXDataBrowserController::CreateGridModel() { - return Reference< ::com::sun::star::form::XFormComponent > ( + return Reference< css::form::XFormComponent > ( getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.GridControl", getORB()), UNO_QUERY); } -void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) +void SbaXDataBrowserController::addModelListeners(const Reference< css::awt::XControlModel > & _xGridControlModel) { // ... all the grid columns addColumnListeners(_xGridControlModel); // (we are interested in all columns the grid has (and only in these) so we have to listen to the container, too) - Reference< ::com::sun::star::container::XContainer > xColContainer(_xGridControlModel, UNO_QUERY); + Reference< css::container::XContainer > xColContainer(_xGridControlModel, UNO_QUERY); if (xColContainer.is()) - xColContainer->addContainerListener(static_cast<com::sun::star::container::XContainerListener*>(this)); + xColContainer->addContainerListener(static_cast<css::container::XContainerListener*>(this)); - Reference< ::com::sun::star::form::XReset > xReset(_xGridControlModel, UNO_QUERY); + Reference< css::form::XReset > xReset(_xGridControlModel, UNO_QUERY); if (xReset.is()) - xReset->addResetListener(static_cast<com::sun::star::form::XResetListener*>(this)); + xReset->addResetListener(static_cast<css::form::XResetListener*>(this)); } void SbaXDataBrowserController::removeModelListeners(const Reference< XControlModel > & _xGridControlModel) @@ -900,7 +900,7 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo xReset->removeResetListener( this ); } -void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl) +void SbaXDataBrowserController::addControlListeners(const Reference< css::awt::XControl > & _xGridControl) { // to ge the 'modified' for the current cell Reference< XModifyBroadcaster > xBroadcaster(getBrowserView()->getGridControl(), UNO_QUERY); @@ -918,7 +918,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun: xWindow->addFocusListener(this); } -void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl) +void SbaXDataBrowserController::removeControlListeners(const Reference< css::awt::XControl > & _xGridControl) { Reference< XModifyBroadcaster > xBroadcaster(_xGridControl, UNO_QUERY); if (xBroadcaster.is()) @@ -975,17 +975,17 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::focusLost : why is my control not commitable ?"); } -void SbaXDataBrowserController::disposingGridControl(const ::com::sun::star::lang::EventObject& /*Source*/) +void SbaXDataBrowserController::disposingGridControl(const css::lang::EventObject& /*Source*/) { removeControlListeners(getBrowserView()->getGridControl()); } -void SbaXDataBrowserController::disposingGridModel(const ::com::sun::star::lang::EventObject& /*Source*/) +void SbaXDataBrowserController::disposingGridModel(const css::lang::EventObject& /*Source*/) { removeModelListeners(getControlModel()); } -void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang::EventObject& Source) +void SbaXDataBrowserController::disposingFormModel(const css::lang::EventObject& Source) { Reference< XPropertySet > xSourceSet(Source.Source, UNO_QUERY); if (xSourceSet.is()) @@ -1000,19 +1000,19 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang: xSourceSet->removePropertyChangeListener(PROPERTY_APPLYFILTER, static_cast<XPropertyChangeListener*>(this)); } - Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(Source.Source, UNO_QUERY); + Reference< css::sdb::XSQLErrorBroadcaster > xFormError(Source.Source, UNO_QUERY); if (xFormError.is()) - xFormError->removeSQLErrorListener(static_cast<com::sun::star::sdb::XSQLErrorListener*>(this)); + xFormError->removeSQLErrorListener(static_cast<css::sdb::XSQLErrorListener*>(this)); if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); if (xFormParameter.is()) - xFormParameter->removeParameterListener(static_cast<com::sun::star::form::XDatabaseParameterListener*>(this)); + xFormParameter->removeParameterListener(static_cast<css::form::XDatabaseParameterListener*>(this)); } -void SbaXDataBrowserController::disposingColumnModel(const ::com::sun::star::lang::EventObject& Source) +void SbaXDataBrowserController::disposingColumnModel(const css::lang::EventObject& Source) { RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY)); } @@ -1031,7 +1031,7 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt // is it the grid control ? if (getBrowserView()) { - Reference< ::com::sun::star::awt::XControl > xSourceControl(Source.Source, UNO_QUERY); + Reference< css::awt::XControl > xSourceControl(Source.Source, UNO_QUERY); if (xSourceControl == getBrowserView()->getGridControl()) disposingGridControl(Source); } @@ -1118,12 +1118,12 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t } } -void SbaXDataBrowserController::modified(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::modified(const css::lang::EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { setCurrentModified( true ); } -void SbaXDataBrowserController::elementInserted(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::elementInserted(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementInserted: where did this come from (not from the grid model)?!"); @@ -1132,7 +1132,7 @@ void SbaXDataBrowserController::elementInserted(const ::com::sun::star::containe AddColumnListener(xNewColumn); } -void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::elementRemoved(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementRemoved: where did this come from (not from the grid model)?!"); @@ -1141,7 +1141,7 @@ void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container RemoveColumnListener(xOldColumn); } -void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::elementReplaced(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception ) { OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(), "SbaXDataBrowserController::elementReplaced: where did this come from (not from the grid model)?!"); @@ -1183,16 +1183,16 @@ void SbaXDataBrowserController::disposing() xFormSet->removePropertyChangeListener(PROPERTY_APPLYFILTER, static_cast<XPropertyChangeListener*>(this)); } - Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); + Reference< css::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) - xFormError->removeSQLErrorListener(static_cast<com::sun::star::sdb::XSQLErrorListener*>(this)); + xFormError->removeSQLErrorListener(static_cast<css::sdb::XSQLErrorListener*>(this)); if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) - xFormParameter->removeParameterListener(static_cast<com::sun::star::form::XDatabaseParameterListener*>(this)); + xFormParameter->removeParameterListener(static_cast<css::form::XDatabaseParameterListener*>(this)); removeModelListeners(getControlModel()); @@ -1231,7 +1231,7 @@ void SbaXDataBrowserController::disposing() // don't dispose, just reset - it's owned by the RowSet } -void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1277,7 +1277,7 @@ IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError ) return 0L; } -void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1297,7 +1297,7 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr } } -sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception ) +sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception ) { if (aEvent.Source != getRowSet()) { @@ -1306,7 +1306,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for return sal_True; } - Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; + Reference< css::container::XIndexAccess > xParameters = aEvent.Parameters; SolarMutexGuard aSolarGuard; // default handling: instantiate an interaction handler and let it handle the parameter request @@ -1372,19 +1372,19 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for return sal_True; } -sal_Bool SbaXDataBrowserController::approveReset(const ::com::sun::star::lang::EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +sal_Bool SbaXDataBrowserController::approveReset(const css::lang::EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { return sal_True; } -void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( RuntimeException, std::exception ) +void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) throw( RuntimeException, std::exception ) { OSL_ENSURE(rEvent.Source == getControlModel(), "SbaXDataBrowserController::resetted : where did this come from ?"); (void)rEvent; setCurrentModified( false ); } -sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) +sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { if (ScopedVclPtrInstance<MessageDialog>::Create(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO)->Execute() != RET_YES) return sal_False; @@ -1572,9 +1572,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; // no datasource -> no edit mode sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES)); - bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowInserts")); - bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowUpdates")); - bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowDeletes")); + bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & css::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowInserts")); + bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & css::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowUpdates")); + bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & css::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue("AllowDeletes")); if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible) break; // no insert/update/delete -> no edit mode @@ -1760,7 +1760,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter) Reference< XSingleSelectQueryComposer > xParser = createParser_nothrow(); try { - Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSup = getColumnsSupplier(); + Reference< css::sdbcx::XColumnsSupplier> xSup = getColumnsSupplier(); Reference< XConnection> xCon(xFormSet->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); if(bFilter) { @@ -1813,11 +1813,11 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(bool bFilter) void SbaXDataBrowserController::ExecuteSearch() { // calculate the control source of the active field - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); - OSL_ENSURE(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !"); + Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + OSL_ENSURE(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an css::form::XGrid interface !"); - Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); - Reference< ::com::sun::star::container::XIndexContainer > xColumns = xGridPeer->getColumns(); + Reference< css::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< css::container::XIndexContainer > xColumns = xGridPeer->getColumns(); OSL_ENSURE(xGridPeer.is() && xColumns.is(), "SbaXDataBrowserController::ExecuteSearch : invalid peer !"); sal_Int16 nViewCol = xGrid->getCurrentColumnPosition(); @@ -1828,7 +1828,7 @@ void SbaXDataBrowserController::ExecuteSearch() // the text within the current cell OUString sInitialText; - Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); + Reference< css::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY); OUString aInitialText; if (IsSearchableControl(xCurControl, &aInitialText)) @@ -1841,7 +1841,7 @@ void SbaXDataBrowserController::ExecuteSearch() xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(true)); xModelSet->setPropertyValue("CursorColor", makeAny(sal_Int32(COL_LIGHTRED))); - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); + Reference< css::util::XNumberFormatsSupplier > xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB())); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractFmSearchDialog* pDialog = NULL; @@ -2027,7 +2027,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property OUString sName; xField->getPropertyValue(PROPERTY_NAME) >>= sName; Reference< XColumnsSupplier > xColumnsSupplier(m_xParser, UNO_QUERY); - Reference< ::com::sun::star::container::XNameAccess > xCols = xColumnsSupplier.is() ? xColumnsSupplier->getColumns() : Reference< ::com::sun::star::container::XNameAccess > (); + Reference< css::container::XNameAccess > xCols = xColumnsSupplier.is() ? xColumnsSupplier->getColumns() : Reference< css::container::XNameAccess > (); if ( xCols.is() && xCols->hasByName(sName) ) { Reference<XPropertySet> xProp(xCols->getByName(sName),UNO_QUERY); @@ -2152,7 +2152,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property xCursor->cancelRowUpdates(); // restore the grids state - Reference< ::com::sun::star::form::XReset > xReset(getControlModel(), UNO_QUERY); + Reference< css::form::XReset > xReset(getControlModel(), UNO_QUERY); if (xReset.is()) xReset->reset(); } @@ -2222,15 +2222,15 @@ bool SbaXDataBrowserController::CommitCurrent() if (!getBrowserView()) return true; - Reference< ::com::sun::star::awt::XControl > xActiveControl(getBrowserView()->getGridControl()); - Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); + Reference< css::awt::XControl > xActiveControl(getBrowserView()->getGridControl()); + Reference< css::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); if (xActiveControl.is() && !bControlIsLocked) { // zunaechst das Control fragen ob es das IFace unterstuetzt - Reference< ::com::sun::star::form::XBoundComponent > xBoundControl(xActiveControl, UNO_QUERY); + Reference< css::form::XBoundComponent > xBoundControl(xActiveControl, UNO_QUERY); if (!xBoundControl.is()) - xBoundControl = Reference< ::com::sun::star::form::XBoundComponent > (xActiveControl->getModel(), UNO_QUERY); + xBoundControl = Reference< css::form::XBoundComponent > (xActiveControl->getModel(), UNO_QUERY); if (xBoundControl.is() && !xBoundControl->commit()) return false; } @@ -2306,7 +2306,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n // get the current column from the grid if (nViewPos == (sal_uInt16)-1) { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); if (!xGrid.is()) return xEmptyReturn; nViewPos = xGrid->getCurrentColumnPosition(); @@ -2316,7 +2316,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n return xEmptyReturn; // get the according column from the model - Reference< ::com::sun::star::container::XIndexContainer > xCols(getControlModel(), UNO_QUERY); + Reference< css::container::XIndexContainer > xCols(getControlModel(), UNO_QUERY); Reference< XPropertySet > xCurrentCol(xCols->getByIndex(nCurrentCol),UNO_QUERY); if (!xCurrentCol.is()) return xEmptyReturn; @@ -2327,10 +2327,10 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext) { - Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< css::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); // check all grid columns for their control source - Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); + Reference< css::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); OSL_ENSURE(xModelColumns.is(), "SbaXDataBrowserController::OnSearchContextRequest : there is a grid control without columns !"); // the case 'no columns' should be indicated with an empty container, I think ... OSL_ENSURE(xModelColumns->getCount() >= xPeerContainer->getCount(), "SbaXDataBrowserController::OnSearchContextRequest : impossible : have more view than model columns !"); @@ -2373,7 +2373,7 @@ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, p IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pInfo) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : xCursor is empty"); // move the cursor @@ -2387,7 +2387,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn xModelSet->setPropertyValue("DisplayIsSynchron", aOld); // and move to the field - Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< css::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); sal_uInt16 nViewPos; for ( nViewPos = 0; nViewPos < aColumnControls->getCount(); ++nViewPos ) @@ -2402,7 +2402,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn } } - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); xGrid->setCurrentColumnPosition(nViewPos); return 0; @@ -2410,7 +2410,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation*, pInfo) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); try { @@ -2580,7 +2580,7 @@ bool SbaXDataBrowserController::isValidCursor() const { if (!m_xColumnsSupplier.is()) return false; - Reference< ::com::sun::star::container::XNameAccess > xCols = m_xColumnsSupplier->getColumns(); + Reference< css::container::XNameAccess > xCols = m_xColumnsSupplier->getColumns(); if (!xCols.is() || !xCols->hasElements()) return false; @@ -2599,7 +2599,7 @@ bool SbaXDataBrowserController::isValidCursor() const sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; try { @@ -2612,7 +2612,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); try { if ( -1 != _nPos ) @@ -2623,22 +2623,22 @@ void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) void SbaXDataBrowserController::BeforeDrop() { - Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); + Reference< css::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) - xFormError->removeSQLErrorListener(static_cast<com::sun::star::sdb::XSQLErrorListener*>(this)); + xFormError->removeSQLErrorListener(static_cast<css::sdb::XSQLErrorListener*>(this)); } void SbaXDataBrowserController::AfterDrop() { - Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); + Reference< css::sdb::XSQLErrorBroadcaster > xFormError(getRowSet(), UNO_QUERY); if (xFormError.is()) - xFormError->addSQLErrorListener(static_cast<com::sun::star::sdb::XSQLErrorListener*>(this)); + xFormError->addSQLErrorListener(static_cast<css::sdb::XSQLErrorListener*>(this)); } -void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) +void SbaXDataBrowserController::addColumnListeners(const Reference< css::awt::XControlModel > & _xGridControlModel) { // ... all the grid columns - Reference< ::com::sun::star::container::XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY); + Reference< css::container::XIndexContainer > xColumns(_xGridControlModel, UNO_QUERY); if (xColumns.is()) { sal_Int32 nCount = xColumns->getCount(); @@ -2650,7 +2650,7 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun:: } } -bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & /*xGrid*/) +bool SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/) { return true; } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index c49f99f502da..f702fe55c1c6 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -46,7 +46,7 @@ namespace { bool bGrabFocus = false; SbaGridControl* pVclControl = _pView->getVclControl(); - Reference< ::com::sun::star::awt::XControl > xGrid = _pView->getGridControl(); + Reference< css::awt::XControl > xGrid = _pView->getGridControl(); if (pVclControl && xGrid.is()) { bGrabFocus = true; @@ -67,7 +67,7 @@ namespace UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent, IController& _rController, - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) + const Reference< css::uno::XComponentContext >& _rxContext) :ODataView(pParent,_rController,_rxContext) ,m_pTreeView(NULL) ,m_pSplitter(NULL) @@ -77,7 +77,7 @@ UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent, } -void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XControlModel >& xModel) +void UnoDataBrowserView::Construct(const Reference< css::awt::XControlModel >& xModel) { try { @@ -92,14 +92,14 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont // in design mode (for the moment) m_xGrid->setDesignMode(sal_True); - Reference< ::com::sun::star::awt::XWindow > xGridWindow(m_xGrid, UNO_QUERY); + Reference< css::awt::XWindow > xGridWindow(m_xGrid, UNO_QUERY); xGridWindow->setVisible(sal_True); xGridWindow->setEnable(sal_True); // introduce the model to the grid m_xGrid->setModel(xModel); // introduce the container (me) to the grid - Reference< ::com::sun::star::beans::XPropertySet > xModelSet(xModel, UNO_QUERY); + Reference< css::beans::XPropertySet > xModelSet(xModel, UNO_QUERY); getContainer()->addControl(::comphelper::getString(xModelSet->getPropertyValue(PROPERTY_NAME)), m_xGrid); // get the VCL-control @@ -235,10 +235,10 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) } // set the size of grid control - Reference< ::com::sun::star::awt::XWindow > xGridAsWindow(m_xGrid, UNO_QUERY); + Reference< css::awt::XWindow > xGridAsWindow(m_xGrid, UNO_QUERY); if (xGridAsWindow.is()) xGridAsWindow->setPosSize( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(), - aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height(), ::com::sun::star::awt::PosSize::POSSIZE); + aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height(), css::awt::PosSize::POSSIZE); // just for completeness: there is no space left, we occupied it all ... _rPlayground.SetPos( _rPlayground.BottomRight() ); @@ -257,7 +257,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const OSL_ENSURE(m_xGrid.is(),"Grid not set!"); if ( m_xGrid.is() ) { - Reference< ::com::sun::star::awt::XWindowPeer > xPeer = m_xGrid->getPeer(); + Reference< css::awt::XWindowPeer > xPeer = m_xGrid->getPeer(); if ( xPeer.is() ) { SbaXGridPeer* pPeer = SbaXGridPeer::getImplementation(xPeer); @@ -292,7 +292,7 @@ void UnoDataBrowserView::GetFocus() } } -void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) +void UnoDataBrowserView::_disposing( const css::lang::EventObject& /*_rSource*/ ) { stopComponentListening(Reference<XComponent>(VCLUnoHelper::GetInterface(m_pVclControl),UNO_QUERY)); m_pVclControl = NULL; diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index cbdbdadd304c..373ca72e7f98 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -134,7 +134,7 @@ namespace dbaui osl_atomic_decrement( &m_refCount ); } - bool ODataClipboard::WriteObject( ::tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) + bool ODataClipboard::WriteObject( ::tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& /*rFlavor*/ ) { if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML ) { @@ -209,7 +209,7 @@ namespace dbaui ODataAccessObjectTransferable::ObjectReleased( ); } - void SAL_CALL ODataClipboard::disposing( const ::com::sun::star::lang::EventObject& i_rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODataClipboard::disposing( const css::lang::EventObject& i_rSource ) throw (css::uno::RuntimeException, std::exception) { ODataAccessDescriptor& rDescriptor( getDescriptor() ); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 88e0f7fed45f..cb9ccaa4a35b 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -84,13 +84,13 @@ public: return OUString("org.openoffice.comp.dbu.DBContentLoader"); } static Sequence< OUString> getSupportedServiceNames_Static() throw( ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XLoader virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, const Sequence< PropertyValue >& _rArgs, - const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; }; @@ -145,7 +145,7 @@ Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL, const Sequence< PropertyValue >& rArgs, - const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) + const Reference< XLoadEventListener > & rListener) throw(css::uno::RuntimeException, std::exception) { m_xFrame = rFrame; m_xListener = rListener; diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index e188bbdd6bc7..0681b6198f10 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -41,10 +41,10 @@ namespace dbaui struct DBTreeListUserData { /// if the entry denotes a table or query, this is the respective UNO object - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > xObjectProperties; /// if the entry denotes a object container, this is the UNO interface for this container - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xContainer; /// if the entry denotes a data source, this is the connection for this data source (if already connection) SharedConnection xConnection; diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 0ca318147fe3..4a4efbcfa31a 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -53,13 +53,13 @@ Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw Any aRet = SbaXDataBrowserController::queryInterface(_rType); if(!aRet.hasValue()) aRet = ::cppu::queryInterface(_rType, - static_cast<com::sun::star::util::XModifyBroadcaster*>(this), - static_cast<com::sun::star::form::XLoadListener*>(this)); + static_cast<css::util::XModifyBroadcaster*>(this), + static_cast<css::form::XLoadListener*>(this)); return aRet; } -SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< ::com::sun::star::uno::XComponentContext >& _rM) +SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< css::uno::XComponentContext >& _rM) :SbaXDataBrowserController(_rM) ,m_aModifyListeners(getMutex()) ,m_pDataSourceImpl(NULL) @@ -118,26 +118,26 @@ bool SbaExternalSourceBrowser::LoadForm() return true; } -void SbaExternalSourceBrowser::modified(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException, std::exception ) +void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent) throw( RuntimeException, std::exception ) { SbaXDataBrowserController::modified(aEvent); // multiplex this event to all my listeners - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); ::cppu::OInterfaceIteratorHelper aIt(m_aModifyListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::util::XModifyListener*>(aIt.next())->modified(aEvt); + static_cast< css::util::XModifyListener*>(aIt.next())->modified(aEvt); } -void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, const Sequence< css::beans::PropertyValue>& aArgs) throw(css::uno::RuntimeException, std::exception) { - const ::com::sun::star::beans::PropertyValue* pArguments = aArgs.getConstArray(); + const css::beans::PropertyValue* pArguments = aArgs.getConstArray(); if ( aURL.Complete == ".uno:FormSlots/AddGridColumn" ) { // search the argument describing the column to create OUString sControlType; sal_Int32 nControlPos = -1; - Sequence< ::com::sun::star::beans::PropertyValue> aControlProps; + Sequence< css::beans::PropertyValue> aControlProps; sal_uInt16 i; for ( i = 0; i < aArgs.getLength(); ++i, ++pArguments ) { @@ -157,10 +157,10 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U } else if ( pArguments->Name == "ColumnProperties" ) { - bool bCorrectType = pArguments->Value.getValueType().equals(cppu::UnoType<Sequence< ::com::sun::star::beans::PropertyValue>>::get()); + bool bCorrectType = pArguments->Value.getValueType().equals(cppu::UnoType<Sequence< css::beans::PropertyValue>>::get()); OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnProperties\" !"); if (bCorrectType) - aControlProps = *static_cast<Sequence< ::com::sun::star::beans::PropertyValue> const *>(pArguments->Value.getValue()); + aControlProps = *static_cast<Sequence< css::beans::PropertyValue> const *>(pArguments->Value.getValue()); } else SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (" << pArguments->Name << ") !"); @@ -173,15 +173,15 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U OSL_ENSURE(aControlProps.getLength(), "SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument (ColumnProperties) !"); // create the col - Reference< ::com::sun::star::form::XGridColumnFactory > xColFactory(getControlModel(), UNO_QUERY); - Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); + Reference< css::form::XGridColumnFactory > xColFactory(getControlModel(), UNO_QUERY); + Reference< css::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType); Reference< XPropertySetInfo > xNewColProperties; if (xNewCol.is()) xNewColProperties = xNewCol->getPropertySetInfo(); // set its properties if (xNewColProperties.is()) { - const ::com::sun::star::beans::PropertyValue* pControlProps = aControlProps.getConstArray(); + const css::beans::PropertyValue* pControlProps = aControlProps.getConstArray(); for (i=0; i<aControlProps.getLength(); ++i, ++pControlProps) { try @@ -197,7 +197,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U } // correct the position - Reference< ::com::sun::star::container::XIndexContainer > xColContainer(getControlModel(), UNO_QUERY); + Reference< css::container::XIndexContainer > xColContainer(getControlModel(), UNO_QUERY); if (nControlPos > xColContainer->getCount()) nControlPos = xColContainer->getCount(); @@ -238,9 +238,9 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U SbaXDataBrowserController::dispatch(aURL, aArgs); } -Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrowser::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > SAL_CALL SbaExternalSourceBrowser::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatch > xReturn; + Reference< css::frame::XDispatch > xReturn; if (m_bInQueryDispatch) return xReturn; @@ -253,7 +253,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows || ( aURL.Complete == ".uno:FormSlots/ClearView" ) // clear the grid ) - xReturn = static_cast<com::sun::star::frame::XDispatch*>(this); + xReturn = static_cast<css::frame::XDispatch*>(this); if ( !xReturn.is() && ( (aURL.Complete == ".uno:FormSlots/moveToFirst" ) || (aURL.Complete == ".uno:FormSlots/moveToPrev" ) @@ -262,10 +262,10 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows ) ) { - OSL_ENSURE(aURL.Mark.isEmpty(), "SbaExternalSourceBrowser::queryDispatch : the ::com::sun::star::util::URL shouldn't have a mark !"); - ::com::sun::star::util::URL aNewUrl = aURL; + OSL_ENSURE(aURL.Mark.isEmpty(), "SbaExternalSourceBrowser::queryDispatch : the css::util::URL shouldn't have a mark !"); + css::util::URL aNewUrl = aURL; - // split the ::com::sun::star::util::URL + // split the css::util::URL OSL_ENSURE( m_xUrlTransformer.is(), "SbaExternalSourceBrowser::queryDispatch : could not create an URLTransformer !" ); if ( m_xUrlTransformer.is() ) m_xUrlTransformer->parseStrict( aNewUrl ); @@ -294,7 +294,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows void SAL_CALL SbaExternalSourceBrowser::disposing() { // say our modify listeners goodbye - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = static_cast<XWeak*>(this); m_aModifyListeners.disposeAndClear(aEvt); @@ -303,17 +303,17 @@ void SAL_CALL SbaExternalSourceBrowser::disposing() SbaXDataBrowserController::disposing(); } -void SAL_CALL SbaExternalSourceBrowser::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaExternalSourceBrowser::addModifyListener(const Reference< css::util::XModifyListener > & aListener) throw( RuntimeException, std::exception ) { m_aModifyListeners.addInterface(aListener); } -void SAL_CALL SbaExternalSourceBrowser::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaExternalSourceBrowser::removeModifyListener(const Reference< css::util::XModifyListener > & aListener) throw( RuntimeException, std::exception ) { m_aModifyListeners.removeInterface(aListener); } -void SAL_CALL SbaExternalSourceBrowser::unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException, std::exception ) +void SAL_CALL SbaExternalSourceBrowser::unloading(const css::lang::EventObject& aEvent) throw( RuntimeException, std::exception ) { if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == aEvent.Source)) { @@ -402,12 +402,12 @@ void SbaExternalSourceBrowser::ClearView() Attach(Reference< XRowSet > ()); // clear all cols in the grid - Reference< ::com::sun::star::container::XIndexContainer > xColContainer(getControlModel(), UNO_QUERY); + Reference< css::container::XIndexContainer > xColContainer(getControlModel(), UNO_QUERY); while (xColContainer->getCount() > 0) xColContainer->removeByIndex(0); } -void SAL_CALL SbaExternalSourceBrowser::disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException, std::exception ) +void SAL_CALL SbaExternalSourceBrowser::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception ) { if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == Source.Source)) { @@ -421,8 +421,8 @@ void SbaExternalSourceBrowser::startListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); - xLoadable->addLoadListener(static_cast<com::sun::star::form::XLoadListener*>(this)); + Reference< css::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + xLoadable->addLoadListener(static_cast<css::form::XLoadListener*>(this)); } } @@ -430,8 +430,8 @@ void SbaExternalSourceBrowser::stopListening() { if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is()) { - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); - xLoadable->removeLoadListener(static_cast<com::sun::star::form::XLoadListener*>(this)); + Reference< css::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY); + xLoadable->removeLoadListener(static_cast<css::form::XLoadListener*>(this)); } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index b695f818feb9..75f851acabc7 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -91,87 +91,87 @@ Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType) throw (RuntimeE void SbaXFormAdapter::StopListening() { // log off all our multiplexers - STOP_MULTIPLEXER_LISTENING(LoadListener, m_aLoadListeners, ::com::sun::star::form::XLoadable, m_xMainForm); - STOP_MULTIPLEXER_LISTENING(RowSetListener, m_aRowSetListeners, ::com::sun::star::sdbc::XRowSet, m_xMainForm); - STOP_MULTIPLEXER_LISTENING(RowSetApproveListener, m_aRowSetApproveListeners, ::com::sun::star::sdb::XRowSetApproveBroadcaster, m_xMainForm); - STOP_MULTIPLEXER_LISTENING(SQLErrorListener, m_aErrorListeners, ::com::sun::star::sdb::XSQLErrorBroadcaster, m_xMainForm); - STOP_MULTIPLEXER_LISTENING(SubmitListener, m_aSubmitListeners, ::com::sun::star::form::XSubmit, m_xMainForm); - STOP_MULTIPLEXER_LISTENING(ResetListener, m_aResetListeners, ::com::sun::star::form::XReset, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(LoadListener, m_aLoadListeners, css::form::XLoadable, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(RowSetListener, m_aRowSetListeners, css::sdbc::XRowSet, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(RowSetApproveListener, m_aRowSetApproveListeners, css::sdb::XRowSetApproveBroadcaster, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(SQLErrorListener, m_aErrorListeners, css::sdb::XSQLErrorBroadcaster, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(SubmitListener, m_aSubmitListeners, css::form::XSubmit, m_xMainForm); + STOP_MULTIPLEXER_LISTENING(ResetListener, m_aResetListeners, css::form::XReset, m_xMainForm); if (m_aParameterListeners.getLength()) { - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->removeParameterListener(&m_aParameterListeners); } - STOP_PROPERTY_MULTIPLEXER_LISTENING(PropertyChangeListener, m_aPropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); - STOP_PROPERTY_MULTIPLEXER_LISTENING(VetoableChangeListener, m_aVetoablePropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); + STOP_PROPERTY_MULTIPLEXER_LISTENING(PropertyChangeListener, m_aPropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); + STOP_PROPERTY_MULTIPLEXER_LISTENING(VetoableChangeListener, m_aVetoablePropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); if (m_aPropertiesChangeListeners.getLength()) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->removePropertiesChangeListener(&m_aPropertiesChangeListeners); } // log off ourself - Reference< ::com::sun::star::lang::XComponent > xComp(m_xMainForm, UNO_QUERY); + Reference< css::lang::XComponent > xComp(m_xMainForm, UNO_QUERY); if (xComp.is()) - xComp->removeEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<com::sun::star::beans::XPropertyChangeListener*>(this))); + xComp->removeEventListener(static_cast<css::lang::XEventListener*>(static_cast<css::beans::XPropertyChangeListener*>(this))); } void SbaXFormAdapter::StartListening() { // log off all our multiplexers - START_MULTIPLEXER_LISTENING(LoadListener, m_aLoadListeners, ::com::sun::star::form::XLoadable, m_xMainForm); - START_MULTIPLEXER_LISTENING(RowSetListener, m_aRowSetListeners, ::com::sun::star::sdbc::XRowSet, m_xMainForm); - START_MULTIPLEXER_LISTENING(RowSetApproveListener, m_aRowSetApproveListeners, ::com::sun::star::sdb::XRowSetApproveBroadcaster, m_xMainForm); - START_MULTIPLEXER_LISTENING(SQLErrorListener, m_aErrorListeners, ::com::sun::star::sdb::XSQLErrorBroadcaster, m_xMainForm); - START_MULTIPLEXER_LISTENING(SubmitListener, m_aSubmitListeners, ::com::sun::star::form::XSubmit, m_xMainForm); - START_MULTIPLEXER_LISTENING(ResetListener, m_aResetListeners, ::com::sun::star::form::XReset, m_xMainForm); + START_MULTIPLEXER_LISTENING(LoadListener, m_aLoadListeners, css::form::XLoadable, m_xMainForm); + START_MULTIPLEXER_LISTENING(RowSetListener, m_aRowSetListeners, css::sdbc::XRowSet, m_xMainForm); + START_MULTIPLEXER_LISTENING(RowSetApproveListener, m_aRowSetApproveListeners, css::sdb::XRowSetApproveBroadcaster, m_xMainForm); + START_MULTIPLEXER_LISTENING(SQLErrorListener, m_aErrorListeners, css::sdb::XSQLErrorBroadcaster, m_xMainForm); + START_MULTIPLEXER_LISTENING(SubmitListener, m_aSubmitListeners, css::form::XSubmit, m_xMainForm); + START_MULTIPLEXER_LISTENING(ResetListener, m_aResetListeners, css::form::XReset, m_xMainForm); if (m_aParameterListeners.getLength()) { - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->addParameterListener(&m_aParameterListeners); } - START_PROPERTY_MULTIPLEXER_LISTENING(PropertyChangeListener, m_aPropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); - START_PROPERTY_MULTIPLEXER_LISTENING(VetoableChangeListener, m_aVetoablePropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); + START_PROPERTY_MULTIPLEXER_LISTENING(PropertyChangeListener, m_aPropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); + START_PROPERTY_MULTIPLEXER_LISTENING(VetoableChangeListener, m_aVetoablePropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); if (m_aPropertiesChangeListeners.getLength()) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); OUString sEmpty; if (xBroadcaster.is()) xBroadcaster->addPropertiesChangeListener(::comphelper::StringSequence(&sEmpty, 1), &m_aPropertiesChangeListeners); } // log off ourself - Reference< ::com::sun::star::lang::XComponent > xComp(m_xMainForm, UNO_QUERY); + Reference< css::lang::XComponent > xComp(m_xMainForm, UNO_QUERY); if (xComp.is()) - xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<com::sun::star::beans::XPropertyChangeListener*>(this))); + xComp->addEventListener(static_cast<css::lang::XEventListener*>(static_cast<css::beans::XPropertyChangeListener*>(this))); } -void SbaXFormAdapter::AttachForm(const Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster) +void SbaXFormAdapter::AttachForm(const Reference< css::sdbc::XRowSet >& xNewMaster) { if (xNewMaster == m_xMainForm) return; - OSL_ENSURE(xNewMaster.get() != static_cast< ::com::sun::star::sdbc::XRowSet* >(this), "SbaXFormAdapter::AttachForm : invalid argument !"); + OSL_ENSURE(xNewMaster.get() != static_cast< css::sdbc::XRowSet* >(this), "SbaXFormAdapter::AttachForm : invalid argument !"); if (m_xMainForm.is()) { StopListening(); // if our old master is loaded we have to send an 'unloaded' event - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xLoadable(m_xMainForm, UNO_QUERY); if (xLoadable->isLoaded()) { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); ::cppu::OInterfaceIteratorHelper aIt(m_aLoadListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::form::XLoadListener*>(aIt.next())->unloaded(aEvt); + static_cast< css::form::XLoadListener*>(aIt.next())->unloaded(aEvt); } } @@ -182,13 +182,13 @@ void SbaXFormAdapter::AttachForm(const Reference< ::com::sun::star::sdbc::XRowSe StartListening(); // if our new master is loaded we have to send an 'loaded' event - Reference< ::com::sun::star::form::XLoadable > xLoadable(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xLoadable(m_xMainForm, UNO_QUERY); if (xLoadable->isLoaded()) { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); ::cppu::OInterfaceIteratorHelper aIt(m_aLoadListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::form::XLoadListener*>(aIt.next())->loaded(aEvt); + static_cast< css::form::XLoadListener*>(aIt.next())->loaded(aEvt); } } @@ -196,27 +196,27 @@ void SbaXFormAdapter::AttachForm(const Reference< ::com::sun::star::sdbc::XRowSe // (nearly every aspect of us may have changed with new master form) } -// ::com::sun::star::sdbc::XCloseable -void SAL_CALL SbaXFormAdapter::close() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XCloseable +void SAL_CALL SbaXFormAdapter::close() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XCloseable > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XCloseable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->close(); } -// ::com::sun::star::sdbc::XResultSetMetaDataSupplier -Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XResultSetMetaDataSupplier +Reference< css::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetMetaDataSupplier > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetMetaDataSupplier > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getMetaData(); - return Reference< ::com::sun::star::sdbc::XResultSetMetaData > (); + return Reference< css::sdbc::XResultSetMetaData > (); } -// ::com::sun::star::sdbc::XColumnLocate -sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XColumnLocate +sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XColumnLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XColumnLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->findColumn(columnName); @@ -225,801 +225,801 @@ sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw return 0; // Never reached } -// ::com::sun::star::sdbcx::XColumnsSupplier -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns() throw( RuntimeException, std::exception ) +// css::sdbcx::XColumnsSupplier +Reference< css::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getColumns(); - return Reference< ::com::sun::star::container::XNameAccess > (); + return Reference< css::container::XNameAccess > (); } -// ::com::sun::star::sdbc::XRow -sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XRow +sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->wasNull(); return sal_True; } -OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getString(columnIndex); return OUString(); } -sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBoolean(columnIndex); return sal_False; } -sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getByte(columnIndex); return 0; } -sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getShort(columnIndex); return 0; } -sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getInt(columnIndex); return 0; } -sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getLong(columnIndex); return 0; } -float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getFloat(columnIndex); return 0.0; } -double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getDouble(columnIndex); return 0.0; } -Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBytes(columnIndex); return Sequence <sal_Int8> (); } -::com::sun::star::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +css::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getDate(columnIndex); - return ::com::sun::star::util::Date(); + return css::util::Date(); } -::com::sun::star::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +css::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getTime(columnIndex); - return ::com::sun::star::util::Time(); + return css::util::Time(); } -::com::sun::star::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +css::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getTimestamp(columnIndex); - return ::com::sun::star::util::DateTime(); + return css::util::DateTime(); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBinaryStream(columnIndex); - return Reference< ::com::sun::star::io::XInputStream > (); + return Reference< css::io::XInputStream > (); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getCharacterStream(columnIndex); - return Reference< ::com::sun::star::io::XInputStream > (); + return Reference< css::io::XInputStream > (); } -Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getObject(columnIndex, typeMap); return Any(); } -Reference< ::com::sun::star::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getRef(columnIndex); - return Reference< ::com::sun::star::sdbc::XRef > (); + return Reference< css::sdbc::XRef > (); } -Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBlob(columnIndex); - return Reference< ::com::sun::star::sdbc::XBlob > (); + return Reference< css::sdbc::XBlob > (); } -Reference< ::com::sun::star::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getClob(columnIndex); - return Reference< ::com::sun::star::sdbc::XClob > (); + return Reference< css::sdbc::XClob > (); } -Reference< ::com::sun::star::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< css::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRow > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getArray(columnIndex); - return Reference< ::com::sun::star::sdbc::XArray > (); + return Reference< css::sdbc::XArray > (); } -// ::com::sun::star::sdbcx::XRowLocate -Any SAL_CALL SbaXFormAdapter::getBookmark() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbcx::XRowLocate +Any SAL_CALL SbaXFormAdapter::getBookmark() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getBookmark(); return Any(); } -sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->moveToBookmark(bookmark); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->moveRelativeToBookmark(bookmark,rows); return sal_False; } -sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->compareBookmarks(_first, _second); return 0; } -sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->hasOrderedBookmarks(); return sal_False; } -sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->hashBookmark(bookmark); return 0; } -// ::com::sun::star::sdbc::XRowUpdate -void SAL_CALL SbaXFormAdapter::updateNull(sal_Int32 columnIndex) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XRowUpdate +void SAL_CALL SbaXFormAdapter::updateNull(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateNull(columnIndex); } -void SAL_CALL SbaXFormAdapter::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateBoolean(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateByte(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateShort(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateInt(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateLong(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateFloat(sal_Int32 columnIndex, float x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateFloat(sal_Int32 columnIndex, float x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateFloat(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateDouble(sal_Int32 columnIndex, double x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateDouble(sal_Int32 columnIndex, double x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateDouble(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateString(sal_Int32 columnIndex, const OUString& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateString(sal_Int32 columnIndex, const OUString& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateString(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateBytes(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateDate(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateTime(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateTimestamp(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateBinaryStream(columnIndex, x, length); } -void SAL_CALL SbaXFormAdapter::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateCharacterStream(columnIndex, x, length); } -void SAL_CALL SbaXFormAdapter::updateObject(sal_Int32 columnIndex, const Any& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateObject(sal_Int32 columnIndex, const Any& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateObject(columnIndex, x); } -void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XRowUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateNumericObject(columnIndex, x, scale); } -// ::com::sun::star::sdbc::XResultSet -sal_Bool SAL_CALL SbaXFormAdapter::next() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XResultSet +sal_Bool SAL_CALL SbaXFormAdapter::next() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->next(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isBeforeFirst(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isAfterLast(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::isFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::isFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isFirst(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::isLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::isLast() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->isLast(); return sal_False; } -void SAL_CALL SbaXFormAdapter::beforeFirst() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::beforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) m_xMainForm->beforeFirst(); } -void SAL_CALL SbaXFormAdapter::afterLast() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::afterLast() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) m_xMainForm->afterLast(); } -sal_Bool SAL_CALL SbaXFormAdapter::first() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::first() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->first(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::last() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::last() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->last(); return sal_False; } -sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->getRow(); return 0; } -sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->absolute(row); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->relative(rows); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::previous() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::previous() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->previous(); return sal_False; } -void SAL_CALL SbaXFormAdapter::refreshRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::refreshRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) m_xMainForm->refreshRow(); } -sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->rowUpdated(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::rowInserted() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::rowInserted() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->rowInserted(); return sal_False; } -sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->rowDeleted(); return sal_False; } -Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) return m_xMainForm->getStatement(); return NULL; } -// ::com::sun::star::sdbc::XResultSetUpdate -void SAL_CALL SbaXFormAdapter::insertRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XResultSetUpdate +void SAL_CALL SbaXFormAdapter::insertRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->insertRow(); } -void SAL_CALL SbaXFormAdapter::updateRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::updateRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->updateRow(); } -void SAL_CALL SbaXFormAdapter::deleteRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::deleteRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->deleteRow(); } -void SAL_CALL SbaXFormAdapter::cancelRowUpdates() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::cancelRowUpdates() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->cancelRowUpdates(); } -void SAL_CALL SbaXFormAdapter::moveToInsertRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::moveToInsertRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->moveToInsertRow(); } -void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XResultSetUpdate > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->moveToCurrentRow(); } -// ::com::sun::star::sdbc::XRowSet -void SAL_CALL SbaXFormAdapter::execute() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XRowSet +void SAL_CALL SbaXFormAdapter::execute() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { if (m_xMainForm.is()) m_xMainForm->execute(); } -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdbc, RowSetListener, m_aRowSetListeners, ::com::sun::star::sdbc::XRowSet, m_xMainForm) +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdbc, RowSetListener, m_aRowSetListeners, css::sdbc::XRowSet, m_xMainForm) -// ::com::sun::star::sdbcx::XDeleteRows -Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >& rows) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbcx::XDeleteRows +Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >& rows) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbcx::XDeleteRows > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbcx::XDeleteRows > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->deleteRows(rows); return Sequence<sal_Int32>(); } -// ::com::sun::star::sdbc::XWarningsSupplier -Any SAL_CALL SbaXFormAdapter::getWarnings() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XWarningsSupplier +Any SAL_CALL SbaXFormAdapter::getWarnings() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->getWarnings(); return Any(); } -void SAL_CALL SbaXFormAdapter::clearWarnings() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::clearWarnings() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XWarningsSupplier > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->clearWarnings(); } -// ::com::sun::star::sdb::XRowSetApproveBroadcaster -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, RowSetApproveListener, m_aRowSetApproveListeners, ::com::sun::star::sdb::XRowSetApproveBroadcaster, m_xMainForm) +// css::sdb::XRowSetApproveBroadcaster +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, RowSetApproveListener, m_aRowSetApproveListeners, css::sdb::XRowSetApproveBroadcaster, m_xMainForm) -// com::sun::star::sdbc::XSQLErrorBroadcaster -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, SQLErrorListener, m_aErrorListeners, ::com::sun::star::sdb::XSQLErrorBroadcaster, m_xMainForm) +// css::sdbc::XSQLErrorBroadcaster +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, SQLErrorListener, m_aErrorListeners, css::sdb::XSQLErrorBroadcaster, m_xMainForm) -// ::com::sun::star::sdb::XResultSetAccess -Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdb::XResultSetAccess +Reference< css::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdb::XResultSetAccess > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdb::XResultSetAccess > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->createResultSet(); - return Reference< ::com::sun::star::sdbc::XResultSet > (); + return Reference< css::sdbc::XResultSet > (); } -// com::sun::star::form::XLoadable +// css::form::XLoadable void SAL_CALL SbaXFormAdapter::load() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->load(); } void SAL_CALL SbaXFormAdapter::unload() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->unload(); } void SAL_CALL SbaXFormAdapter::reload() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->reload(); } sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); + Reference< css::form::XLoadable > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) return xIface->isLoaded(); return sal_False; } -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, LoadListener, m_aLoadListeners, ::com::sun::star::form::XLoadable, m_xMainForm) +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, LoadListener, m_aLoadListeners, css::form::XLoadable, m_xMainForm) -// ::com::sun::star::sdbc::XParameters -void SAL_CALL SbaXFormAdapter::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +// css::sdbc::XParameters +void SAL_CALL SbaXFormAdapter::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setNull(parameterIndex, sqlType); } -void SAL_CALL SbaXFormAdapter::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setObjectNull(parameterIndex, sqlType, typeName); } -void SAL_CALL SbaXFormAdapter::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setBoolean(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setByte(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setShort(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setInt(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setLong(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setFloat(sal_Int32 parameterIndex, float x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setFloat(sal_Int32 parameterIndex, float x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setFloat(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setDouble(sal_Int32 parameterIndex, double x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setDouble(sal_Int32 parameterIndex, double x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setDouble(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setString(sal_Int32 parameterIndex, const OUString& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setString(sal_Int32 parameterIndex, const OUString& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setString(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setBytes(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setDate(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setTime(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setTimestamp(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setBinaryStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setBinaryStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setBinaryStream(parameterIndex, x, length); } -void SAL_CALL SbaXFormAdapter::setCharacterStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setCharacterStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setCharacterStream(parameterIndex, x, length); } -void SAL_CALL SbaXFormAdapter::setObject(sal_Int32 parameterIndex, const Any& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setObject(sal_Int32 parameterIndex, const Any& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setObject(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setObjectWithInfo(parameterIndex, x, targetSqlType, scale); } -void SAL_CALL SbaXFormAdapter::setRef(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XRef >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setRef(sal_Int32 parameterIndex, const Reference< css::sdbc::XRef >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setRef(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setBlob(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XBlob >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setBlob(sal_Int32 parameterIndex, const Reference< css::sdbc::XBlob >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setBlob(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setClob(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XClob >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setClob(sal_Int32 parameterIndex, const Reference< css::sdbc::XClob >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setClob(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::setArray(sal_Int32 parameterIndex, const Reference< ::com::sun::star::sdbc::XArray >& x) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setArray(sal_Int32 parameterIndex, const Reference< css::sdbc::XArray >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->setArray(parameterIndex, x); } -void SAL_CALL SbaXFormAdapter::clearParameters() throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::clearParameters() throw( css::sdbc::SQLException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); + Reference< css::sdbc::XParameters > xIface(m_xMainForm, UNO_QUERY); if (xIface.is()) xIface->clearParameters(); } -// ::com::sun::star::form::XDatabaseParameterBroadcaster -void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception ) +// css::form::XDatabaseParameterBroadcaster +void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception ) { m_aParameterListeners.addInterface(aListener); if (m_aParameterListeners.getLength() == 1) { - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->addParameterListener(&m_aParameterListeners); } } -void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception ) { if (m_aParameterListeners.getLength() == 1) { - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::form::XDatabaseParameterBroadcaster > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->removeParameterListener(&m_aParameterListeners); } m_aParameterListeners.removeInterface(aListener); } -// ::com::sun::star::container::XChild +// css::container::XChild Reference< XInterface > SAL_CALL SbaXFormAdapter::getParent() throw( RuntimeException, std::exception ) { return m_xParent; } -void SAL_CALL SbaXFormAdapter::setParent(const Reference< XInterface >& Parent) throw( ::com::sun::star::lang::NoSupportException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setParent(const Reference< XInterface >& Parent) throw( css::lang::NoSupportException, RuntimeException, std::exception ) { m_xParent = Parent; } -// ::com::sun::star::form::XSubmit -void SAL_CALL SbaXFormAdapter::submit(const Reference< ::com::sun::star::awt::XControl >& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw( RuntimeException, std::exception ) +// css::form::XSubmit +void SAL_CALL SbaXFormAdapter::submit(const Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XSubmit > xSubmit(m_xMainForm, UNO_QUERY); + Reference< css::form::XSubmit > xSubmit(m_xMainForm, UNO_QUERY); if (xSubmit.is()) xSubmit->submit(aControl, aMouseEvt); } -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, SubmitListener, m_aSubmitListeners, ::com::sun::star::form::XSubmit, m_xMainForm) +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, SubmitListener, m_aSubmitListeners, css::form::XSubmit, m_xMainForm) -// ::com::sun::star::awt::XTabControllerModel +// css::awt::XTabControllerModel sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl() throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupControl : not supported !"); @@ -1031,18 +1031,18 @@ void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !"); } -void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*Controls*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< css::awt::XControlModel > >& /*Controls*/) throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::setControlModels : not supported !"); } -Sequence< Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels() throw( RuntimeException, std::exception ) +Sequence< Reference< css::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels() throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::getControlModels : not supported !"); - return Sequence< Reference< ::com::sun::star::awt::XControlModel > >(); + return Sequence< Reference< css::awt::XControlModel > >(); } -void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< css::awt::XControlModel > >& /*_rGroup*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroup : not supported !"); } @@ -1053,24 +1053,24 @@ sal_Int32 SAL_CALL SbaXFormAdapter::getGroupCount() throw( RuntimeException, std return 0; } -void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< css::awt::XControlModel > >& /*_rGroup*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroup : not supported !"); } -void SAL_CALL SbaXFormAdapter::getGroupByName(const OUString& /*Name*/, Sequence< Reference< ::com::sun::star::awt::XControlModel > >& /*_rGroup*/) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::getGroupByName(const OUString& /*Name*/, Sequence< Reference< css::awt::XControlModel > >& /*_rGroup*/) throw( RuntimeException, std::exception ) { OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupByName : not supported !"); } -// ::com::sun::star::lang::XComponent +// css::lang::XComponent void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException, std::exception ) { // log off all multiplexers if (m_xMainForm.is()) StopListening(); - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aLoadListeners.disposeAndClear(aEvt); m_aRowSetListeners.disposeAndClear(aEvt); m_aRowSetApproveListeners.disposeAndClear(aEvt); @@ -1087,51 +1087,51 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException, std::exception m_aContainerListeners.disposeAndClear(aEvt); // dispose all children - for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); + for ( ::std::vector< Reference< css::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter ) { - Reference< ::com::sun::star::beans::XPropertySet > xSet(*aIter, UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(*aIter, UNO_QUERY); if (xSet.is()) - xSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + xSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<css::beans::XPropertyChangeListener*>(this)); - Reference< ::com::sun::star::container::XChild > xChild(*aIter, UNO_QUERY); + Reference< css::container::XChild > xChild(*aIter, UNO_QUERY); if (xChild.is()) xChild->setParent(Reference< XInterface > ()); - Reference< ::com::sun::star::lang::XComponent > xComp(*aIter, UNO_QUERY); + Reference< css::lang::XComponent > xComp(*aIter, UNO_QUERY); if (xComp.is()) xComp->dispose(); } m_aChildren.clear(); } -void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< ::com::sun::star::lang::XEventListener >& xListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< css::lang::XEventListener >& xListener) throw( RuntimeException, std::exception ) { m_aDisposeListeners.addInterface(xListener); } -void SAL_CALL SbaXFormAdapter::removeEventListener(const Reference< ::com::sun::star::lang::XEventListener >& aListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removeEventListener(const Reference< css::lang::XEventListener >& aListener) throw( RuntimeException, std::exception ) { m_aDisposeListeners.removeInterface(aListener); } -// ::com::sun::star::beans::XFastPropertySet -void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::beans::XFastPropertySet +void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY); OSL_ENSURE(xSet.is(), "SAL_CALL SbaXFormAdapter::setFastPropertyValue : have no master form !"); if (m_nNamePropHandle == nHandle) { if (aValue.getValueType().getTypeClass() != TypeClass_STRING) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // for notifying property listeners - ::com::sun::star::beans::PropertyChangeEvent aEvt; + css::beans::PropertyChangeEvent aEvt; aEvt.Source = *this; aEvt.PropertyName = PROPERTY_NAME; aEvt.PropertyHandle = m_nNamePropHandle; @@ -1142,7 +1142,7 @@ void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any ::cppu::OInterfaceIteratorHelper aIt(*m_aPropertyChangeListeners.getContainer(PROPERTY_NAME)); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::beans::XPropertyChangeListener*>(aIt.next())->propertyChange(aEvt); + static_cast< css::beans::XPropertyChangeListener*>(aIt.next())->propertyChange(aEvt); return; } @@ -1150,9 +1150,9 @@ void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any xSet->setFastPropertyValue(nHandle, aValue); } -Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XFastPropertySet > xSet(m_xMainForm, UNO_QUERY); OSL_ENSURE(xSet.is(), "SAL_CALL SbaXFormAdapter::getFastPropertyValue : have no master form !"); if (m_nNamePropHandle == nHandle) @@ -1161,7 +1161,7 @@ Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( ::c return xSet->getFastPropertyValue(nHandle); } -// ::com::sun::star::container::XNamed +// css::container::XNamed OUString SAL_CALL SbaXFormAdapter::getName() throw( RuntimeException, std::exception ) { return ::comphelper::getString(getPropertyValue(PROPERTY_NAME)); @@ -1172,42 +1172,42 @@ void SAL_CALL SbaXFormAdapter::setName(const OUString& aName) throw( RuntimeExce setPropertyValue(PROPERTY_NAME, makeAny(aName)); } -// ::com::sun::star::io::XPersistObject +// css::io::XPersistObject OUString SAL_CALL SbaXFormAdapter::getServiceName() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); + Reference< css::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); if (xPersist.is()) return xPersist->getServiceName(); return OUString(); } -void SAL_CALL SbaXFormAdapter::write(const Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream) throw( ::com::sun::star::io::IOException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::write(const Reference< css::io::XObjectOutputStream >& _rxOutStream) throw( css::io::IOException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); + Reference< css::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); if (xPersist.is()) xPersist->write(_rxOutStream); } -void SAL_CALL SbaXFormAdapter::read(const Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream) throw( ::com::sun::star::io::IOException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::read(const Reference< css::io::XObjectInputStream >& _rxInStream) throw( css::io::IOException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); + Reference< css::io::XPersistObject > xPersist(m_xMainForm, UNO_QUERY); if (xPersist.is()) xPersist->read(_rxInStream); } -// ::com::sun::star::beans::XMultiPropertySet -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertySetInfo() throw( RuntimeException, std::exception ) +// css::beans::XMultiPropertySet +Reference< css::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertySetInfo() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); if (!xSet.is()) - return Reference< ::com::sun::star::beans::XPropertySetInfo > (); + return Reference< css::beans::XPropertySetInfo > (); - Reference< ::com::sun::star::beans::XPropertySetInfo > xReturn = xSet->getPropertySetInfo(); + Reference< css::beans::XPropertySetInfo > xReturn = xSet->getPropertySetInfo(); if (-1 == m_nNamePropHandle) { // we need to determine the handle for the NAME property - Sequence< ::com::sun::star::beans::Property> aProps = xReturn->getProperties(); - const ::com::sun::star::beans::Property* pProps = aProps.getConstArray(); + Sequence< css::beans::Property> aProps = xReturn->getProperties(); + const css::beans::Property* pProps = aProps.getConstArray(); for (sal_Int32 i=0; i<aProps.getLength(); ++i, ++pProps) { @@ -1221,16 +1221,16 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter: return xReturn; } -void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values) throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); if (xSet.is()) xSet->setPropertyValues(PropertyNames, Values); } Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUString >& aPropertyNames) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); if (!xSet.is()) return Sequence< Any>(aPropertyNames.getLength()); @@ -1250,41 +1250,41 @@ Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUSt return aReturn; } -void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUString>& /*aPropertyNames*/, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUString>& /*aPropertyNames*/, const Reference< css::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception ) { // we completely ignore the property names, _all_ changes of _all_ properties will be forwarded to _all_ listeners m_aPropertiesChangeListeners.addInterface(xListener); if (m_aPropertiesChangeListeners.getLength() == 1) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); OUString sEmpty; if (xBroadcaster.is()) xBroadcaster->addPropertiesChangeListener(Sequence< OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners); } } -void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< css::beans::XPropertiesChangeListener >& Listener) throw( RuntimeException, std::exception ) { if (m_aPropertiesChangeListeners.getLength() == 1) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); if (xBroadcaster.is()) xBroadcaster->removePropertiesChangeListener(&m_aPropertiesChangeListeners); } m_aPropertiesChangeListeners.removeInterface(Listener); } -void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUString >& aPropertyNames, const Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUString >& aPropertyNames, const Reference< css::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XMultiPropertySet > xSet(m_xMainForm, UNO_QUERY); if (xSet.is()) xSet->firePropertiesChangeEvent(aPropertyNames, xListener); } -// ::com::sun::star::beans::XPropertySet -void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::beans::XPropertySet +void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY); if (!xSet.is()) return; @@ -1295,9 +1295,9 @@ void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, c xSet->setPropertyValue(aPropertyName, aValue); } -Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(m_xMainForm, UNO_QUERY); if (!xSet.is()) return Any(); @@ -1308,86 +1308,86 @@ Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName) thr return xSet->getPropertyValue(PropertyName); } -IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, PropertyChangeListener, m_aPropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); -IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, VetoableChangeListener, m_aVetoablePropertyChangeListeners, ::com::sun::star::beans::XPropertySet, m_xMainForm); +IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, PropertyChangeListener, m_aPropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); +IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, VetoableChangeListener, m_aVetoablePropertyChangeListeners, css::beans::XPropertySet, m_xMainForm); -// ::com::sun::star::util::XCancellable +// css::util::XCancellable void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::util::XCancellable > xCancel(m_xMainForm, UNO_QUERY); + Reference< css::util::XCancellable > xCancel(m_xMainForm, UNO_QUERY); if (xCancel.is()) return; xCancel->cancel(); } -// ::com::sun::star::beans::XPropertyState -::com::sun::star::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) +// css::beans::XPropertyState +css::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); if (xState.is()) return xState->getPropertyState(PropertyName); - return ::com::sun::star::beans::PropertyState_DEFAULT_VALUE; + return css::beans::PropertyState_DEFAULT_VALUE; } -Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates(const Sequence< OUString >& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) +Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates(const Sequence< OUString >& aPropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); if (xState.is()) return xState->getPropertyStates(aPropertyName); // set them all to DEFAULT - Sequence< ::com::sun::star::beans::PropertyState> aReturn(aPropertyName.getLength()); - ::com::sun::star::beans::PropertyState* pStates = aReturn.getArray(); + Sequence< css::beans::PropertyState> aReturn(aPropertyName.getLength()); + css::beans::PropertyState* pStates = aReturn.getArray(); for (sal_Int32 i=0; i<aPropertyName.getLength(); ++i, ++pStates) - *pStates = ::com::sun::star::beans::PropertyState_DEFAULT_VALUE; + *pStates = css::beans::PropertyState_DEFAULT_VALUE; return aReturn; } -void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); if (xState.is()) xState->setPropertyToDefault(PropertyName); } -Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); + Reference< css::beans::XPropertyState > xState(m_xMainForm, UNO_QUERY); if (xState.is()) return xState->getPropertyDefault(aPropertyName); return Any(); } -// ::com::sun::star::form::XReset +// css::form::XReset void SAL_CALL SbaXFormAdapter::reset() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::form::XReset > xReset(m_xMainForm, UNO_QUERY); + Reference< css::form::XReset > xReset(m_xMainForm, UNO_QUERY); if (xReset.is()) xReset->reset(); } -IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, ResetListener, m_aResetListeners, ::com::sun::star::form::XReset, m_xMainForm) +IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, ResetListener, m_aResetListeners, css::form::XReset, m_xMainForm) -// ::com::sun::star::container::XNameContainer -void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName) throw( ::com::sun::star::lang::IllegalArgumentException ) +// css::container::XNameContainer +void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName) throw( css::lang::IllegalArgumentException ) { // extract the form component if (aElement.getValueType().getTypeClass() != TypeClass_INTERFACE) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - Reference< ::com::sun::star::form::XFormComponent > xElement(*static_cast<Reference< XInterface > const *>(aElement.getValue()), UNO_QUERY); + Reference< css::form::XFormComponent > xElement(*static_cast<Reference< XInterface > const *>(aElement.getValue()), UNO_QUERY); if (!xElement.is()) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // for the name we need the propset - Reference< ::com::sun::star::beans::XPropertySet > xElementSet(xElement, UNO_QUERY); + Reference< css::beans::XPropertySet > xElementSet(xElement, UNO_QUERY); if (!xElementSet.is()) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } OUString sName; try @@ -1400,7 +1400,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU catch(Exception&) { // the set didn't support the name prop - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // check the index @@ -1413,19 +1413,19 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU m_aChildNames.insert(m_aChildNames.begin() + nIndex, sName); // listen for a changes of the name - xElementSet->addPropertyChangeListener(PROPERTY_NAME, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + xElementSet->addPropertyChangeListener(PROPERTY_NAME, static_cast<css::beans::XPropertyChangeListener*>(this)); // we are now the parent of the new element - xElement->setParent(static_cast<com::sun::star::container::XContainer*>(this)); + xElement->setParent(static_cast<css::container::XContainer*>(this)); // notify the container listeners - ::com::sun::star::container::ContainerEvent aEvt; + css::container::ContainerEvent aEvt; aEvt.Source = *this; aEvt.Accessor <<= nIndex; aEvt.Element <<= xElement; ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::container::XContainerListener*>(aIt.next())->elementInserted(aEvt); + static_cast< css::container::XContainerListener*>(aIt.next())->elementInserted(aEvt); } sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName) @@ -1440,39 +1440,39 @@ sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName) return -1; } -void SAL_CALL SbaXFormAdapter::insertByName(const OUString& aName, const Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::insertByName(const OUString& aName, const Any& aElement) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { implInsert(aElement, m_aChildren.size(), &aName); } -void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { sal_Int32 nPos = implGetPos(Name); if (-1 == nPos) { - throw ::com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); } removeByIndex(nPos); } -// ::com::sun::star::container::XNameReplace -void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::container::XNameReplace +void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& aElement) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { sal_Int32 nPos = implGetPos(aName); if (-1 == nPos) { - throw ::com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); } replaceByIndex(nPos, aElement); } -// ::com::sun::star::container::XNameAccess -Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::container::XNameAccess +Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { sal_Int32 nPos = implGetPos(aName); if (-1 == nPos) { - throw ::com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); } return makeAny(m_aChildren[nPos]); } @@ -1487,10 +1487,10 @@ sal_Bool SAL_CALL SbaXFormAdapter::hasByName(const OUString& aName) throw( Runti return (-1 != implGetPos(aName)); } -// ::com::sun::star::container::XElementAccess +// css::container::XElementAccess Type SAL_CALL SbaXFormAdapter::getElementType() throw(RuntimeException, std::exception) { - return cppu::UnoType<com::sun::star::form::XFormComponent>::get(); + return cppu::UnoType<css::form::XFormComponent>::get(); } sal_Bool SAL_CALL SbaXFormAdapter::hasElements() throw(RuntimeException, std::exception) @@ -1498,65 +1498,65 @@ sal_Bool SAL_CALL SbaXFormAdapter::hasElements() throw(RuntimeException, std::ex return m_aChildren.size() > 0; } -// ::com::sun::star::container::XIndexContainer -void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::container::XIndexContainer +void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element) throw( css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); implInsert(Element, _rIndex); } -void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); - Reference< ::com::sun::star::form::XFormComponent > xAffected = *(m_aChildren.begin() + _rIndex); + Reference< css::form::XFormComponent > xAffected = *(m_aChildren.begin() + _rIndex); OSL_ENSURE(m_aChildren.size() == m_aChildNames.size(), "SAL_CALL SbaXFormAdapter::removeByIndex : inconsistent container state !"); m_aChildren.erase(m_aChildren.begin() + _rIndex); m_aChildNames.erase(m_aChildNames.begin() + _rIndex); // no need to listen anymore - Reference< ::com::sun::star::beans::XPropertySet > xAffectedSet(xAffected, UNO_QUERY); - xAffectedSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + Reference< css::beans::XPropertySet > xAffectedSet(xAffected, UNO_QUERY); + xAffectedSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<css::beans::XPropertyChangeListener*>(this)); // we are no longer the parent xAffected->setParent(Reference< XInterface > ()); // notify container listeners - ::com::sun::star::container::ContainerEvent aEvt; + css::container::ContainerEvent aEvt; aEvt.Source = *this; aEvt.Element <<= xAffected; ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::container::XContainerListener*>(aIt.next())->elementRemoved(aEvt); + static_cast< css::container::XContainerListener*>(aIt.next())->elementRemoved(aEvt); } -// ::com::sun::star::container::XIndexReplace -void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +// css::container::XIndexReplace +void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element) throw( css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); // extract the form component if (Element.getValueType().getTypeClass() != TypeClass_INTERFACE) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - Reference< ::com::sun::star::form::XFormComponent > xElement(*static_cast<Reference< XInterface > const *>(Element.getValue()), UNO_QUERY); + Reference< css::form::XFormComponent > xElement(*static_cast<Reference< XInterface > const *>(Element.getValue()), UNO_QUERY); if (!xElement.is()) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // for the name we need the propset - Reference< ::com::sun::star::beans::XPropertySet > xElementSet(xElement, UNO_QUERY); + Reference< css::beans::XPropertySet > xElementSet(xElement, UNO_QUERY); if (!xElementSet.is()) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } OUString sName; try @@ -1566,26 +1566,26 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem catch(Exception&) { // the set didn't support the name prop - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } - Reference< ::com::sun::star::form::XFormComponent > xOld = *(m_aChildren.begin() + _rIndex); + Reference< css::form::XFormComponent > xOld = *(m_aChildren.begin() + _rIndex); OSL_ENSURE(m_aChildren.size() == m_aChildNames.size(), "SAL_CALL SbaXFormAdapter::replaceByIndex : inconsistent container state !"); *(m_aChildren.begin() + _rIndex) = xElement; *(m_aChildNames.begin() + _rIndex) = sName; // correct property change listening - Reference< ::com::sun::star::beans::XPropertySet > xOldSet(xOld, UNO_QUERY); - xOldSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); - xElementSet->addPropertyChangeListener(PROPERTY_NAME, static_cast<com::sun::star::beans::XPropertyChangeListener*>(this)); + Reference< css::beans::XPropertySet > xOldSet(xOld, UNO_QUERY); + xOldSet->removePropertyChangeListener(PROPERTY_NAME, static_cast<css::beans::XPropertyChangeListener*>(this)); + xElementSet->addPropertyChangeListener(PROPERTY_NAME, static_cast<css::beans::XPropertyChangeListener*>(this)); // parent reset xOld->setParent(Reference< XInterface > ()); - xElement->setParent(static_cast<com::sun::star::container::XContainer*>(this)); + xElement->setParent(static_cast<css::container::XContainer*>(this)); // notify container listeners - ::com::sun::star::container::ContainerEvent aEvt; + css::container::ContainerEvent aEvt; aEvt.Source = *this; aEvt.Accessor <<= (sal_Int32)_rIndex; aEvt.Element <<= xElement; @@ -1593,49 +1593,49 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem ::cppu::OInterfaceIteratorHelper aIt(m_aContainerListeners); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::container::XContainerListener*>(aIt.next())->elementReplaced(aEvt); + static_cast< css::container::XContainerListener*>(aIt.next())->elementReplaced(aEvt); } -// ::com::sun::star::container::XIndexAccess +// css::container::XIndexAccess sal_Int32 SAL_CALL SbaXFormAdapter::getCount() throw( RuntimeException, std::exception ) { return m_aChildren.size(); } -Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception ) { if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); - Reference< ::com::sun::star::form::XFormComponent > xElement = *(m_aChildren.begin() + _rIndex); + Reference< css::form::XFormComponent > xElement = *(m_aChildren.begin() + _rIndex); return makeAny(xElement); } -// ::com::sun::star::container::XContainer -void SAL_CALL SbaXFormAdapter::addContainerListener(const Reference< ::com::sun::star::container::XContainerListener >& xListener) throw( RuntimeException, std::exception ) +// css::container::XContainer +void SAL_CALL SbaXFormAdapter::addContainerListener(const Reference< css::container::XContainerListener >& xListener) throw( RuntimeException, std::exception ) { m_aContainerListeners.addInterface(xListener); } -void SAL_CALL SbaXFormAdapter::removeContainerListener(const Reference< ::com::sun::star::container::XContainerListener >& xListener) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXFormAdapter::removeContainerListener(const Reference< css::container::XContainerListener >& xListener) throw( RuntimeException, std::exception ) { m_aContainerListeners.removeInterface(xListener); } -// ::com::sun::star::container::XEnumerationAccess -Reference< ::com::sun::star::container::XEnumeration > SAL_CALL SbaXFormAdapter::createEnumeration() throw( RuntimeException, std::exception ) +// css::container::XEnumerationAccess +Reference< css::container::XEnumeration > SAL_CALL SbaXFormAdapter::createEnumeration() throw( RuntimeException, std::exception ) { return new ::comphelper::OEnumerationByName(this); } -// ::com::sun::star::beans::XPropertyChangeListener -void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) +// css::beans::XPropertyChangeListener +void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) { if (evt.PropertyName == PROPERTY_NAME) { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< css::uno::Reference< css::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),evt.Source)); + ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),evt.Source)); if(aIter != m_aChildren.end()) { @@ -1646,16 +1646,16 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::Pro } } -// ::com::sun::star::lang::XEventListener -void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException, std::exception ) +// css::lang::XEventListener +void SAL_CALL SbaXFormAdapter::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception ) { // was it our main form ? if (Source.Source == m_xMainForm) dispose(); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), + ::std::vector< css::uno::Reference< css::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),Source.Source)); + ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),Source.Source)); if(aIter != m_aChildren.end()) removeByIndex(aIter - m_aChildren.begin()); } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index df4066e2c519..0c57d68de0a6 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -99,7 +99,7 @@ public: void execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ); private: - ::com::sun::star::uno::WeakReference< XController > m_aController; + css::uno::WeakReference< XController > m_aController; }; UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxController ) @@ -376,7 +376,7 @@ Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() throw ( return NULL; } -OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (css::uno::RuntimeException, std::exception) { return OUString( "Default" ); } @@ -1279,7 +1279,7 @@ void OGenericUnoController::openHelpAgent( const URL& _rURL ) Reference< awt::XWindow> OGenericUnoController::getTopMostContainerWindow() const { - Reference< ::com::sun::star::awt::XWindow> xWindow; + Reference< css::awt::XWindow> xWindow; // get the top most window Reference< XFrame > xFrame( m_aCurrentFrame.getFrame() ); @@ -1522,7 +1522,7 @@ void OGenericUnoController::fillSupportedFeatures() #endif } -void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::dispose() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; OGenericUnoController_Base::dispose(); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index cb0a9fd7c262..f1f5589a0bfd 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -174,7 +174,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent) Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) { Any aRet = FmXGridControl::queryInterface(_rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,static_cast<com::sun::star::frame::XDispatch*>(this)); + return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,static_cast<css::frame::XDispatch*>(this)); } Sequence< Type > SAL_CALL SbaXGridControl::getTypes( ) throw (RuntimeException, std::exception) @@ -183,7 +183,7 @@ Sequence< Type > SAL_CALL SbaXGridControl::getTypes( ) throw (RuntimeException, sal_Int32 nTypes = aTypes.getLength(); aTypes.realloc(nTypes + 1); - aTypes[nTypes] = cppu::UnoType<com::sun::star::frame::XDispatch>::get(); + aTypes[nTypes] = cppu::UnoType<css::frame::XDispatch>::get(); return aTypes; } @@ -193,7 +193,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId( ) throw (Ru return css::uno::Sequence<sal_Int8>(); } -void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridControl::createPeer(const Reference< css::awt::XToolkit > & rToolkit, const Reference< css::awt::XWindowPeer > & rParentPeer) throw( RuntimeException, std::exception ) { FmXGridControl::createPeer(rToolkit, rParentPeer); @@ -202,7 +202,7 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt // TODO: why the hell this whole class does not use any mutex? - Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); ++aIter) @@ -212,9 +212,9 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt } } -void SAL_CALL SbaXGridControl::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridControl::dispatch(const css::util::URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); if (xDisp.is()) xDisp->dispatch(aURL, aArgs); } @@ -247,7 +247,7 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen } } -void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & _rxListener, const ::com::sun::star::util::URL& _rURL) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< css::frame::XStatusListener > & _rxListener, const css::util::URL& _rURL) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -260,7 +260,7 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun: if (getPeer().is() && pMultiplexer->getLength() == 1) { - Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); xDisp->removeStatusListener(pMultiplexer, _rURL); } pMultiplexer->removeInterface( _rxListener ); @@ -309,13 +309,13 @@ void SAL_CALL SbaXGridPeer::dispose() throw( RuntimeException, std::exception ) FmXGridPeer::dispose(); } -void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, const Reference< ::com::sun::star::frame::XStatusListener > & xControl) +void SbaXGridPeer::NotifyStatusChanged(const css::util::URL& _rUrl, const Reference< css::frame::XStatusListener > & xControl) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if (!pGrid) return; - ::com::sun::star::frame::FeatureStateEvent aEvt; + css::frame::FeatureStateEvent aEvt; aEvt.Source = *this; aEvt.IsEnabled = !pGrid->IsReadOnlyDB(); aEvt.FeatureURL = _rUrl; @@ -336,26 +336,26 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl, { ::cppu::OInterfaceIteratorHelper aListIter(*pIter); while (aListIter.hasMoreElements()) - static_cast< ::com::sun::star::frame::XStatusListener*>(aListIter.next())->statusChanged(aEvt); + static_cast< css::frame::XStatusListener*>(aListIter.next())->statusChanged(aEvt); } } } Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) { - Any aRet = ::cppu::queryInterface(_rType,static_cast<com::sun::star::frame::XDispatch*>(this)); + Any aRet = ::cppu::queryInterface(_rType,static_cast<css::frame::XDispatch*>(this)); if(aRet.hasValue()) return aRet; return FmXGridPeer::queryInterface(_rType); } -Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) { if ( ( aURL.Complete == ".uno:GridSlots/BrowserAttribs" ) || ( aURL.Complete == ".uno:GridSlots/RowHeight" ) || ( aURL.Complete == ".uno:GridSlots/ColumnAttribs" ) || ( aURL.Complete == ".uno:GridSlots/ColumnWidth" ) ) { - return static_cast<com::sun::star::frame::XDispatch*>(this); + return static_cast<css::frame::XDispatch*>(this); } return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); @@ -496,7 +496,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa } } -void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( RuntimeException, std::exception ) { ::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL); if (!pCont) @@ -506,7 +506,7 @@ void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< ::com::sun::star: NotifyStatusChanged(aURL, xControl); } -void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( RuntimeException, std::exception ) { ::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL); if ( pCont ) @@ -528,13 +528,13 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException, std: Sequence< Type > aTypes = FmXGridPeer::getTypes(); sal_Int32 nOldLen = aTypes.getLength(); aTypes.realloc(nOldLen + 1); - aTypes.getArray()[nOldLen] = cppu::UnoType<com::sun::star::frame::XDispatch>::get(); + aTypes.getArray()[nOldLen] = cppu::UnoType<css::frame::XDispatch>::get(); return aTypes; } // return implementation specific data -sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); @@ -697,7 +697,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM // send it to the clipboard vClipboardList.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(xField))); OTableRowExchange* pData = new OTableRowExchange(vClipboardList); - Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; + Reference< css::datatransfer::XTransferable> xRef = pData; pData->CopyToClipboard(GetParent()); } break; @@ -770,7 +770,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) SvNumberFormatter* SbaGridControl::GetDatasourceFormatter() { - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), true, getContext()); + Reference< css::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), true, getContext()); SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); if ( !pSupplierImpl ) @@ -1330,11 +1330,11 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) try { - // assume that text can be dropped into a field if the column has a ::com::sun::star::awt::XTextComponent interface - Reference< XIndexAccess > xColumnControls(static_cast<com::sun::star::form::XGridPeer*>(GetPeer()), UNO_QUERY); + // assume that text can be dropped into a field if the column has a css::awt::XTextComponent interface + Reference< XIndexAccess > xColumnControls(static_cast<css::form::XGridPeer*>(GetPeer()), UNO_QUERY); if (xColumnControls.is()) { - Reference< ::com::sun::star::awt::XTextComponent > xColControl( + Reference< css::awt::XTextComponent > xColControl( xColumnControls->getByIndex(GetViewColumnPos(nCol)), css::uno::UNO_QUERY); if (xColControl.is()) diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 4f8bbe0a6933..309dba915d1d 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -23,75 +23,75 @@ using namespace dbaui; // the listener multiplexers // XStatusListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXStatusMultiplexer, ::com::sun::star::frame::XStatusListener) +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXStatusMultiplexer, css::frame::XStatusListener) -void SAL_CALL SbaXStatusMultiplexer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& e) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SbaXStatusMultiplexer::statusChanged(const css::frame::FeatureStateEvent& e) throw (css::uno::RuntimeException, std::exception) { m_aLastKnownStatus = e; m_aLastKnownStatus.Source = &m_rParent; ::cppu::OInterfaceIteratorHelper aIt( *this ); while ( aIt.hasMoreElements() ) - static_cast< ::com::sun::star::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus ); + static_cast< css::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus ); } \ // LoadListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener, loaded, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener, unloaded, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener, unloading, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener, reloading, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener, reloaded, ::com::sun::star::lang::EventObject) - -// ::com::sun::star::sdbc::XRowSetListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener, cursorMoved, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener, rowChanged, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener, rowSetChanged, ::com::sun::star::lang::EventObject) - -// ::com::sun::star::sdb::XRowSetApproveListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener, approveCursorMove, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener, approveRowChange, ::com::sun::star::sdb::RowChangeEvent) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener, approveRowSetChange, ::com::sun::star::lang::EventObject) - -// ::com::sun::star::sdb::XSQLErrorListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXSQLErrorMultiplexer, ::com::sun::star::sdb::XSQLErrorListener) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXSQLErrorMultiplexer, ::com::sun::star::sdb::XSQLErrorListener, errorOccured, ::com::sun::star::sdb::SQLErrorEvent) - -// ::com::sun::star::form::XDatabaseParameterListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXParameterMultiplexer, ::com::sun::star::form::XDatabaseParameterListener) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXParameterMultiplexer, ::com::sun::star::form::XDatabaseParameterListener, approveParameter, ::com::sun::star::form::DatabaseParameterEvent) - -// ::com::sun::star::form::XSubmitListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXSubmitMultiplexer, ::com::sun::star::form::XSubmitListener) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXSubmitMultiplexer, ::com::sun::star::form::XSubmitListener, approveSubmit, ::com::sun::star::lang::EventObject) - -// ::com::sun::star::form::XResetListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXResetMultiplexer, ::com::sun::star::form::XResetListener) -IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXResetMultiplexer, ::com::sun::star::form::XResetListener, approveReset, ::com::sun::star::lang::EventObject) -IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXResetMultiplexer, ::com::sun::star::form::XResetListener, resetted, ::com::sun::star::lang::EventObject) - -// ::com::sun::star::beans::XPropertyChangeListener -IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, ::com::sun::star::beans::XPropertyChangeListener, propertyChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::uno::RuntimeException, std::exception)) - -// ::com::sun::star::beans::XVetoableChangeListener -IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, ::com::sun::star::beans::XVetoableChangeListener, vetoableChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception)) - -// ::com::sun::star::beans::XPropertiesChangeListener -IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXPropertiesChangeMultiplexer, ::com::sun::star::beans::XPropertiesChangeListener); -void SbaXPropertiesChangeMultiplexer::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& aEvts) throw(::com::sun::star::uno::RuntimeException, std::exception) +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, css::form::XLoadListener) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, css::form::XLoadListener, loaded, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, css::form::XLoadListener, unloaded, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, css::form::XLoadListener, unloading, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, css::form::XLoadListener, reloading, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXLoadMultiplexer, css::form::XLoadListener, reloaded, css::lang::EventObject) + +// css::sdbc::XRowSetListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXRowSetMultiplexer, css::sdbc::XRowSetListener) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, css::sdbc::XRowSetListener, cursorMoved, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, css::sdbc::XRowSetListener, rowChanged, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXRowSetMultiplexer, css::sdbc::XRowSetListener, rowSetChanged, css::lang::EventObject) + +// css::sdb::XRowSetApproveListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXRowSetApproveMultiplexer, css::sdb::XRowSetApproveListener) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, css::sdb::XRowSetApproveListener, approveCursorMove, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, css::sdb::XRowSetApproveListener, approveRowChange, css::sdb::RowChangeEvent) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXRowSetApproveMultiplexer, css::sdb::XRowSetApproveListener, approveRowSetChange, css::lang::EventObject) + +// css::sdb::XSQLErrorListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXSQLErrorMultiplexer, css::sdb::XSQLErrorListener) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXSQLErrorMultiplexer, css::sdb::XSQLErrorListener, errorOccured, css::sdb::SQLErrorEvent) + +// css::form::XDatabaseParameterListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXParameterMultiplexer, css::form::XDatabaseParameterListener) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXParameterMultiplexer, css::form::XDatabaseParameterListener, approveParameter, css::form::DatabaseParameterEvent) + +// css::form::XSubmitListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXSubmitMultiplexer, css::form::XSubmitListener) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXSubmitMultiplexer, css::form::XSubmitListener, approveSubmit, css::lang::EventObject) + +// css::form::XResetListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXResetMultiplexer, css::form::XResetListener) +IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXResetMultiplexer, css::form::XResetListener, approveReset, css::lang::EventObject) +IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXResetMultiplexer, css::form::XResetListener, resetted, css::lang::EventObject) + +// css::beans::XPropertyChangeListener +IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent, (css::uno::RuntimeException, std::exception)) + +// css::beans::XVetoableChangeListener +IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent, (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception)) + +// css::beans::XPropertiesChangeListener +IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXPropertiesChangeMultiplexer, css::beans::XPropertiesChangeListener); +void SbaXPropertiesChangeMultiplexer::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& aEvts) throw(css::uno::RuntimeException, std::exception) { // the SbaXPropertiesChangeMultiplexer doesn't care about the property names a listener logs on for, it simply // forwards _all_ changes to _all_ listeners - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent> aMulti(aEvts); - ::com::sun::star::beans::PropertyChangeEvent* pMulti = aMulti.getArray(); + css::uno::Sequence< css::beans::PropertyChangeEvent> aMulti(aEvts); + css::beans::PropertyChangeEvent* pMulti = aMulti.getArray(); for (sal_Int32 i=0; i<aMulti.getLength(); ++i, ++pMulti) pMulti->Source = &m_rParent; ::cppu::OInterfaceIteratorHelper aIt(*this); while (aIt.hasMoreElements()) - static_cast< ::com::sun::star::beans::XPropertiesChangeListener*>(aIt.next())->propertiesChange(aMulti); + static_cast< css::beans::XPropertiesChangeListener*>(aIt.next())->propertiesChange(aMulti); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 1c5e945e632e..9ea96f927e8a 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -289,7 +289,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() // doin' a lot of VCL stuff here -> lock the SolarMutex // kiss our listeners goodbye - com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aSelectionListeners.disposeAndClear(aEvt); m_aContextMenuInterceptors.disposeAndClear(aEvt); @@ -322,7 +322,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() // check out from all the objects we are listening // the frame if (m_xCurrentFrameParent.is()) - m_xCurrentFrameParent->removeFrameActionListener(static_cast<com::sun::star::frame::XFrameActionListener*>(this)); + m_xCurrentFrameParent->removeFrameActionListener(static_cast<css::frame::XFrameActionListener*>(this)); SbaXDataBrowserController::disposing(); } @@ -590,11 +590,11 @@ void SbaTableQueryBrowser::initializePreviewMode() } } -bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & xGrid) +bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XFormComponent > & xGrid) { try { - Reference< ::com::sun::star::form::XGridColumnFactory > xColFactory(xGrid, UNO_QUERY); + Reference< css::form::XGridColumnFactory > xColFactory(xGrid, UNO_QUERY); Reference< XNameContainer > xColContainer(xGrid, UNO_QUERY); clearGridColumns( xColContainer ); @@ -655,7 +655,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::star } // get the formats supplier of the database we're working with - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = getNumberFormatter()->getNumberFormatsSupplier(); + Reference< css::util::XNumberFormatsSupplier > xSupplier = getNumberFormatter()->getNumberFormatsSupplier(); Reference<XConnection> xConnection; Reference<XPropertySet> xRowSetProps(getRowSet(),UNO_QUERY); @@ -854,7 +854,7 @@ void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProp } } -void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) { SbaXDataBrowserController::propertyChange(evt); @@ -904,7 +904,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( xProp->setPropertyValue(PROPERTY_ALIGN,evt.NewValue); } else - xProp->setPropertyValue(PROPERTY_ALIGN,makeAny(::com::sun::star::awt::TextAlign::LEFT)); + xProp->setPropertyValue(PROPERTY_ALIGN,makeAny(css::awt::TextAlign::LEFT)); } } catch( const Exception& ) @@ -1353,12 +1353,12 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId ) InvalidateFeature( _nId ); } -void SAL_CALL SbaTableQueryBrowser::disposing( const com::sun::star::lang::EventObject& _rSource ) throw(RuntimeException, std::exception) +void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rSource ) throw(RuntimeException, std::exception) { // our frame ? - Reference< ::com::sun::star::frame::XFrame > xSourceFrame(_rSource.Source, UNO_QUERY); + Reference< css::frame::XFrame > xSourceFrame(_rSource.Source, UNO_QUERY); if (m_xCurrentFrameParent.is() && (xSourceFrame == m_xCurrentFrameParent)) - m_xCurrentFrameParent->removeFrameActionListener(static_cast<com::sun::star::frame::XFrameActionListener*>(this)); + m_xCurrentFrameParent->removeFrameActionListener(static_cast<css::frame::XFrameActionListener*>(this)); else { // search the external dispatcher causing this call in our map @@ -1499,12 +1499,12 @@ void SAL_CALL SbaTableQueryBrowser::removeSelectionChangeListener( const Referen m_aSelectionListeners.removeInterface(_rxListener); } -void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame::XFrame > & _xFrame) throw( RuntimeException, std::exception ) +void SbaTableQueryBrowser::attachFrame(const Reference< css::frame::XFrame > & _xFrame) throw( RuntimeException, std::exception ) { implRemoveStatusListeners(); if (m_xCurrentFrameParent.is()) - m_xCurrentFrameParent->removeFrameActionListener(static_cast<com::sun::star::frame::XFrameActionListener*>(this)); + m_xCurrentFrameParent->removeFrameActionListener(static_cast<css::frame::XFrameActionListener*>(this)); SbaXDataBrowserController::attachFrame(_xFrame); @@ -1513,7 +1513,7 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame: { m_xCurrentFrameParent = xCurrentFrame->findFrame(OUString("_parent"),FrameSearchFlag::PARENT); if ( m_xCurrentFrameParent.is() ) - m_xCurrentFrameParent->addFrameActionListener(static_cast<com::sun::star::frame::XFrameActionListener*>(this)); + m_xCurrentFrameParent->addFrameActionListener(static_cast<css::frame::XFrameActionListener*>(this)); // obtain our toolbox try @@ -1542,7 +1542,7 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame: connectExternalDispatches(); } -void SbaTableQueryBrowser::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) +void SbaTableQueryBrowser::addModelListeners(const Reference< css::awt::XControlModel > & _xGridControlModel) { SbaXDataBrowserController::addModelListeners(_xGridControlModel); Reference< XPropertySet > xSourceSet(_xGridControlModel, UNO_QUERY); @@ -1558,7 +1558,7 @@ void SbaTableQueryBrowser::addModelListeners(const Reference< ::com::sun::star:: } -void SbaTableQueryBrowser::removeModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) +void SbaTableQueryBrowser::removeModelListeners(const Reference< css::awt::XControlModel > & _xGridControlModel) { SbaXDataBrowserController::removeModelListeners(_xGridControlModel); Reference< XPropertySet > xSourceSet(_xGridControlModel, UNO_QUERY); @@ -1635,7 +1635,7 @@ void SbaTableQueryBrowser::LoadFinished(bool _bWasSynch) } // if the form has been loaded, this means that our "selection" has changed - com::sun::star::lang::EventObject aEvent( *this ); + css::lang::EventObject aEvent( *this ); m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvent ); } @@ -1768,7 +1768,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const if (xDataSource.is()) { sal_Int32 nType = ::comphelper::getINT32(xDataSource->getPropertyValue(PROPERTY_COMMAND_TYPE)); - aReturn.bEnabled = aReturn.bEnabled && ((::comphelper::getBOOL(xDataSource->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) || (nType == ::com::sun::star::sdb::CommandType::QUERY))); + aReturn.bEnabled = aReturn.bEnabled && ((::comphelper::getBOOL(xDataSource->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)) || (nType == css::sdb::CommandType::QUERY))); } } catch(DisposedException&) @@ -2571,7 +2571,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) || ( nOldType != nCommandType ) || ( aName != aOldName ); - Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable(); + Reference< css::form::XLoadable > xLoadable = getLoadable(); bRebuild |= !xLoadable->isLoaded(); bool bSuccess = true; if ( bRebuild ) @@ -3587,7 +3587,7 @@ bool SbaTableQueryBrowser::implGetQuerySignature( OUString& _rCommand, bool& _bE return false; } -void SbaTableQueryBrowser::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) +void SbaTableQueryBrowser::frameAction(const css::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) { if (aEvent.Frame == m_xCurrentFrameParent) { @@ -3624,7 +3624,7 @@ void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame) } else if ( !m_bPreview ) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); + Reference< css::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); if ( xLayoutManager.is() ) { diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 36aff78e2f96..bea1115205f0 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -78,7 +78,7 @@ void OColumnControlWindow::CellModified(long /*nRow*/, sal_uInt16 /*nColId*/ ) saveCurrentFieldDescData(); } -::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const +css::lang::Locale OColumnControlWindow::GetLocale() const { return m_aLocale; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4a58d0632c9d..e953a25f7238 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -238,7 +238,7 @@ OUString OFieldDescControl::BoolStringUI(const OUString& rPersistentString) cons void OFieldDescControl::Init() { - Reference< ::com::sun::star::util::XNumberFormatter > xFormatter = GetFormatter(); + Reference< css::util::XNumberFormatter > xFormatter = GetFormatter(); ::dbaui::setEvalDateFormatForFormatter(xFormatter); } @@ -1664,7 +1664,7 @@ bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr, sal_ { if (!_nFormatKey) { - Reference< ::com::sun::star::util::XNumberFormatTypes> xNumberTypes(GetFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY); + Reference< css::util::XNumberFormatTypes> xNumberTypes(GetFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY); OSL_ENSURE(xNumberTypes.is(),"XNumberFormatTypes is null!"); _nFormatKey = ::dbtools::getDefaultNumberFormat( _pFieldDescr->GetType(), @@ -1674,7 +1674,7 @@ bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr, sal_ GetLocale()); } sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(GetFormatter(),_nFormatKey); - bTextFormat = (nNumberFormat == ::com::sun::star::util::NumberFormat::TEXT); + bTextFormat = (nNumberFormat == css::util::NumberFormat::TEXT); } catch(const Exception&) { @@ -1716,7 +1716,7 @@ OUString OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldD else _pFieldDescr->GetControlDefault() >>= nValue; - Reference< ::com::sun::star::util::XNumberFormatter> xNumberFormatter = GetFormatter(); + Reference< css::util::XNumberFormatter> xNumberFormatter = GetFormatter(); Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); OUString sFormat; @@ -1728,13 +1728,13 @@ OUString OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldD ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,OUString("Locale")) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE - || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) + if( (nNumberFormat & css::util::NumberFormat::DATE) == css::util::NumberFormat::DATE + || (nNumberFormat & css::util::NumberFormat::DATETIME) == css::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue); } - Reference< ::com::sun::star::util::XNumberFormatPreviewer> xPreviewer(xNumberFormatter,UNO_QUERY); + Reference< css::util::XNumberFormatPreviewer> xPreviewer(xNumberFormatter,UNO_QUERY); OSL_ENSURE(xPreviewer.is(),"XNumberFormatPreviewer is null!"); sDefault = xPreviewer->convertNumberToPreviewString(sFormat,nValue,aLocale,sal_True); } diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index a23925ae254d..801dcd38ac1b 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -107,7 +107,7 @@ void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _ OSL_ENSURE(m_xTables.is(),"No tables supported!"); } -void OTableGrantControl::setComponentContext(const Reference< ::com::sun::star::uno::XComponentContext>& _rxContext) +void OTableGrantControl::setComponentContext(const Reference< css::uno::XComponentContext>& _rxContext) { m_xContext = _rxContext; } diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 35792db9747e..081e7d51d581 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -121,7 +121,7 @@ namespace dbaui do { // Retrieve popup menu labels - Reference< com::sun::star::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); if ( !xContext.is() ) break; diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index b6a3fd152f9c..002f17667ec3 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -222,7 +222,7 @@ namespace dbaui return pMenu; } - Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception) + Reference< css::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception) { // execute the menu SolarMutexGuard aSolarMutexGuard; @@ -256,7 +256,7 @@ namespace dbaui } } - return Reference< ::com::sun::star::awt::XWindow >(); + return Reference< css::awt::XWindow >(); } } // dbaui diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 1ceb8a62931d..e90f0fd153e9 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -58,7 +58,7 @@ using namespace comphelper; OCollectionView::OCollectionView( vcl::Window * pParent ,const Reference< XContent>& _xContent ,const OUString& _sDefaultName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) + ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : ModalDialog( pParent, "CollectionView", "dbaccess/ui/collectionviewdialog.ui") , m_xContent(_xContent) , m_xContext(_rxContext) @@ -157,7 +157,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; - ::com::sun::star::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; + css::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 9a3ac81a97d4..f1ede4d1b036 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -297,7 +297,7 @@ namespace dbaui Reference<XMozillaBootstrap> xMozillaBootstrap = MozillaBootstrap::create(xContext); // collect all Mozilla Profiles - ::com::sun::star::uno::Sequence< OUString > list; + css::uno::Sequence< OUString > list; xMozillaBootstrap->getProfileList( profileType, list ); const OUString * pArray = list.getConstArray(); @@ -539,7 +539,7 @@ namespace dbaui { ::ucbhelper::Content aCheckExistence; IS_PATH_EXIST eExists = PATH_NOT_EXIST; - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler( + Reference< css::task::XInteractionHandler > xInteractionHandler( task::InteractionHandler::createWithParent(m_xORB, 0), UNO_QUERY ); OFilePickerInteractionHandler* pHandler = new OFilePickerInteractionHandler(xInteractionHandler); xInteractionHandler = pHandler; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 405963e1e35c..4d3a5817fd77 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -556,7 +556,7 @@ using namespace ::com::sun::star; bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_pETDriverClass->GetText()); } } - catch(::com::sun::star::uno::Exception&) + catch(css::uno::Exception&) { } #endif @@ -679,7 +679,7 @@ using namespace ::com::sun::star; bSuccess = xJVM.is() && ::connectivity::existsJavaClassByName(xJVM,m_pETDriverClass->GetText()); } } - catch(::com::sun::star::uno::Exception&) + catch(css::uno::Exception&) { } #endif diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 03c30af11c2d..2be611028c7b 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -699,7 +699,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r lcl_putProperty(_rxDest,PROPERTY_INFO, makeAny(aInfo)); } -void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rSource, Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo) +void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rSource, Sequence< css::beans::PropertyValue >& _rInfo) { // within the current "Info" sequence, replace the ones we can examine from the item set // (we don't just fill a completely new sequence with our own items, but we preserve any properties unknown to diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 5f952cfd2591..f00ba18d059e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -42,11 +42,11 @@ namespace dbaui { namespace DataSourceInfoConverter { - void convert(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> & xContext, + void convert(const css::uno::Reference< css::uno::XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection, const OUString& _sOldURLPrefix, const OUString& _sNewURLPrefix, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource); + const css::uno::Reference< css::beans::XPropertySet >& _xDatasource); }; class IItemSetHelper; // ODbDataSourceAdministrationHelper @@ -56,14 +56,14 @@ namespace dbaui typedef std::map<sal_Int32, OUString> MapInt2String; private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; /// service factory - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > + css::uno::Reference< css::uno::XComponentContext > + m_xContext; /// service factory + css::uno::Reference< css::sdb::XDatabaseContext > m_xDatabaseContext; /// database context we're working in - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::beans::XPropertySet > m_xDatasource; + css::uno::Reference< css::frame::XModel > m_xModel; - ::com::sun::star::uno::Any m_aDataSourceOrName; + css::uno::Any m_aDataSourceOrName; typedef ::std::set< OUString > StringSet; typedef StringSet::const_iterator ConstStringSetIterator; @@ -73,14 +73,14 @@ namespace dbaui IItemSetHelper* m_pItemSetHelper; public: - ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB + ODbDataSourceAdministrationHelper(const css::uno::Reference< css::uno::XComponentContext >& _xORB ,vcl::Window* _pParent ,IItemSetHelper* _pItemSetHelper); /** translate the current dialog SfxItems into driver relevant PropertyValues @see successfullyConnected */ - bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + bool getCurrentSettings(css::uno::Sequence< css::beans::PropertyValue >& _rDriverParams); /** to be called if the settings got from getCurrentSettings have been used for successfully connecting @see getCurrentSettings @@ -90,26 +90,26 @@ namespace dbaui /// clear the password in the current data source's item set void clearPassword(); - inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const { return m_xContext; } + inline css::uno::Reference< css::uno::XComponentContext > getORB() const { return m_xContext; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > getDatabaseContext() const { return m_xDatabaseContext; } + css::uno::Reference< css::sdb::XDatabaseContext > getDatabaseContext() const { return m_xDatabaseContext; } /** creates a new connection. The caller is responsible to dispose it !!!! */ - ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); + ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection(); /** return the corresponding driver for the selected URL */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const OUString& _sURL); + css::uno::Reference< css::sdbc::XDriver > getDriver(); + css::uno::Reference< css::sdbc::XDriver > getDriver(const OUString& _sURL); /** returns the data source the dialog is currently working with */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + css::uno::Reference< css::beans::XPropertySet > getCurrentDataSource(); // returns the Url of a database document static OUString getDocumentUrl(SfxItemSet& _rDest); - void setDataSourceOrName( const ::com::sun::star::uno::Any& _rDataSourceOrName ); + void setDataSourceOrName( const css::uno::Any& _rDataSourceOrName ); /** extracts the connection type from the given set<p/> The connection type is determined by the value of the DSN item, analyzed by the TypeCollection item. @@ -134,7 +134,7 @@ namespace dbaui The item set to fill. */ void translateProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSource, + const css::uno::Reference< css::beans::XPropertySet >& _rxSource, SfxItemSet& _rDest); /** translate SfxItems into properties of an UNO data source @@ -145,22 +145,22 @@ namespace dbaui */ void translateProperties( const SfxItemSet& _rSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDest); + const css::uno::Reference< css::beans::XPropertySet >& _rxDest); bool saveChanges(const SfxItemSet& _rSource); protected: /** fill a data source info array with the settings from a given item set */ - void fillDatasourceInfo(const SfxItemSet& _rSource, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); + void fillDatasourceInfo(const SfxItemSet& _rSource, css::uno::Sequence< css::beans::PropertyValue >& _rInfo); /// translate the given value into an SfxPoolItem, put this into the given set under the given id - void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); + void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const css::uno::Any& _rValue); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type> - static ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); + static css::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type>, set it (under the given name) on the given property set - static void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const OUString& _rName, const SfxPoolItem* _pItem); + static void implTranslateProperty(const css::uno::Reference< css::beans::XPropertySet >& _rxSet, const OUString& _rName, const SfxPoolItem* _pItem); /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index b613cd697590..315d759e03e4 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 071c346df3ba..eec6a06da4e4 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -41,7 +41,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 8a29c4873208..8c36806c5e24 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star::container; OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName) + ,const css::uno::Any& _aDataSourceName) : SfxSingleTabDialog(pParent, _pItems, "TablesFilterDialog", "dbaccess/ui/tablesfilterdialog.ui") , m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) ) diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index f08b43f4dfa2..d3084e220bc1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -48,9 +48,9 @@ protected: VclPtr<PushButton> m_pDELETEUSER; VclPtr<OTableGrantControl> m_TableCtrl; // show the grant rights of one user - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< OUString> m_aUserNames; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; + css::uno::Reference< css::container::XNameAccess > m_xUsers; + css::uno::Sequence< OUString> m_aUserNames; OUString m_UserName; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 57f8c8ec2673..0d138142b99a 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -49,7 +49,7 @@ namespace dbaui OUserAdminDlg::OUserAdminDlg(vcl::Window* _pParent , SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Any& _aDataSourceName ,const Reference< XConnection >& _xConnection) : SfxTabDialog(_pParent, "UserAdminDialog", "dbaccess/ui/useradmindialog.ui", _pItems) , m_pItemSet(_pItems) diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 072d2800bb3a..dfc47c8e11a7 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -97,10 +97,10 @@ namespace dbaui bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; - IItemSetHelper* m_pItemSetHelper; + IItemSetHelper* m_pItemSetHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xORB; + css::uno::Reference< css::uno::XComponentContext > + m_xORB; public: OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); /// set a handler which gets called every time something on the page has been modified @@ -123,7 +123,7 @@ namespace dbaui @param _rxORB The service factory. */ - void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxORB) + void SetServiceFactory(const css::uno::Reference< css::uno::XComponentContext >& rxORB) { m_xORB = rxORB; } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 3f541a1fd168..769d3ff53b1a 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -80,9 +80,9 @@ private: virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; virtual bool isLeafSelected() const SAL_OVERRIDE; // OContainerListener - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; TableListFacade::~TableListFacade() @@ -133,17 +133,17 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const return aComposedName; } -void TableListFacade::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void TableListFacade::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { updateTableObjectList(m_bAllowViews); } -void TableListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void TableListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { updateTableObjectList(m_bAllowViews); } -void TableListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void TableListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { } @@ -240,9 +240,9 @@ private: virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; virtual bool isLeafSelected() const SAL_OVERRIDE; // OContainerListener - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; QueryListFacade::~QueryListFacade() @@ -251,19 +251,19 @@ QueryListFacade::~QueryListFacade() m_pContainerListener->dispose(); } -void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) { OUString sName; if ( _rEvent.Accessor >>= sName ) m_rQueryList.InsertEntry( sName ); } -void QueryListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void QueryListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { updateTableObjectList(true); } -void QueryListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void QueryListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index f20c732e2781..5d69c14af6f7 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -103,7 +103,7 @@ void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, Cre m_aCurrentDetailPages.push(_nPageId); } -void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName) +void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName) { m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -255,7 +255,7 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() return AR_LEAVE_MODIFIED; } -void ODbAdminDialog::selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName) +void ODbAdminDialog::selectDataSource(const css::uno::Any& _aDataSourceName) { impl_selectDataSource(_aDataSourceName); } diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index f767f4ea31e9..45dd2c53b090 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -300,7 +300,7 @@ void ODbaseIndexDialog::Init() bool bFolder=true; try { - aFile = ::ucbhelper::Content(m_aDSN,Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); + aFile = ::ucbhelper::Content(m_aDSN,Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); bFolder = aFile.isFolder(); } catch(Exception&) diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index fe2b76f5fec7..9d00028cd05e 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -65,7 +65,7 @@ using namespace com::sun::star::container; ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Any& _aDataSourceName ) :OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pOutSet(NULL) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 180b2f8dea75..6dd40a7fd15f 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -104,7 +104,7 @@ using namespace ::cppu; ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Any& _aDataSourceName ) :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) @@ -299,7 +299,7 @@ void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::co } } -void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) +void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const css::uno::Reference< css::beans::XPropertySet >& _xDatasource) { if ( _pCollection->getPrefix(_sOldURLPrefix) == _pCollection->getPrefix(_sNewURLPrefix) ) return ; @@ -896,10 +896,10 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: DECL_LINK( OnOpenDocument, void* ); @@ -973,15 +973,15 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() return 0L; } - void SAL_CALL AsyncLoader::queryTermination( const com::sun::star::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception) + void SAL_CALL AsyncLoader::queryTermination( const css::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception) { throw TerminationVetoException(); } - void SAL_CALL AsyncLoader::notifyTermination( const com::sun::star::lang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL AsyncLoader::notifyTermination( const css::lang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) { } - void SAL_CALL AsyncLoader::disposing( const com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL AsyncLoader::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { } } diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 190d4a71c8d0..120d075411f5 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -181,7 +181,7 @@ namespace dbaui ::osl::MutexGuard aGuard(m_aMutex); OUString sStatus; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; + css::uno::Reference< css::sdbc::XResultSet > xResultSet; try { // create a statement @@ -197,7 +197,7 @@ namespace dbaui // execute it as a query xResultSet = xStatement->executeQuery(_rStatement); // get a handle for the rows - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::sdbc::XRow > xRow( xResultSet, css::uno::UNO_QUERY ); // work through each of the rows while (xResultSet->next()) { diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 46bbbacf63c7..ffeaba0782ca 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -56,18 +56,17 @@ public: VclPtr<FixedText> m_pLabel; VclPtr<OSQLNameEdit> m_pTitle; VclPtr<OKButton> m_pPB_OK; - OUString m_aQryLabel; - OUString m_sTblLabel; - OUString m_aName; - const IObjectNameCheck& - m_rObjectNameCheck; - OUString m_sParentURL; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - sal_Int32 m_nType; - sal_Int32 m_nFlags; + OUString m_aQryLabel; + OUString m_sTblLabel; + OUString m_aName; + const IObjectNameCheck& m_rObjectNameCheck; + OUString m_sParentURL; + css::uno::Reference< css::sdbc::XDatabaseMetaData> m_xMetaData; + sal_Int32 m_nType; + sal_Int32 m_nFlags; OSaveAsDlgImpl( OSaveAsDlg* pParent,const sal_Int32& _rType, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index 56d6c2a9a710..12057275d2a3 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -27,7 +27,7 @@ namespace dbaui { // OFilePickerInteractionHandler - typedef ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionHandler + typedef ::cppu::WeakImplHelper< css::task::XInteractionHandler > OFilePickerInteractionHandler_Base; /** a InteractionHandler implementation which extends another handler with some customizability @@ -35,18 +35,18 @@ namespace dbaui class OFilePickerInteractionHandler : public OFilePickerInteractionHandler_Base { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > + css::uno::Reference< css::task::XInteractionHandler > m_xMaster; // our master handler - bool m_bDoesNotExist; + bool m_bDoesNotExist; public: - explicit OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ); + explicit OFilePickerInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _rxMaster ); bool isDoesNotExist() const { return m_bDoesNotExist; } protected: // XInteractionHandler - virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ~OFilePickerInteractionHandler(); }; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 8d82f1eaf4fe..5829902f42cb 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -202,7 +202,7 @@ namespace dbaui m_pTablesList->CheckButtons(); } - void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ) + void OTableSubscriptionPage::implCompleteTablesCheck( const css::uno::Sequence< OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) { // no tables visible @@ -289,7 +289,7 @@ namespace dbaui xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) ); - Reference< ::com::sun::star::lang::XEventListener> xEvt; + Reference< css::lang::XEventListener> xEvt; aErrorInfo = ::dbaui::createConnection(xProp, m_xORB, xEvt, m_xCurrentConnection); xProp->setPropertyValue(PROPERTY_TABLEFILTER,aTableFilter); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 2b8d9f223880..6b2c8b25b12c 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -39,13 +39,13 @@ namespace dbaui VclPtr<VclContainer> m_pTables; VclPtr<OTableTreeListBox> m_pTablesList; - OUString m_sCatalogSeparator; - bool m_bCatalogAtStart : 1; + OUString m_sCatalogSeparator; + bool m_bCatalogAtStart : 1; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xCurrentConnection; /// valid as long as the page is active - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > - m_xCollator; + css::uno::Reference< css::sdbc::XConnection > + m_xCurrentConnection; /// valid as long as the page is active + css::uno::Reference< css::i18n::XCollator > + m_xCollator; VclPtr<OTableSubscriptionDialog> m_pTablesDlg; public: @@ -71,14 +71,14 @@ namespace dbaui /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ - void implCheckTables(const ::com::sun::star::uno::Sequence< OUString >& _rTables); + void implCheckTables(const css::uno::Sequence< OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const; /** return the current selection in <member>m_aTablesList</member> */ - ::com::sun::star::uno::Sequence< OUString > collectDetailedSelection() const; + css::uno::Sequence< OUString > collectDetailedSelection() const; /// (un)check all entries void CheckAll( bool bCheck = true ); @@ -87,7 +87,7 @@ namespace dbaui // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... - void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ); + void implCompleteTablesCheck( const css::uno::Sequence< OUString >& _rTableFilter ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx index 85c46ebdea00..bcc0d3052fc2 100644 --- a/dbaccess/source/ui/inc/AppElementType.hxx +++ b/dbaccess/source/ui/inc/AppElementType.hxx @@ -26,10 +26,10 @@ namespace dbaui enum ElementType { - E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, - E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, - E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, - E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, + E_TABLE = css::sdb::application::DatabaseObject::TABLE, + E_QUERY = css::sdb::application::DatabaseObject::QUERY, + E_FORM = css::sdb::application::DatabaseObject::FORM, + E_REPORT = css::sdb::application::DatabaseObject::REPORT, E_NONE = 4, E_ELEMENT_TYPE_COUNT = E_NONE diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index f407b70bc918..3b2ac64ec2f6 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -40,9 +40,9 @@ namespace dbaui VclPtr<SvtFileView> m_pView; VclPtr<Edit> m_pName; VclPtr<PushButton> m_pPB_OK; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - bool m_bCreateForm; + css::uno::Reference< css::ucb::XContent> m_xContent; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + bool m_bCreateForm; DECL_LINK(Up_Click,void*); DECL_LINK(NewFolder_Click,void*); @@ -53,12 +53,12 @@ namespace dbaui void initCurrentPath(); public: OCollectionView( vcl::Window * pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent + ,const css::uno::Reference< css::ucb::XContent>& _xContent ,const OUString& _sDefaultName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const { return m_xContent;} + css::uno::Reference< css::ucb::XContent> getSelectedFolder() const { return m_xContent;} OUString getName() const; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 583481a7d7b2..02a9409143a6 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -29,10 +29,10 @@ namespace dbaui // OColumnControlWindow class OColumnControlWindow : public OFieldDescControl { - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + css::lang::Locale m_aLocale; + css::uno::Reference< css::uno::XComponentContext> m_xContext; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; + mutable css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier OTypeInfoMap m_aDestTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; @@ -45,8 +45,8 @@ namespace dbaui virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale GetLocale() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; @@ -54,12 +54,12 @@ namespace dbaui public: OColumnControlWindow(vcl::Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + ,const css::uno::Reference< css::uno::XComponentContext>& _rxContext); - void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xCon); + void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; TOTypeInfoSP getDefaultTyp() const; }; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 8df3cf848f34..1c2f0d85478a 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -26,8 +26,8 @@ namespace dbaui { - typedef ::cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleRelationSet, - ::com::sun::star::accessibility::XAccessible + typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleRelationSet, + css::accessibility::XAccessible > OConnectionLineAccess_BASE; class OTableConnection; /** the class OConnectionLineAccess represents the accessible object for the connection between two table windows @@ -46,7 +46,7 @@ namespace dbaui OConnectionLineAccess(OTableConnection* _pLine); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::acquire( ); @@ -57,36 +57,36 @@ namespace dbaui } // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleRelationSet - virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index dea8bd578f8f..55a08e929e34 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -65,25 +65,25 @@ namespace dbaui ::std::vector<sal_Int32> m_vColumnTypes; ///< ColumnTypes for faster access ::std::vector<sal_Int32> m_vColumnSize; ::std::vector<sal_Int16> m_vNumberFormat; - ::com::sun::star::lang::Locale m_aLocale; + css::lang::Locale m_aLocale; TColumns m_aDestColumns; ///< container for new created columns TColumnVector m_vDestVector; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; ///< dest table - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xTables; ///< container - SharedConnection m_xConnection; ///< dest conn + css::uno::Reference< css::beans::XPropertySet > m_xTable; ///< dest table + css::uno::Reference< css::container::XNameAccess> m_xTables; ///< container + SharedConnection m_xConnection; ///< dest conn - ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ///< a number formatter working with the connection's NumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; - ::com::sun::star::util::Date m_aNullDate; + ::boost::shared_ptr<IUpdateHelper> m_pUpdateHelper; + css::uno::Reference< css::sdbc::XResultSet > m_xResultSet; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; ///< a number formatter working with the connection's NumberFormatsSupplier + css::uno::Reference< css::uno::XComponentContext> m_xContext; + css::util::Date m_aNullDate; SvNumberFormatter* m_pFormatter; SvStream& m_rInputStream; /// for saving the selected tablename - OUString m_sDefaultTableName; + OUString m_sDefaultTableName; OUString m_sTextToken; ///< cell content OUString m_sNumToken; ///< SDNUM value @@ -115,7 +115,7 @@ namespace dbaui void eraseTokens(); void insertValueIntoColumn(); bool createRowSet(); - void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); + void showErrorDialog(const css::sdbc::SQLException& e); void ensureFormatter(); /** executeWizard calls a wizard to create/append data @@ -127,16 +127,16 @@ namespace dbaui @return true when an error occurs */ bool executeWizard( const OUString& _sTableName, - const ::com::sun::star::uno::Any& _aTextColor, - const ::com::sun::star::awt::FontDescriptor& _rFont); + const css::uno::Any& _aTextColor, + const css::awt::FontDescriptor& _rFont); virtual ~ODatabaseExport(); public: ODatabaseExport( const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, const OTypeInfoMap* _pInfoMap, SvStream& _rInputStream @@ -146,8 +146,8 @@ namespace dbaui ODatabaseExport( sal_Int32 nRows, const TPositions& _rColumnPositions, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled, @@ -163,8 +163,8 @@ namespace dbaui void enableCheckOnly() { m_bCheckOnly = true; } bool isCheckEnabled() const { return m_bCheckOnly; } - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > createPreparedStatment( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDestTable + static css::uno::Reference< css::sdbc::XPreparedStatement > createPreparedStatment( const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData + ,const css::uno::Reference< css::beans::XPropertySet>& _xDestTable ,const TPositions& _rvColumns); }; } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 6b58cabddd19..4d5cef55694a 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -152,9 +152,9 @@ namespace dbaui virtual void DeactivateAggregate( EControlType eType ); virtual bool IsReadOnly() { return false; }; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const = 0; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const = 0; - virtual ::com::sun::star::lang::Locale GetLocale() const = 0; + virtual css::lang::Locale GetLocale() const = 0; virtual void CellModified(long nRow, sal_uInt16 nColId ) = 0; virtual void SetModified(bool bModified); // base implementation is empty @@ -162,8 +162,8 @@ namespace dbaui virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) = 0; virtual const OTypeInfoMap* getTypeInfo() const = 0; - virtual bool isAutoIncrementValueEnabled() const = 0; - virtual OUString getAutoIncrementValue() const = 0; + virtual bool isAutoIncrementValueEnabled() const = 0; + virtual OUString getAutoIncrementValue() const = 0; OUString BoolStringPersistent(const OUString& rUIString) const; OUString BoolStringUI(const OUString& rPersistentString) const; @@ -200,8 +200,8 @@ namespace dbaui virtual void LoseFocus() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() = 0; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() = 0; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() = 0; OUString getControlDefault( const OFieldDescription* _pFieldDescr, bool _bCheck = true) const; diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 14c542fa7752..07029cef9f8e 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -31,45 +31,45 @@ namespace dbaui class OFieldDescription { private: - ::com::sun::star::uno::Any m_aDefaultValue; // the default value from the database - ::com::sun::star::uno::Any m_aControlDefault; // the value which the control inserts as default - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void + css::uno::Any m_aDefaultValue; // the default value from the database + css::uno::Any m_aControlDefault; // the value which the control inserts as default + css::uno::Any m_aWidth; // sal_Int32 or void + css::uno::Any m_aRelativePosition; // sal_Int32 or void - TOTypeInfoSP m_pType; + TOTypeInfoSP m_pType; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; + css::uno::Reference< css::beans::XPropertySet > m_xDest; + css::uno::Reference< css::beans::XPropertySetInfo > m_xDestInfo; OUString m_sName; OUString m_sTypeName; OUString m_sDescription; OUString m_sHelpText; - OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Int32 m_nType; // only used when m_pType is null sal_Int32 m_nPrecision; sal_Int32 m_nScale; sal_Int32 m_nIsNullable; sal_Int32 m_nFormatKey; SvxCellHorJustify m_eHorJustify; - bool m_bIsAutoIncrement; - bool m_bIsPrimaryKey; - bool m_bIsCurrency; - bool m_bHidden; + bool m_bIsAutoIncrement; + bool m_bIsPrimaryKey; + bool m_bIsCurrency; + bool m_bHidden; public: OFieldDescription(); OFieldDescription( const OFieldDescription& rDescr ); - OFieldDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xAffectedCol + OFieldDescription(const css::uno::Reference< css::beans::XPropertySet >& _xAffectedCol ,bool _bUseAsDest = false); ~OFieldDescription(); void SetName(const OUString& _rName); void SetDescription(const OUString& _rDescription); void SetHelpText(const OUString& _sHelptext); - void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); - void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault); + void SetDefaultValue(const css::uno::Any& _rDefaultValue); + void SetControlDefault(const css::uno::Any& _rControlDefault); void SetAutoIncrementValue(const OUString& _sAutoIncValue); void SetType(TOTypeInfoSP _pType); void SetTypeValue(sal_Int32 _nType); @@ -86,14 +86,14 @@ namespace dbaui /** copies the content of the field eescription into the column @param _rxColumn the dest */ - void copyColumnSettingsTo(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn); + void copyColumnSettingsTo(const css::uno::Reference< css::beans::XPropertySet >& _rxColumn); void FillFromTypeInfo(const TOTypeInfoSP& _pType,bool _bForce,bool _bReset); OUString GetName() const; OUString GetDescription() const; OUString GetHelpText() const; - ::com::sun::star::uno::Any GetControlDefault() const; + css::uno::Any GetControlDefault() const; OUString GetAutoIncrementValue() const; sal_Int32 GetType() const; OUString GetTypeName() const; diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 9c2eeb4fb27d..641c3752cc98 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -44,7 +44,7 @@ namespace dbaui getTypeSelectionPageFactory() SAL_OVERRIDE; void TableDataOn(SvxCellHorJustify& eVal); - void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); + void TableFontOn(css::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); sal_Int16 GetWidthPixel( const HTMLOption& rOption ); void setTextEncoding(); void fetchOptions(); @@ -53,16 +53,16 @@ namespace dbaui public: OHTMLReader(SvStream& rIn, const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList = 0, const OTypeInfoMap* _pInfoMap = 0); // required for automatic type recognition OHTMLReader(SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled); diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 4854955b67b9..17c90f2e5e7d 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -50,9 +50,9 @@ namespace dbaui class SAL_NO_VTABLE IDatabaseSettingsDialog { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const = 0; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const = 0; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() = 0; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() = 0; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; virtual bool saveDatasource() = 0; diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index c23a9dbd930e..782887eb5f2a 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -32,9 +32,9 @@ namespace dbaui virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) = 0; virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) = 0; virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) = 0; - virtual void updateDate(sal_Int32 _nPos,const ::com::sun::star::util::Date& _nValue) = 0; - virtual void updateTime(sal_Int32 _nPos,const ::com::sun::star::util::Time& _nValue) = 0; - virtual void updateTimestamp(sal_Int32 _nPos,const ::com::sun::star::util::DateTime& _nValue) = 0; + virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) = 0; + virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) = 0; + virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) = 0; virtual void moveToInsertRow() = 0; virtual void insertRow() = 0; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 11604c2e2fd3..b222c01753b3 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -26,7 +26,7 @@ namespace dbaui { class OJoinTableView; - typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessible + typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > OJoinDesignViewAccess_BASE; /** the class OJoinDesignViewAccess represents the accessible object for join views like the QueryDesign and the RelationDesign @@ -45,24 +45,24 @@ namespace dbaui DECLARE_XTYPEPROVIDER( ) // XServiceInfo - static methods - static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; OJoinTableView* getTableView() const { return m_pTableView; } void notifyAccessibleEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 180b139769d9..1ccdd560618a 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -55,10 +55,10 @@ namespace dbaui ::std::unique_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; /** loads the information for the windows. @param i_rViewSettings @@ -80,7 +80,7 @@ namespace dbaui virtual ~OJoinController(); public: - OJoinController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + OJoinController(const css::uno::Reference< css::uno::XComponentContext >& _rM); // attribute access inline TTableWindowData& getTableWindowData() { return m_vTableData; } @@ -117,12 +117,12 @@ namespace dbaui // UNO interface overridables // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XController + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // misc /** only defines a method to save a SQLException in d&d methods to show the error at a later state diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index da50da1e20ac..a292b36001ec 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -40,7 +40,7 @@ namespace dbaui public: OJoinDesignView(vcl::Window* pParent, OJoinController& _rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~OJoinDesignView(); virtual void dispose() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 34e0d83166bc..96ba728e78d7 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -30,7 +30,7 @@ namespace dbaui { // OJoinExchObj: Additional data to create Joins in the JoinShell - typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel > OJoinExchObj_Base; + typedef ::cppu::ImplHelper1< css::lang::XUnoTunnel > OJoinExchObj_Base; class OJoinExchObj : public TransferableHelper, public OJoinExchObj_Base { static OUString m_sJoinFormat; @@ -47,16 +47,16 @@ namespace dbaui // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); - static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); + static OJoinExchangeData GetSourceDescription(const css::uno::Reference< css::datatransfer::XTransferable >& _rxObject); static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID=SotClipboardFormatId::SBA_JOIN); protected: @@ -64,7 +64,7 @@ namespace dbaui virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); private: using TransferableHelper::StartDrag; diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index fcaf4375f181..09df160ab198 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -122,7 +122,7 @@ namespace dbaui virtual void LoseFocus() SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; // Accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // own methods ScrollBar& GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); } diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 04d2724f94f1..64d8fae01233 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -66,7 +66,7 @@ namespace dbaui VclPtr<Splitter> m_aSplitter; - ::com::sun::star::lang::Locale m_aLocale; + css::lang::Locale m_aLocale; OUString m_sDecimalSep; VclPtr<OSelectionBrowseBox> m_pSelectionBox; // presents the lower window @@ -74,7 +74,7 @@ namespace dbaui bool m_bInSplitHandler; public: - OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~OQueryDesignView(); virtual void dispose() SAL_OVERRIDE; @@ -105,7 +105,7 @@ namespace dbaui void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable); void setNoneVisbleRow(sal_Int32 _nRows); - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + css::lang::Locale getLocale() const { return m_aLocale;} OUString getDecimalSeparator() const { return m_sDecimalSep;} SqlParseError InsertField( const OTableFieldDescRef& rInfo, bool bVis = true, bool bActivate = true); @@ -137,13 +137,13 @@ namespace dbaui bool initByParseIterator( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void initByFieldDescriptions( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rFieldDescriptions + const css::uno::Sequence< css::beans::PropertyValue >& i_rFieldDescriptions ); ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, const OUString& _sCriteria, OUString& _rsErrorMessage, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; + css::uno::Reference< css::beans::XPropertySet>& _rxColumn) const; void fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode ,const OUString& sFunctionTerm diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index ccf45802c394..eb7bf8f2db96 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -38,7 +38,7 @@ namespace dbaui VclPtr<OQueryTextView> m_pTextView; bool m_bAddTableDialogWasVisible; // true if so public: - OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryViewSwitch(OQueryContainerWindow* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~OQueryViewSwitch(); bool isCutAllowed(); @@ -80,7 +80,7 @@ namespace dbaui OQueryContainerWindow* getContainer() const; void SetPosSizePixel( Point _rPt,Size _rSize); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; + css::uno::Reference< css::uno::XComponentContext > getORB() const; private: void impl_forceSQLView(); diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index bf33e90c08c9..833f2f421ca4 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -44,7 +44,7 @@ namespace dbaui sal_Int32 m_nDeleteRules; sal_Int32 m_nCardinality; - bool checkPrimaryKey(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& i_xTable, EConnectionSide _eEConnectionSide) const; + bool checkPrimaryKey(const css::uno::Reference< css::beans::XPropertySet>& i_xTable, EConnectionSide _eEConnectionSide) const; bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index a499b2120dad..3fa39ed98d98 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -39,7 +39,7 @@ namespace dbaui */ virtual void setValid(bool _bValid) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() = 0; + virtual css::uno::Reference< css::sdbc::XConnection > getConnection() = 0; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 4edbecf07164..75b99d31761f 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -28,17 +28,17 @@ namespace dbaui { class ORelationController : public OJoinController { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; + css::uno::Reference< css::container::XNameAccess > m_xTables; ::std::unique_ptr<WaitObject> m_pWaitObject; sal_uLong m_nThreadEvent; - bool m_bRelationsPossible; + bool m_bRelationsPossible; protected: // all the features which should be handled by this class virtual void describeSupportedFeatures() SAL_OVERRIDE; - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; ORelationDesignView* getRelationView() { return static_cast<ORelationDesignView*>( getView() ); } void loadData(); @@ -46,9 +46,9 @@ namespace dbaui // load the window positions out of the datasource void loadLayoutInformation(); - void loadTableData(const ::com::sun::star::uno::Any& _aTable); + void loadTableData(const css::uno::Any& _aTable); public: - ORelationController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + ORelationController(const css::uno::Reference< css::uno::XComponentContext >& _rM); virtual ~ORelationController(); // temp @@ -59,13 +59,13 @@ namespace dbaui virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // OJoinController overridables virtual bool allowViews() const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 7f1559427eb9..5f8698c82634 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -32,7 +32,7 @@ namespace dbaui class ORelationDesignView : public OJoinDesignView { public: - ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); // set the statement for representation /// late construction diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 3435632c08f8..877b56f8a117 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -48,13 +48,13 @@ namespace dbaui VclPtr<RadioButton> m_pRB_CascDelNull; VclPtr<RadioButton> m_pRB_CascDelDefault; - VclPtr<OKButton> m_pPB_OK; + VclPtr<OKButton> m_pPB_OK; - TTableConnectionData::value_type m_pConnData; - TTableConnectionData::value_type m_pOrigConnData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + TTableConnectionData::value_type m_pConnData; + TTableConnectionData::value_type m_pOrigConnData; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; - bool m_bTriedOneUpdate; + bool m_bTriedOneUpdate; public: ORelationDialog(OJoinTableView* pParent, @@ -63,7 +63,7 @@ namespace dbaui virtual ~ORelationDialog(); virtual void dispose() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } + virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } virtual short Execute() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index da09f88bf900..fe544612c873 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -47,9 +47,9 @@ namespace dbaui virtual bool allowQueries() const SAL_OVERRIDE; // OContainerListener - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 29073306abd2..3ef2d7137e35 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -41,16 +41,16 @@ namespace dbaui public: ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList = 0, const OTypeInfoMap* _pInfoMap = 0); // required for automatic type recognition ORTFReader( SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* rList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled); diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 8d63648e8943..4ca37253aeec 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -97,7 +97,7 @@ namespace dbaui inline OJoinTableView* GetParent() const { return m_pParent; } virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect); using Window::Draw; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; } #endif diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 6bb0b2c0f95b..931c4d058a1a 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -43,17 +43,17 @@ namespace dbaui OTypeInfoMap m_aTypeInfo; ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; + css::uno::Reference< css::beans::XPropertySet > m_xTable; - OUString m_sCatalogName; // catalog for update data - OUString m_sSchemaName; // schema for update data - OUString m_sName; // table for update data - OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource + OUString m_sCatalogName; // catalog for update data + OUString m_sSchemaName; // schema for update data + OUString m_sName; // table for update data + OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource OUString m_sTypeNames; // these type names are the ones out of the resource file TOTypeInfoSP m_pTypeInfo; // fall back when type is unknown because database driver has a failure - bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property - bool m_bNew : 1; // is true when we create a new table + bool m_bAllowAutoIncrementValue; // no : 1 NO BIT , is true when the datasource has a AutoIncrementValue property in their info property + bool m_bNew : 1; // is true when we create a new table void reSyncRows(); @@ -62,22 +62,22 @@ namespace dbaui bool checkColumns(bool _bNew) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); // check if we have double column names - OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const OUString& _rDefault); - void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false); - void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup, bool _bNew); + OUString createUniqueName(const css::uno::Reference< css::container::XNameAccess>& _rxTables,const OUString& _rDefault); + void appendColumns(css::uno::Reference< css::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false); + void appendPrimaryKey(css::uno::Reference< css::sdbcx::XKeysSupplier>& _rxSup, bool _bNew); void alterColumns(); void dropPrimaryKey(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const; + css::uno::Reference< css::container::XNameAccess> getKeyColumns() const; OUString createUniqueName(const OUString& _rName); void reload(); // all the features which should be handled by this class virtual void describeSupportedFeatures() SAL_OVERRIDE; - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; virtual void losingConnection( ) SAL_OVERRIDE; @@ -88,9 +88,9 @@ namespace dbaui virtual ~OTableController(); public: - OTableController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + OTableController(const css::uno::Reference< css::uno::XComponentContext >& _rM); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getTable() { return m_xTable;} + css::uno::Reference< css::beans::XPropertySet > getTable() { return m_xTable;} bool isAddAllowed() const; bool isDropAllowed() const; @@ -116,22 +116,22 @@ namespace dbaui virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XController + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); protected: void startTableListening(); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 1e921ab34c03..20e951c9928f 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -177,14 +177,14 @@ namespace dbaui */ void insertTable( const OUString& i_rSourceDataSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rSourceConnection, + const css::uno::Reference< css::sdbc::XConnection>& i_rSourceConnection, const OUString& i_rCommand, const sal_Int32 i_nCommandType, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& i_rSourceRows, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelection, + const css::uno::Reference< css::sdbc::XResultSet >& i_rSourceRows, + const css::uno::Sequence< css::uno::Any >& i_rSelection, const bool i_bBookmarkSelection, const OUString& i_rDestDataSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rDestConnection + const css::uno::Reference< css::sdbc::XConnection>& i_rDestConnection ); }; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 7fce3fd8c2dc..c6b3f1d71e05 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -48,8 +48,8 @@ namespace dbaui OTableRowView(vcl::Window* pParent); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; - virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0; - virtual ::com::sun::star::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) = 0; + virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rNewData ) = 0; + virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) = 0; virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) = 0; virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) = 0; diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 7a1016f6753f..863628c153f3 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -62,7 +62,7 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; + css::lang::Locale m_aLocale; VclPtr<OTableBorderWindow> m_pWin; OTableController& m_rController; ChildFocusState m_eChildFocus; @@ -75,7 +75,7 @@ namespace dbaui public: OTableDesignView( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, + const css::uno::Reference< css::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); virtual void dispose() SAL_OVERRIDE; @@ -88,7 +88,7 @@ namespace dbaui OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } OTableController& getController() const { return m_rController; } - ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} + css::lang::Locale getLocale() const { return m_aLocale;} // IClipboardTest virtual bool isCutAllowed() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index d8e5f3d524d2..adc5ab3d7cd0 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -129,7 +129,7 @@ namespace dbaui const ::std::vector< OUString>& GetCriteria() const { return m_aCriteria; } - void Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); + void Load( const css::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); }; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index a7c5af0540e2..9d73ff7e3919 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -45,16 +45,16 @@ class OTableGrantControl : public ::svt::EditBrowseBox OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; - ::com::sun::star::uno::Sequence< OUString> m_aTableNames; + css::uno::Reference< css::container::XNameAccess > m_xUsers; + css::uno::Reference< css::container::XNameAccess > m_xTables; + css::uno::Reference< css::uno::XComponentContext> m_xContext; + css::uno::Reference< css::sdbcx::XAuthorizable> m_xGrantUser; + css::uno::Sequence< OUString> m_aTableNames; mutable TTablePrivilegeMap m_aPrivMap; - OUString m_sUserName; + OUString m_sUserName; VclPtr< ::svt::CheckBoxControl> m_pCheckCell; - VclPtr<Edit> m_pEdit; + VclPtr<Edit> m_pEdit; long m_nDataPos; ImplSVEvent * m_nDeactivateEvent; @@ -64,10 +64,10 @@ public: virtual void dispose() SAL_OVERRIDE; void UpdateTables(); void setUserName(const OUString& _sUserName); - void setGrantUser(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable>& _xGrantUser); + void setGrantUser(const css::uno::Reference< css::sdbcx::XAuthorizable>& _xGrantUser); - void setTablesSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >& _xTablesSup); - void setComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + void setTablesSupplier(const css::uno::Reference< css::sdbcx::XTablesSupplier >& _xTablesSup); + void setComponentContext(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); virtual void Init() SAL_OVERRIDE; @@ -76,8 +76,8 @@ public: @param nRow The row index of the cell. @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< + css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; protected: diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index e2a2c99392db..ab49ece32e7f 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -38,7 +38,7 @@ namespace dbaui protected: public: OTableRow(); - OTableRow(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAffectedCol); + OTableRow(const css::uno::Reference< css::beans::XPropertySet >& xAffectedCol); OTableRow( const OTableRow& rRow, long nPosition = -1 ); ~OTableRow(); diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 7af8a8632bfc..45fa74b79688 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -35,7 +35,7 @@ namespace dbaui protected: virtual void AddSupportedFormats() SAL_OVERRIDE; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual void ObjectReleased() SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index c120d0ecfe47..4b8c8d5cb2cf 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -70,9 +70,9 @@ namespace dbaui bool m_bActive; // OContainerListener - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void Resize() SAL_OVERRIDE; @@ -112,8 +112,8 @@ namespace dbaui @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet>& _xColumn, + virtual void* createUserData(const css::uno::Reference< + css::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); /** updates m_aTypeImage @@ -156,8 +156,8 @@ namespace dbaui */ virtual OUString GetName() const = 0; - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } + inline css::uno::Reference< css::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } + inline css::uno::Reference< css::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } sal_uInt16 GetSizingFlags() const { return m_nSizingFlags; } /** set the sizing flag to the direction @@ -180,7 +180,7 @@ namespace dbaui virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; // Accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // do I have connections to the outside? bool ExistsAConn() const; diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index c03871c2b7ea..51ed4e379340 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -26,8 +26,8 @@ namespace dbaui { - typedef ::cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleRelationSet, - ::com::sun::star::accessibility::XAccessible + typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleRelationSet, + css::accessibility::XAccessible > OTableWindowAccess_BASE; class OTableWindow; /** the class OTableWindowAccess represents the accessible object for table windows @@ -38,7 +38,7 @@ namespace dbaui { VclPtr<OTableWindow> m_pTable; // the window which I should give accessibility to - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); + css::uno::Reference< css::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); protected: /** this function is called upon disposing the component */ @@ -49,7 +49,7 @@ namespace dbaui OTableWindowAccess( OTableWindow* _pTable); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::acquire( ); @@ -60,43 +60,43 @@ namespace dbaui } // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleRelationSet - virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void notifyAccessibleEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 29775a40fd7e..ce121a26030c 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -37,21 +37,21 @@ namespace dbaui void listen(); protected: // the columns of the table - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; // can either be a table or a query - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xKeys; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; + css::uno::Reference< css::beans::XPropertySet > m_xTable; // can either be a table or a query + css::uno::Reference< css::container::XIndexAccess> m_xKeys; + css::uno::Reference< css::container::XNameAccess > m_xColumns; - OUString m_aTableName; - OUString m_aWinName; - OUString m_sComposedName; + OUString m_aTableName; + OUString m_aWinName; + OUString m_sComposedName; Point m_aPosition; Size m_aSize; - bool m_bShowAll; + bool m_bShowAll; bool m_bIsQuery; bool m_bIsValid; public: - explicit OTableWindowData( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable + explicit OTableWindowData( const css::uno::Reference< css::beans::XPropertySet>& _xTable ,const OUString& _rComposedName ,const OUString& strTableName ,const OUString& rWinName = OUString() ); @@ -63,7 +63,7 @@ namespace dbaui * \param _bAllowQueries when true, queries are allowed * \return false if the table was unaccessible otherwise true */ - bool init(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection + bool init(const css::uno::Reference< css::sdbc::XConnection >& _xConnection ,bool _bAllowQueries); inline OUString GetComposedName() const { return m_sComposedName; } @@ -82,12 +82,12 @@ namespace dbaui inline void SetSize( const Size& rSize ) { m_aSize = rSize; } inline void ShowAll( bool bAll ) { m_bShowAll = bAll; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } + inline css::uno::Reference< css::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } + inline css::uno::Reference< css::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } + inline css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } // OEventListenerAdapter - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; }; typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> > TTableWindowData; diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 51977b928e4c..1a30236067b5 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -51,18 +51,18 @@ class ODbDataSourceAdministrationHelper; OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB + ,const css::uno::Any& _aDataSourceName ); virtual ~OTableSubscriptionDialog(); virtual void dispose() SAL_OVERRIDE; // forwards from ODbDataSourceAdministrationHelper void successfullyConnected(); - bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + bool getCurrentSettings(css::uno::Sequence< css::beans::PropertyValue >& _rDriverParams); void clearPassword(); OUString getConnectionURL() const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + css::uno::Reference< css::beans::XPropertySet > getCurrentDataSource(); inline void endExecution() { m_bStopExecution = true; } virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 390991e4d959..8424a2497518 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -48,53 +48,53 @@ namespace dbaui { // ODatabaseImportExport base class for import/export class ODatabaseExport; - typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE; + typedef ::cppu::WeakImplHelper< css::lang::XEventListener> ODatabaseImportExport_BASE; class ODatabaseImportExport : public ODatabaseImportExport_BASE { private: void impl_initializeRowMember_throw(); protected: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; - bool m_bBookmarkSelection; - SvStream* m_pStream; - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; // table/query + css::lang::Locale m_aLocale; + css::uno::Sequence< css::uno::Any> m_aSelection; + bool m_bBookmarkSelection; + SvStream* m_pStream; + css::awt::FontDescriptor m_aFont; + css::uno::Reference< css::beans::XPropertySet > m_xObject; // table/query SharedConnection m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate > m_xRowLocate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xResultSetMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xRowSetColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::sdbc::XResultSet > m_xResultSet; + css::uno::Reference< css::sdbc::XRow > m_xRow; + css::uno::Reference< css::sdbcx::XRowLocate > m_xRowLocate; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xResultSetMetaData; + css::uno::Reference< css::container::XIndexAccess > m_xRowSetColumns; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + css::uno::Reference< css::uno::XComponentContext > m_xContext; - OUString m_sName; + OUString m_sName; //for transfor the tablename - OUString m_sDefaultTableName; + OUString m_sDefaultTableName; - OUString m_sDataSourceName; - sal_Int32 m_nCommandType; - bool m_bNeedToReInitialize; + OUString m_sDataSourceName; + sal_Int32 m_nCommandType; + bool m_bNeedToReInitialize; ODatabaseExport* m_pReader; sal_Int32* m_pRowMarker; // if set, then copy only these rows rtl_TextEncoding m_eDestEnc; - bool m_bInInitialize; - bool m_bCheckOnly; + bool m_bInInitialize; + bool m_bCheckOnly; // export data ODatabaseImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); // import data ODatabaseImportExport( const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM); virtual ~ODatabaseImportExport(); @@ -115,7 +115,7 @@ namespace dbaui bool isCheckEnabled() const { return m_bCheckOnly; } private: - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void impl_initFromDescriptor( const svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; @@ -127,15 +127,15 @@ namespace dbaui public: // export data ORTFImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()) : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {}; // import data ORTFImportExport( const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM) + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM) : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} @@ -171,13 +171,13 @@ namespace dbaui public: // export data OHTMLImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM, + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); // import data OHTMLImportExport( const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM) + const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rM) : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) , m_nIndent(0) {} @@ -190,12 +190,12 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::vector<sal_Int32> m_aColumnMapping; ::std::vector<sal_Int32> m_aColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; + css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; + css::uno::Reference< css::sdbc::XRowUpdate > m_xTargetRowUpdate; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; VclPtr<vcl::Window> m_pParent; bool m_bAlreadyAsked; @@ -206,14 +206,14 @@ namespace dbaui public: // export data ORowSetImportExport(vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, + const css::uno::Reference< css::sdbc::XResultSetUpdate >& _xResultSetUpdate, const svx::ODataAccessDescriptor& _aDataDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, + const css::uno::Reference< css::uno::XComponentContext >& _rM, const OUString& rExchange = OUString()); // import data ORowSetImportExport(const SharedConnection& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM) + const css::uno::Reference< css::uno::XComponentContext >& _rM) : ODatabaseImportExport(_rxConnection,NULL,_rM) {} diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 42ada9d07062..dd7e41efffb3 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -90,10 +90,10 @@ const sal_uInt16 TYPE_BIT = 31; OTypeInfo() :nPrecision(0) ,nNumPrecRadix(10) - ,nType(::com::sun::star::sdbc::DataType::OTHER) + ,nType(css::sdbc::DataType::OTHER) ,nMaximumScale(0) ,nMinimumScale(0) - ,nSearchType(::com::sun::star::sdbc::ColumnSearch::FULL) + ,nSearchType(css::sdbc::ColumnSearch::FULL) ,bCurrency(false) ,bAutoIncrement(false) ,bNullable(true) diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 089a56427ba7..b6571e267c95 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -84,10 +84,10 @@ namespace dbaui */ ::dbtools::SQLExceptionInfo createConnection( const OUString& _rsDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); + const css::uno::Reference< css::container::XNameAccess >& _xDatabaseContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + css::uno::Reference< css::lang::XEventListener>& _rEvtLst, + css::uno::Reference< css::sdbc::XConnection>& _rOUTConnection ); /** creates a new connection and appends the eventlistener @param _xDataSource the datasource @param _rxContext the UNO component context @@ -96,10 +96,10 @@ namespace dbaui @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDataSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ); + const css::uno::Reference< css::beans::XPropertySet >& _xDataSource, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + css::uno::Reference< css::lang::XEventListener>& _rEvtLst, + css::uno::Reference< css::sdbc::XConnection>& _rOUTConnection ); /** creates a error dialog which displays the SQLExceptionInfo. Also it supports a "more" button where detailed information are available @param _rInfo the error which should be shown, if the info is not valid no error dialog will appear @@ -108,7 +108,7 @@ namespace dbaui */ void showError( const ::dbtools::SQLExceptionInfo& _rInfo, vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); /** fills a map and a vector with localized type names @param _rxConnection the connection to access the metadata @@ -116,7 +116,7 @@ namespace dbaui @param _rTypeInfoMap the filled map with the type names @param _rTypeInfoIters the vector filled with map iterators */ - void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, + void fillTypeInfo( const css::uno::Reference< css::sdbc::XConnection>& _rxConnection, const OUString& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters); @@ -126,30 +126,30 @@ namespace dbaui @param _pFieldDesc the source of the data */ class OFieldDescription; - void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, + void setColumnProperties( const css::uno::Reference< css::beans::XPropertySet>& _rxColumn, const OFieldDescription* _pFieldDesc); - OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTables, - const OUString& _sName); + OUString createDefaultName( const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, + const css::uno::Reference< css::container::XNameAccess>& _xTables, + const OUString& _sName); /** checks if the given name exists in the database context */ bool checkDataSourceAvailable( const OUString& _sDataSourceName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); - /** maps SvxCellHorJustify to com::sun::star::awt::TextAlign + /** maps SvxCellHorJustify to css::awt::TextAlign @param SvxCellHorJustify& _eAlignment - @return the corresponding com::sun::star::awt::TextAlign + @return the corresponding css::awt::TextAlign */ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment); /** retrieves a data source given by name or URL, and displays an error if this fails - Any <type scope="com::sun::star::sdbc">SQLException</type>s which occur will be displayed. + Any <type scope="css::sdbc">SQLException</type>s which occur will be displayed. Additionally, and Exceptions which indicate a data source name pointing to a non-existent database URL will also be denoted. Yet more additionally, and other exceptions will be forwarded to - a <type scope="com::sun::star::sdb">InteractionHandler</type>. + a <type scope="css::sdb">InteractionHandler</type>. @param _rDataSourceName the URL of the database document, or the name of a registered data source @@ -160,11 +160,11 @@ namespace dbaui @param _pErrorInfo takes the error info in case of failure. If <NULL/>, the error is displayed to the user. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > + css::uno::Reference< css::sdbc::XDataSource > getDataSourceByName( const OUString& _rDataSourceName, vcl::Window* _pErrorMessageParent, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, + css::uno::Reference< css::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -172,10 +172,10 @@ namespace dbaui or returns a data source when a model is given. @param _xObject Either a data source or a model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDataSourceOrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xObject); + css::uno::Reference< css::uno::XInterface > getDataSourceOrModel(const css::uno::Reference< css::uno::XInterface >& _xObject); - /** maps com::sun::star::awt::TextAlign to SvxCellHorJustify - @param com::sun::star::awt::TextAlign& _nAlignment + /** maps css::awt::TextAlign to SvxCellHorJustify + @param css::awt::TextAlign& _nAlignment @return the corresponding SvxCellHorJustify */ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment); @@ -184,8 +184,8 @@ namespace dbaui @param _xAffectedCol Font to be converted @param _xField Font to be converted */ - void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, + void callColumnFormatDialog(const css::uno::Reference< css::beans::XPropertySet>& _xAffectedCol, + const css::uno::Reference< css::beans::XPropertySet>& _xField, SvNumberFormatter* _pFormatter, vcl::Window* _pParent); @@ -204,9 +204,9 @@ namespace dbaui @param _pParent needed when an error must be shown @return false when datsource is not available otherwise true */ - bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + bool appendToFilter(const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _sName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, vcl::Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. @@ -238,7 +238,7 @@ namespace dbaui @return <TRUE/> if so otherwise <FALSE/> */ - bool isSQL92CheckEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + bool isSQL92CheckEnabled(const css::uno::Reference< css::sdbc::XConnection>& _xConnection); /** check if the alias name of the table should be added at select statements @param _xConnection @@ -246,11 +246,11 @@ namespace dbaui @return <TRUE/> if so otherwise <FALSE/> */ - bool isAppendTableAliasEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + bool isAppendTableAliasEnabled(const css::uno::Reference< css::sdbc::XConnection>& _xConnection); /** determines whether when generating SQL statements, AS should be placed before a table alias */ - bool generateAsBeforeTableAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection ); + bool generateAsBeforeTableAlias( const css::uno::Reference< css::sdbc::XConnection>& _rxConnection ); /** fills the bool and string value with information out of the datasource info property @param _xDatasource @@ -260,7 +260,7 @@ namespace dbaui @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ - void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDatasource + void fillAutoIncrementValue(const css::uno::Reference< css::beans::XPropertySet>& _xDatasource ,bool& _rAutoIncrementValueEnabled ,OUString& _rsAutoIncrementValue); @@ -272,7 +272,7 @@ namespace dbaui @param _rsAutoIncrementValue <OUT/> Set to the value when the property was set in the datasource. */ - void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection + void fillAutoIncrementValue(const css::uno::Reference< css::sdbc::XConnection>& _xConnection ,bool& _rAutoIncrementValueEnabled ,OUString& _rsAutoIncrementValue); @@ -282,12 +282,12 @@ namespace dbaui @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName,const OString& _rHelpId); + css::util::URL createHelpAgentURL(const OUString& _sModuleName,const OString& _rHelpId); /** set the evaluation flag at the number formatter @param _rxFormatter */ - void setEvalDateFormatForFormatter(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter); + void setEvalDateFormatForFormatter(css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter); /** query for a type info which can be used to create a primary key column @param _rTypeInfo @@ -339,15 +339,15 @@ namespace dbaui @return The created view. */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( const OUString& _sName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSourceObject); + css::uno::Reference< css::beans::XPropertySet> createView( const OUString& _sName + ,const css::uno::Reference< css::sdbc::XConnection >& _xConnection + ,const css::uno::Reference< css::beans::XPropertySet>& _xSourceObject); /** creates a view with the given command */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( + css::uno::Reference< css::beans::XPropertySet> createView( const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const OUString& _rCommand ); @@ -359,7 +359,7 @@ namespace dbaui @return The stripped database name either the registered name or if it is a file url the last segment. */ - OUString getStrippedDatabaseName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource + OUString getStrippedDatabaseName(const css::uno::Reference< css::beans::XPropertySet>& _xDataSource ,OUString& _rsDatabaseName); /** returns the standard database filter @@ -390,12 +390,12 @@ namespace dbaui */ bool insertHierachyElement( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameContainer>& _xNames, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::container::XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, bool _bForm, bool _bCollection = true, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = NULL, + const css::uno::Reference< css::ucb::XContent>& _xContent = NULL, bool _bMove = false ); @@ -405,7 +405,7 @@ namespace dbaui @param _rxContext The multi service factory */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + css::uno::Reference< css::util::XNumberFormatter > getNumberFormatter(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); // this completes a help url with the system parameters "Language" and "System" // detect installed locale diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 5d91bf15e756..1171efd114cd 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -47,17 +47,17 @@ namespace dbaui { OModuleClient m_aModuleClient; ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; - SfxItemSet* m_pItemSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - bool m_bOwnConnection; + SfxItemSet* m_pItemSet; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; + bool m_bOwnConnection; protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: OUserAdminDlg( vcl::Window* _pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB + ,const css::uno::Any& _aDataSourceName + ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection); virtual ~OUserAdminDlg(); virtual void dispose() SAL_OVERRIDE; @@ -68,9 +68,9 @@ namespace dbaui virtual short Execute() SAL_OVERRIDE; // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; virtual void clearPassword() SAL_OVERRIDE; virtual bool saveDatasource() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 6ce0038320e8..22a961341cef 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -113,30 +113,30 @@ namespace dbaui /** copies the UI settings of the object to the given target object. Might be ignored by implementations which do not have Ui settings. */ - virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const = 0; /// retrieves the column names of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > getColumnNames() const = 0; /// retrieves the names of the primary keys of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > getPrimaryKeyColumnNames() const = 0; /// creates a OFieldDescription for the given column of the to-be-copied object virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const = 0; /// returns the SELECT statement which can be used to retrieve the data of the to-be-copied object - virtual OUString getSelectStatement() const = 0; + virtual OUString getSelectStatement() const = 0; /** copies the filter and sorting * * \return */ - virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const = 0; /** returns the prepared statement which can be used to retrieve the data of the to-be-copied object The default implementation of this method will simply prepare a statement with the return value of ->getSelectStatement. */ - virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > + virtual ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > getPreparedSelectStatement() const = 0; virtual ~ICopyTableSourceObject(); @@ -146,30 +146,30 @@ namespace dbaui class ObjectCopySource : public ICopyTableSourceObject { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xObject; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xObjectPSI; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xObjectColumns; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::beans::XPropertySet > m_xObject; + css::uno::Reference< css::beans::XPropertySetInfo > m_xObjectPSI; + css::uno::Reference< css::container::XNameAccess > m_xObjectColumns; public: ObjectCopySource( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); // ICopyTableSourceObject overridables - virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; + virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > getColumnNames() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > getPrimaryKeyColumnNames() const SAL_OVERRIDE; virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; virtual OUString getSelectStatement() const SAL_OVERRIDE; - virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > + virtual ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > getPreparedSelectStatement() const SAL_OVERRIDE; }; @@ -177,38 +177,38 @@ namespace dbaui class NamedTableCopySource : public ICopyTableSourceObject { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OUString m_sTableName; - OUString m_sTableCatalog; - OUString m_sTableSchema; - OUString m_sTableBareName; - ::std::vector< OFieldDescription > m_aColumnInfo; - ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; + OUString m_sTableName; + OUString m_sTableCatalog; + OUString m_sTableSchema; + OUString m_sTableBareName; + ::std::vector< OFieldDescription > m_aColumnInfo; + ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > m_xStatement; public: NamedTableCopySource( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const OUString& _rTableName ); // ICopyTableSourceObject overridables virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > getColumnNames() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > getPrimaryKeyColumnNames() const SAL_OVERRIDE; virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; virtual OUString getSelectStatement() const SAL_OVERRIDE; - virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > + virtual ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > getPreparedSelectStatement() const SAL_OVERRIDE; private: void impl_ensureColumnInfo_throw(); - ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > + ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > impl_ensureStatement_throw(); }; @@ -254,20 +254,20 @@ namespace dbaui ODatabaseExport::TPositions m_vColumnPos; ::std::vector<sal_Int32> m_vColumnTypes; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xDestConnection; + css::uno::Reference< css::sdbc::XConnection > m_xDestConnection; - const ICopyTableSourceObject& m_rSourceObject; + const ICopyTableSourceObject& m_rSourceObject; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xInteractionHandler; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; + css::uno::Reference< css::uno::XComponentContext> m_xContext; + css::uno::Reference< css::task::XInteractionHandler> m_xInteractionHandler; OUString m_sTypeNames; // these type names are the ones out of the resource file sal_uInt32 m_nPageCount; bool m_bDeleteSourceColumns; bool m_bInterConnectionCopy; // are we copying between different connections? - ::com::sun::star::lang::Locale m_aLocale; + css::lang::Locale m_aLocale; OUString m_sName; // for a table the name is composed OUString m_sSourceName; OUString m_aKeyName; @@ -289,8 +289,8 @@ namespace dbaui ODatabaseExport::TColumnVector& _rColVector ); void construct(); // need for table creation - static void appendColumns( ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns = false ); - static void appendKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,const ODatabaseExport::TColumnVector* _pVec); + static void appendColumns( css::uno::Reference< css::sdbcx::XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns = false ); + static void appendKey(css::uno::Reference< css::sdbcx::XKeysSupplier>& _rxSup,const ODatabaseExport::TColumnVector* _pVec); // checks if the type is supported in the destination database bool supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType); @@ -303,10 +303,10 @@ namespace dbaui const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler>& _xInteractionHandler + const css::uno::Reference< css::sdbc::XConnection >& _xSourceConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::task::XInteractionHandler>& _xInteractionHandler ); // used for importing rtf/html sources @@ -316,11 +316,11 @@ namespace dbaui sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::util::XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~OCopyTableWizard(); @@ -358,10 +358,10 @@ namespace dbaui bool shouldCreatePrimaryKey() const { return m_bCreatePrimaryKeyColumn;} void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); - static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); + static bool supportsPrimaryKey( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); bool supportsPrimaryKey() const { return supportsPrimaryKey( m_xDestConnection ); } - static bool supportsViews( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); + static bool supportsViews( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); bool supportsViews() const { return supportsViews( m_xDestConnection ); } /** returns the name of the primary key @@ -376,9 +376,9 @@ namespace dbaui TOTypeInfoSP getDestTypeInfo(sal_Int32 _nPos) const { return m_aDestTypeInfoIndex[_nPos]->second; } const OTypeInfoMap& getDestTypeInfo() const { return m_aDestTypeInfo; } - ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const { return m_xFormatter; } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> GetComponentContext() const { return m_xContext; } + css::lang::Locale GetLocale() const { return m_aLocale; } + css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const { return m_xFormatter; } + css::uno::Reference< css::uno::XComponentContext> GetComponentContext() const { return m_xContext; } const ODatabaseExport::TColumns& getSourceColumns() const{ return m_vSourceColumns; } const ODatabaseExport::TColumnVector& getSrcVector() const { return m_vSourceVec; } @@ -390,8 +390,8 @@ namespace dbaui */ void clearDestColumns(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createTable(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createView() const; + css::uno::Reference< css::beans::XPropertySet > createTable(); + css::uno::Reference< css::beans::XPropertySet > createView() const; sal_Int32 getMaxColumnNameLength() const; void setOperation( const sal_Int16 _nOperation ); @@ -410,7 +410,7 @@ namespace dbaui void removeColumnNameFromNameMap(const OUString& _sName); void showError(const OUString& _sErrorMessage); - void showError(const ::com::sun::star::uno::Any& _aError); + void showError(const css::uno::Any& _aError); }; } diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index d86c70e5f07a..cc84c5bd3705 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -43,8 +43,8 @@ namespace dbaui virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale GetLocale() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; @@ -55,12 +55,12 @@ namespace dbaui virtual ~OWizTypeSelectControl(); virtual void dispose() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; }; // Wizard Page: OWizTypeSelectList - // just defines the ::com::sun::star::ucb::Command for the Contextmenu + // just defines the css::ucb::Command for the Contextmenu class OWizTypeSelectList : public MultiListBox { bool m_bPKey; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 815f8c4d566a..4de1c3398134 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -44,7 +44,7 @@ namespace dbaui class IAddTableDialogContext { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + virtual css::uno::Reference< css::sdbc::XConnection > getConnection() const = 0; virtual bool allowViews() const = 0; virtual bool allowQueries() const = 0; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 2ba76b55466c..628ed2e7b318 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -47,8 +47,8 @@ namespace dbaui public: AdvancedSettingsDialog( vcl::Window* _pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName); + ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB + ,const css::uno::Any& _aDataSourceName); virtual ~AdvancedSettingsDialog(); virtual void dispose() SAL_OVERRIDE; @@ -62,9 +62,9 @@ namespace dbaui virtual short Execute() SAL_OVERRIDE; // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; virtual void clearPassword() SAL_OVERRIDE; virtual bool saveDatasource() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 4311ad0161ce..edbea22f2fd9 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -39,7 +39,7 @@ namespace dbaui allow for a callback for the result */ static void executeModalDialogAsync( - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XExecutableDialog >& _rxDialog + const css::uno::Reference< css::ui::dialogs::XExecutableDialog >& _rxDialog ); }; diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 013c4e587abd..68cb712ce317 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -58,15 +58,15 @@ namespace dbaui { typedef ::cppu::ImplInheritanceHelper < OGenericUnoController - , ::com::sun::star::sdb::XSQLErrorListener - , ::com::sun::star::form::XDatabaseParameterListener - , ::com::sun::star::form::XConfirmDeleteListener - , ::com::sun::star::form::XLoadListener - , ::com::sun::star::form::XResetListener - , ::com::sun::star::awt::XFocusListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::frame::XModule + , css::sdb::XSQLErrorListener + , css::form::XDatabaseParameterListener + , css::form::XConfirmDeleteListener + , css::form::XLoadListener + , css::form::XResetListener + , css::awt::XFocusListener + , css::container::XContainerListener + , css::beans::XPropertyChangeListener + , css::frame::XModule > SbaXDataBrowserController_Base; class SbaXDataBrowserController :public SbaXDataBrowserController_Base @@ -77,16 +77,16 @@ namespace dbaui // for implementing the XFormController class FormControllerImpl; friend class FormControllerImpl; - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // our rowset - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadable; // queried from the rowset member as well - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xGridModel; // the model of our grid - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xFormControllerImpl; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > - m_xParser; // for sorting 'n filtering + css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // our rowset + css::uno::Reference< css::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member + css::uno::Reference< css::form::XLoadable > m_xLoadable; // queried from the rowset member as well + css::uno::Reference< css::form::XFormComponent > m_xGridModel; // the model of our grid + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + css::uno::Reference< css::uno::XAggregation > m_xFormControllerImpl; + mutable css::uno::Reference< css::sdb::XSingleSelectQueryComposer > + m_xParser; // for sorting 'n filtering sal_Int32 m_nRowSetPrivileges; // cached Privileges property of m_xRowSet @@ -96,20 +96,20 @@ namespace dbaui TransferableClipboardListener* m_pClipbordNotifier; // notifier for changes in the clipboard - OAsynchronousLink m_aAsyncGetCellFocus; - OAsynchronousLink m_aAsyncDisplayError; + OAsynchronousLink m_aAsyncGetCellFocus; + OAsynchronousLink m_aAsyncDisplayError; ::dbtools::SQLExceptionInfo m_aCurrentError; - OUString m_sStateSaveRecord; - OUString m_sStateUndoRecord; - OUString m_sModuleIdentifier; + OUString m_sStateSaveRecord; + OUString m_sStateUndoRecord; + OUString m_sModuleIdentifier; // members for asynchronous load operations FormControllerImpl* m_pFormControllerImpl; // implementing the XFormController sal_uInt16 m_nFormActionNestingLevel; // see enter-/leaveFormAction - bool m_bLoadCanceled : 1; // the load was canceled somehow + bool m_bLoadCanceled : 1; // the load was canceled somehow bool m_bCannotSelectUnfiltered : 1; // received an DATA_CANNOT_SELECT_UNFILTERED error protected: @@ -124,88 +124,88 @@ namespace dbaui // attribute access protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > getLoadable() const { return m_xLoadable; } + css::uno::Reference< css::sdbc::XRowSet > getRowSet() const { return m_xRowSet; } + css::uno::Reference< css::sdbcx::XColumnsSupplier > getColumnsSupplier()const { return m_xColumnsSupplier; } + css::uno::Reference< css::form::XLoadable > getLoadable() const { return m_xLoadable; } - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > getFormComponent() const { return m_xGridModel; } - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > getControlModel() const { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > (m_xGridModel, ::com::sun::star::uno::UNO_QUERY); } - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } + css::uno::Reference< css::form::XFormComponent > getFormComponent() const { return m_xGridModel; } + css::uno::Reference< css::awt::XControlModel > getControlModel() const { return css::uno::Reference< css::awt::XControlModel > (m_xGridModel, css::uno::UNO_QUERY); } + css::uno::Reference< css::util::XNumberFormatter > getNumberFormatter()const { return m_xFormatter; } bool isValid() const { return m_xRowSet.is() && m_xGridModel.is(); } - bool isValidCursor() const; // checks the ::com::sun::star::data::XDatabaseCursor-interface of m_xRowSet + bool isValidCursor() const; // checks the css::data::XDatabaseCursor-interface of m_xRowSet bool isLoaded() const; bool loadingCancelled() const { return m_bLoadCanceled; } - void onStartLoading( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable ); - void setLoadingCancelled() { m_bLoadCanceled = true; } + void onStartLoading( const css::uno::Reference< css::form::XLoadable >& _rxLoadable ); + void setLoadingCancelled() { m_bLoadCanceled = true; } const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; } public: - SbaXDataBrowserController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + SbaXDataBrowserController(const css::uno::Reference< css::uno::XComponentContext >& _rM); UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); } // late construction virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // UNO - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::util::XModifyListener + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModule - virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getIdentifier( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::awt::XFocusListener + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XController + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XFrameActionListener + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::sdb::XSQLErrorListener - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::sdb::XSQLErrorListener + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::form::XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::form::XDatabaseParameterListener + virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::form::XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::form::XConfirmDeleteListener + virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::form::XLoadListener + virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::form::XResetListener - virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::form::XResetListener + virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // SbaGridListener virtual void RowChanged() SAL_OVERRIDE; @@ -223,48 +223,48 @@ namespace dbaui // all the features which should be handled by this class virtual void describeSupportedFeatures() SAL_OVERRIDE; - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void startFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; - virtual void stopFrameListening( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; + virtual void startFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; + virtual void stopFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > CreateForm(); + virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm(); // our default implementation simply instantiates a stardiv.one.form.component.Form service // (probably this needs not to be overridden, but you may return anything you want as long as it - // supports the ::com::sun::star::form::DatabaseForm service. For instance you may want to create an adapter here which - // is synchronized with a foreign ::com::sun::star::form::DatabaseForm you got elsewhere) + // supports the css::form::DatabaseForm service. For instance you may want to create an adapter here which + // is synchronized with a foreign css::form::DatabaseForm you got elsewhere) virtual bool InitializeForm( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_formProperties ) = 0; + const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) = 0; // called immediately after a successful CreateForm // do any initialization (data source etc.) here. the form should be fully functional after that. // return sal_False if you didn't succeed (don't throw exceptions, they won't be caught) - virtual bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); + virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid); - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > CreateGridModel(); + css::uno::Reference< css::form::XFormComponent > CreateGridModel(); // our default implementation simply instantiates a stardiv.one.form.component.Grid service // you most probably don't want to override this behavior // the default implementation of disposing distributes the events to the following disposingXXX functions - void disposingGridControl(const ::com::sun::star::lang::EventObject& Source); // calls removeControlListeners - void disposingGridModel(const ::com::sun::star::lang::EventObject& Source); // calls removeModelListeners - void disposingFormModel(const ::com::sun::star::lang::EventObject& Source); - void disposingColumnModel(const ::com::sun::star::lang::EventObject& Source); + void disposingGridControl(const css::lang::EventObject& Source); // calls removeControlListeners + void disposingGridModel(const css::lang::EventObject& Source); // calls removeModelListeners + void disposingFormModel(const css::lang::EventObject& Source); + void disposingColumnModel(const css::lang::EventObject& Source); // want to be a listener to the grid control ? use this ! - void addControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); - void removeControlListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & _xGridControl); + void addControlListeners(const css::uno::Reference< css::awt::XControl > & _xGridControl); + void removeControlListeners(const css::uno::Reference< css::awt::XControl > & _xGridControl); // want to be a listener to the grid model ? use this ! - virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); - virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); + virtual void addModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel); + virtual void removeModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel); // want to be a listener grid columns ? use this ! - virtual void AddColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol); - virtual void RemoveColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol); + virtual void AddColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol); + virtual void RemoveColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol); // call after "major changes" (e.g. the completion of the async load). // invalidates all toolbox slots and all supported features. @@ -291,7 +291,7 @@ namespace dbaui bool SaveModified(bool bAskFor = true); // save the modified record - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; + css::uno::Reference< css::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; // a PropertySet corresponding to the cursor field a column is bound to // if nViewPos is (sal_uInt16)-1 (the default) then the field for the current column will be retrieved @@ -302,12 +302,12 @@ namespace dbaui void initFormatter(); /// loads or reloads the form - bool reloadForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable); + bool reloadForm(const css::uno::Reference< css::form::XLoadable >& _rxLoadable); virtual bool preReloadForm(){ return false; } virtual void postReloadForm(){} - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > createParser_nothrow(); private: @@ -320,12 +320,12 @@ namespace dbaui void ExecuteSearch(); void initializeParser() const; // changes the mutable member m_xParser - void applyParserFilter(const OUString& _rOldFilter, bool _bOldFilterApplied,const ::OUString& _sOldHaving,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); - void applyParserOrder(const OUString& _rOldOrder,const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserFilter(const OUString& _rOldFilter, bool _bOldFilterApplied,const ::OUString& _sOldHaving,const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& _xParser); + void applyParserOrder(const OUString& _rOldOrder,const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& _xParser); sal_Int16 getCurrentColumnPosition(); void setCurrentColumnPosition( sal_Int16 _nPos ); - void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel); + void addColumnListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel); void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index e68ff09847c4..4b350c89b125 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -44,28 +44,28 @@ namespace dbaui class UnoDataBrowserView : public ODataView, public ::utl::OEventListenerAdapter { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xGrid; // our grid's UNO representation - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xMe; // our own UNO representation - VclPtr<DBTreeView> m_pTreeView; - VclPtr<Splitter> m_pSplitter; + css::uno::Reference< css::awt::XControl > m_xGrid; // our grid's UNO representation + css::uno::Reference< css::awt::XControlContainer > m_xMe; // our own UNO representation + VclPtr<DBTreeView> m_pTreeView; + VclPtr<Splitter> m_pSplitter; mutable VclPtr<SbaGridControl> m_pVclControl; // our grid's VCL representation - VclPtr<vcl::Window> m_pStatus; + VclPtr<vcl::Window> m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access public: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getGridControl() const { return m_xGrid; } + css::uno::Reference< css::awt::XControl > getGridControl() const { return m_xGrid; } SbaGridControl* getVclControl() const; public: UnoDataBrowserView( vcl::Window* pParent, IController& _rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); virtual void dispose() SAL_OVERRIDE; /// late construction - void Construct(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel); + void Construct(const css::uno::Reference< css::awt::XControlModel >& xModel); /** as columns may be hidden there is a difference between a columns model pos and its view pos so we you may use these translation function @@ -79,13 +79,13 @@ namespace dbaui void showStatus( const OUString& _rStatus ); void hideStatus(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } + css::uno::Reference< css::awt::XControlContainer > getContainer() { return m_xMe; } protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; private: using ODataView::Construct; diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 90d14a7ce78b..a87ccf374dd9 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -92,8 +92,7 @@ namespace dbaui This selection is used for filling a ContextMenuExecuteEvent event for the given control. */ - virtual ::com::sun::star::uno::Any - getCurrentSelection( Control& _rControl ) const = 0; + virtual css::uno::Any getCurrentSelection( Control& _rControl ) const = 0; protected: ~IContextMenuProvider() {} diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index c63dbe6a27c4..5779a7aa702a 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -40,7 +40,7 @@ namespace dbaui typedef std::vector<sal_Int8> ByteVector; typedef std::vector<OUString> StringArray; - typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; + typedef ::utl::SharedUNOComponent< css::sdbc::XConnection > SharedConnection; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index ed7ec6e4e85e..c22062ad7670 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -47,18 +47,18 @@ namespace dbaui class DatabaseObjectView { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > + css::uno::Reference< css::frame::XFrame > m_xParentFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XComponentLoader > + css::uno::Reference< css::frame::XComponentLoader > m_xFrameLoader; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > + css::uno::Reference< css::sdb::application::XDatabaseDocumentUI > m_xApplication; - OUString m_sComponentURL; + OUString m_sComponentURL; private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > doDispatch( const ::comphelper::NamedValueCollection& i_rDispatchArgs ); @@ -77,28 +77,28 @@ namespace dbaui @param _rCreationArgs the arguments for the view's creation */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( - const ::com::sun::star::uno::Any& _rDataSource, + virtual css::uno::Reference< css::lang::XComponent > doCreateView( + const css::uno::Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ); virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, - const ::com::sun::star::uno::Any& _rDataSource, + const css::uno::Any& _rDataSource, const OUString& _rObjectName ); - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& getApplicationUI() const { return m_xApplication; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > getConnection() const; public: DatabaseObjectView( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& _rxApplication, + const css::uno::Reference< css::frame::XFrame >& _rxParentFrame, const OUString& _rComponentURL ); virtual ~DatabaseObjectView(){} @@ -108,9 +108,9 @@ namespace dbaui By default, the view is loaded into a top-level frame not being part of the Desktop. */ - void setTargetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) + void setTargetFrame( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) { - m_xFrameLoader.set( _rxFrame, ::com::sun::star::uno::UNO_QUERY ); + m_xFrameLoader.set( _rxFrame, css::uno::UNO_QUERY ); } /** opens a view for a to-be-created object @@ -120,9 +120,9 @@ namespace dbaui @return the controller of the newly created document */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > createNew( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _xDataSource, + const css::uno::Reference< css::sdbc::XDataSource >& _xDataSource, const ::comphelper::NamedValueCollection& i_rDispatchArgs = ::comphelper::NamedValueCollection() ); @@ -137,9 +137,9 @@ namespace dbaui @return the frame into which the view has been loaded */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > openExisting( - const ::com::sun::star::uno::Any& _aDataSource, + const css::uno::Any& _aDataSource, const OUString& _rName, const ::comphelper::NamedValueCollection& i_rDispatchArgs ); @@ -154,15 +154,15 @@ namespace dbaui protected: virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, - const ::com::sun::star::uno::Any& _aDataSource, + const css::uno::Any& _aDataSource, const OUString& _rObjectName ) SAL_OVERRIDE; public: QueryDesigner( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& _rxApplication, + const css::uno::Reference< css::frame::XFrame >& _rxParentFrame, bool _bCreateView ); }; @@ -173,21 +173,21 @@ namespace dbaui protected: virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, - const ::com::sun::star::uno::Any& _aDataSource, + const css::uno::Any& _aDataSource, const OUString& _rObjectName ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( - const ::com::sun::star::uno::Any& _rDataSource, + virtual css::uno::Reference< css::lang::XComponent > doCreateView( + const css::uno::Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ) SAL_OVERRIDE; public: TableDesigner( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& _rxApplication, + const css::uno::Reference< css::frame::XFrame >& _rxParentFrame ); private: @@ -197,9 +197,9 @@ namespace dbaui @return the designer component, as provided by the connection, or <NULL/>, if the connection does not provide a specialized designer. - @see com::sun::star::sdb::application::XTableUIProvider + @see css::sdb::application::XTableUIProvider */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ); }; @@ -212,15 +212,15 @@ namespace dbaui protected: virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, - const ::com::sun::star::uno::Any& _aDataSource, + const css::uno::Any& _aDataSource, const OUString& _rQualifiedName ) SAL_OVERRIDE; public: ResultSetBrowser( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& _rxApplication, + const css::uno::Reference< css::frame::XFrame >& _rxParentFrame, bool _bTable ); @@ -230,9 +230,9 @@ namespace dbaui { public: RelationDesigner( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& _rxApplication, + const css::uno::Reference< css::frame::XFrame >& _rxParentFrame ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index c5459ecbe15b..e05da1b5a14f 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -40,17 +40,17 @@ namespace dbaui { protected: VclPtr<vcl::Window> m_pErrorMessageParent; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; OUString m_sContextInformation; public: ODatasourceConnector( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, vcl::Window* _pMessageParent ); ODatasourceConnector( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, vcl::Window* _pMessageParent, const OUString& _rContextInformation ); @@ -60,7 +60,7 @@ namespace dbaui /** creates a connection to the data source, displays the possible error to the user, or returns it */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > connect( const OUString& _rDataSourceName, ::dbtools::SQLExceptionInfo* _pErrorInfo @@ -68,9 +68,9 @@ namespace dbaui /** creates a connection to the data source, displays the possible error to the user, or returns it */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > connect( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& _xDataSource, + const css::uno::Reference< css::sdbc::XDataSource>& _xDataSource, ::dbtools::SQLExceptionInfo* _pErrorInfo ) const; }; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 0510cd6fa10d..70ea77286d32 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -55,7 +55,7 @@ private: bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> - sal_uInt16 m_nMainPageID; + sal_uInt16 m_nMainPageID; public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed @@ -63,7 +63,7 @@ public: */ ODbAdminDialog(vcl::Window* pParent, SfxItemSet* _pItems, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); virtual ~ODbAdminDialog(); virtual void dispose() SAL_OVERRIDE; @@ -81,15 +81,15 @@ public: @param _rName The name of the data source */ - void selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName); + void selectDataSource(const css::uno::Any& _aDataSourceName); virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; virtual void clearPassword() SAL_OVERRIDE; virtual bool saveDatasource() SAL_OVERRIDE; @@ -109,9 +109,9 @@ protected: private: /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void impl_selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName); + void impl_selectDataSource(const css::uno::Any& _aDataSourceName); /// reset the tag pages according to m_sCurrentDatasource and <arg>_rxDatasource</arg> - void impl_resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); + void impl_resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); enum ApplyResult { diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 71eb2a2882e2..e6fdac6a4ea3 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -52,34 +52,34 @@ namespace dbaui const OUString& _rDatasource, const sal_Int32 _nCommandType, const OUString& _rCommand, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); ODataClipboard( const OUString& _rDatasource, const sal_Int32 _nCommandType, const OUString& _rCommand, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); ODataClipboard( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_rAliveForm, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelectedRows, + const css::uno::Reference< css::beans::XPropertySet >& i_rAliveForm, + const css::uno::Sequence< css::uno::Any >& i_rSelectedRows, const bool i_bBookmarkSelection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rORB + const css::uno::Reference< css::uno::XComponentContext >& i_rORB ); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void AddSupportedFormats() SAL_OVERRIDE; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; virtual void ObjectReleased() SAL_OVERRIDE; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index ce534eba107d..2bee52ce678f 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -72,8 +72,8 @@ public: */ ODbTypeWizDialog(vcl::Window* pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB + ,const css::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialog(); virtual void dispose() SAL_OVERRIDE; @@ -82,9 +82,9 @@ public: virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; virtual void clearPassword() SAL_OVERRIDE; virtual bool saveDatasource() SAL_OVERRIDE; @@ -106,7 +106,7 @@ protected: /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const OUString& _rRegisteredName); - void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); + void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); enum ApplyResult { diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 74db493b37c5..73b36605013a 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -98,8 +98,8 @@ public: */ ODbTypeWizDialogSetup(vcl::Window* pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB - ,const ::com::sun::star::uno::Any& _aDataSourceName + ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB + ,const css::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialogSetup(); virtual void dispose() SAL_OVERRIDE; @@ -108,9 +108,9 @@ public: virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; virtual void clearPassword() SAL_OVERRIDE; virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; @@ -140,7 +140,7 @@ protected: /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. void implSelectDatasource(const OUString& _rRegisteredName); - void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); + void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); enum ApplyResult { diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 89c4a82fde6d..18af1cb5098c 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -50,11 +50,11 @@ namespace dbaui checked @param _rRelativeRoot the root in the hierarchy against which given names should be checked - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if the given container is <NULL/> */ HierarchicalNameCheck( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& _rxNames, + const css::uno::Reference< css::container::XHierarchicalNameAccess >& _rxNames, const OUString& _rRelativeRoot ); @@ -83,7 +83,7 @@ namespace dbaui or vice versa. @seealso dbtools::DatabaseMetaData::supportsSubqueriesInFrom - @seealso com::sun::star::sdb::tools::XObjectNames::checkNameForCreate + @seealso css::sdb::tools::XObjectNames::checkNameForCreate */ class DynamicTableOrQueryNameCheck :public ::boost::noncopyable ,public IObjectNameCheck @@ -99,12 +99,12 @@ namespace dbaui @param _nCommandType specifies whether table names or query names should be checked. Only valid values are CommandType::TABLE and CommandType::QUERY. - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if the given connection is <NULL/>, or the given command type is neither CommandType::TABLE nor CommandType::QUERY. */ DynamicTableOrQueryNameCheck( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxSdbLevelConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxSdbLevelConnection, sal_Int32 _nCommandType ); diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 60a5d05f6b84..0d46a61465e5 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -64,13 +64,13 @@ namespace dbaui sal_Int32 m_nHistoryLimit; sal_Int32 m_nStatusCount; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > m_xConnection; public: DirectSQLDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); + const css::uno::Reference< css::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); virtual void dispose() SAL_OVERRIDE; @@ -82,7 +82,7 @@ namespace dbaui void switchToHistory(sal_Int32 _nHistoryPos, bool _bUpdateListBox = true); // OEventListenerAdapter - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; protected: DECL_LINK( OnExecute, void* ); diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 38c0f5b7c2d8..c53341dce924 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -50,17 +50,17 @@ namespace dbaui { private: OSaveAsDlgImpl* m_pImpl; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); OSaveAsDlg( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rDefault, const OUString& _sLabel, const IObjectNameCheck& _rObjectNameCheck, diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index a3d71cb63286..4a72a136327f 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -32,7 +32,7 @@ namespace dbaui class SbaXFormAdapter; class SbaExternalSourceBrowser :public SbaXDataBrowserController - ,public ::com::sun::star::util::XModifyBroadcaster + ,public css::util::XModifyBroadcaster { ::cppu::OInterfaceContainerHelper m_aModifyListeners; // for multiplexing the modify events @@ -42,55 +42,55 @@ namespace dbaui // recursion public: - SbaExternalSourceBrowser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + SbaExternalSourceBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > getIdlClasses(); - // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); + // static css::uno::Reference< css::reflection::XIdlClass > getStaticIdlClass(); - // ::com::sun::star::frame::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) SAL_OVERRIDE; + // css::frame::XDispatch + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::util::XModifyListener + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::util::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 ) SAL_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 ) SAL_OVERRIDE; + // css::util::XModifyBroadcaster + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::form::XLoadListener - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::form::XLoadListener + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~SbaExternalSourceBrowser(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > CreateForm() SAL_OVERRIDE; - virtual bool InitializeForm( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm() SAL_OVERRIDE; + virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; virtual bool LoadForm() SAL_OVERRIDE; - void Attach(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > & xMaster); + void Attach(const css::uno::Reference< css::sdbc::XRowSet > & xMaster); void ClearView(); diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index f35bef0df3ce..db2dbd860b5f 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -64,54 +64,54 @@ namespace dbaui { // SbaXFormAdapter - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaDataSupplier - , ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowSet - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdbcx::XRowLocate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::sdbc::XRow - , ::com::sun::star::sdbcx::XColumnsSupplier - , ::com::sun::star::sdbc::XColumnLocate + typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaDataSupplier + , css::sdb::XResultSetAccess + , css::sdbc::XResultSetUpdate + , css::sdbc::XRowSet + , css::sdb::XRowSetApproveBroadcaster + , css::sdbcx::XRowLocate + , css::sdbc::XRowUpdate + , css::sdbc::XRow + , css::sdbcx::XColumnsSupplier + , css::sdbc::XColumnLocate // --- stardiv::one::form::component::DatabaseForm --- - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::sdbcx::XDeleteRows + , css::sdbc::XParameters + , css::sdbcx::XDeleteRows > SbaXFormAdapter_BASE1; - typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier - , ::com::sun::star::sdbc::XCloseable - , ::com::sun::star::form::XLoadable - , ::com::sun::star::sdb::XSQLErrorBroadcaster - , ::com::sun::star::form::XDatabaseParameterBroadcaster + typedef ::cppu::ImplHelper12 < css::sdbc::XWarningsSupplier + , css::sdbc::XCloseable + , css::form::XLoadable + , css::sdb::XSQLErrorBroadcaster + , css::form::XDatabaseParameterBroadcaster // --- stardiv::one::form::component::Form --- - , ::com::sun::star::form::XForm - , ::com::sun::star::form::XSubmit - , ::com::sun::star::awt::XTabControllerModel + , css::form::XForm + , css::form::XSubmit + , css::awt::XTabControllerModel // --- stardiv::one::form::FormComponent --- - , ::com::sun::star::lang::XComponent - , ::com::sun::star::beans::XFastPropertySet - // already present : ::com::sun::star::form::XFormComponent (base of ::com::sun::star::form::XForm) - , ::com::sun::star::beans::XMultiPropertySet - , ::com::sun::star::container::XNamed + , css::lang::XComponent + , css::beans::XFastPropertySet + // already present : css::form::XFormComponent (base of css::form::XForm) + , css::beans::XMultiPropertySet + , css::container::XNamed > SbaXFormAdapter_BASE2; - typedef ::cppu::ImplHelper10 < ::com::sun::star::io::XPersistObject - , ::com::sun::star::beans::XPropertySet + typedef ::cppu::ImplHelper10 < css::io::XPersistObject + , css::beans::XPropertySet // --- stardiv::one::data::DatabaseCursor --- - , ::com::sun::star::util::XCancellable - // already present : ::com::sun::star::beans::XPropertySet + , css::util::XCancellable + // already present : css::beans::XPropertySet // --- stardiv::one::data::DatabaseComponent --- - // already present : ::com::sun::star::lang::XComponent - // already present : ::com::sun::star::container::XChild (base of ::com::sun::star::form::XForm) + // already present : css::lang::XComponent + // already present : css::container::XChild (base of css::form::XForm) // interfaces I don't know the service which they belong to ;) // (they are supported by FmXDatabaseForm, se we support it, too) - , ::com::sun::star::beans::XPropertyState - , ::com::sun::star::form::XReset - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XIndexContainer - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XEnumerationAccess + , css::beans::XPropertyState + , css::form::XReset + , css::container::XNameContainer + , css::container::XIndexContainer + , css::container::XContainer + , css::container::XEnumerationAccess // interfaces we need because of other reasons - , ::com::sun::star::beans::XPropertyChangeListener + , css::beans::XPropertyChangeListener > SbaXFormAdapter_BASE3; class SbaXFormAdapter @@ -121,7 +121,7 @@ namespace dbaui { private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xMainForm; + css::uno::Reference< css::sdbc::XRowSet > m_xMainForm; ::osl::Mutex m_aMutex; SbaXLoadMultiplexer m_aLoadListeners; @@ -140,293 +140,293 @@ namespace dbaui ::cppu::OInterfaceContainerHelper m_aContainerListeners; // hierarchy administration - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; - ::std::vector< OUString > m_aChildNames; + css::uno::Reference< css::uno::XInterface > m_xParent; + ::std::vector< css::uno::Reference< css::form::XFormComponent > > m_aChildren; + ::std::vector< OUString > m_aChildNames; // properties - OUString m_sName; - sal_Int32 m_nNamePropHandle; + OUString m_sName; + sal_Int32 m_nNamePropHandle; public: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getAttachedForm() const { return m_xMainForm; } + css::uno::Reference< css::sdbc::XRowSet > getAttachedForm() const { return m_xMainForm; } public: SbaXFormAdapter(); virtual ~SbaXFormAdapter(); - // ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getIdlClass(); - // ::com::sun::star::uno::Sequence<::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); + // css::uno::Reference< css::reflection::XIdlClass > getIdlClass(); + // css::uno::Sequence<css::uno::Reference< css::reflection::XIdlClass > > getIdlClasses(); - void AttachForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xNewMaster); + void AttachForm(const css::uno::Reference< css::sdbc::XRowSet >& xNewMaster); // UNO DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XCloseable - virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbcx::XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getFloat(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getDouble(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::Date SAL_CALL getDate(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::Time SAL_CALL getTime(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbcx::XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveToBookmark(const ::com::sun::star::uno::Any& bookmark) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveRelativeToBookmark(const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL compareBookmarks(const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasOrderedBookmarks() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL hashBookmark(const ::com::sun::star::uno::Any& bookmark) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XRowUpdate - virtual void SAL_CALL updateNull(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isBeforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAfterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL beforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL afterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL first() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL last() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL previous() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL refreshRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowUpdated() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowInserted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancelRowUpdates() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToInsertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToCurrentRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XRowSet - virtual void SAL_CALL execute() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >& listener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >& listener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbcx::XDeleteRows - virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener >& listener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener >& listener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdb::XResultSetAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL createResultSet() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::form::XLoadable - virtual void SAL_CALL load() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unload() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reload() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLoaded() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearParameters() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::form::XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::form::XSubmit - virtual void SAL_CALL submit(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::awt::XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, OUString& Name) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::beans::XFastPropertySet - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, 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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::beans::XMultiPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL removePropertiesChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::beans::XPropertySet - 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) SAL_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) SAL_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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::util::XCancellable - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::beans::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) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::form::XReset - virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::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) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::container::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) SAL_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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const ::com::sun::star::uno::Any& Element) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const ::com::sun::star::uno::Any& Element) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::container::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) SAL_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) SAL_OVERRIDE; - - // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XCloseable + virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSetMetaDataSupplier + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XColumnLocate + virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XColumnsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRow + virtual sal_Bool SAL_CALL wasNull() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getFloat(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getDouble(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::Date SAL_CALL getDate(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::Time SAL_CALL getTime(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XRowLocate + virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL moveToBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL compareBookmarks(const css::uno::Any& first, const css::uno::Any& second) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasOrderedBookmarks() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL hashBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRowUpdate + virtual void SAL_CALL updateNull(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSet + virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSetUpdate + virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRowSet + virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XDeleteRows + virtual css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any >& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XWarningsSupplier + virtual css::uno::Any SAL_CALL getWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdb::XRowSetApproveBroadcaster + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XSQLErrorBroadcaster + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdb::XResultSetAccess + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XLoadable + virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XParameters + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XDatabaseParameterBroadcaster + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XChild + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface >& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XSubmit + virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::awt::XTabControllerModel + virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XComponent + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::beans::XFastPropertySet + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XNamed + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::beans::XMultiPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(const css::uno::Sequence< OUString >& aPropertyNames) throw(css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener(const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener) throw(css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + + // css::beans::XPropertySet + 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) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; + + // css::util::XCancellable + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::beans::XPropertyState + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XReset + virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XNameContainer + virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XNameReplace + virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XIndexContainer + virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XIndexReplace + virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XContainer + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // container handling - void implInsert(const ::com::sun::star::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = NULL) throw(::com::sun::star::lang::IllegalArgumentException); + void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = NULL) throw(css::lang::IllegalArgumentException); sal_Int32 implGetPos(const OUString& rName); void StopListening(); diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index 2c9575a744bf..4a74946bfba2 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -56,7 +56,7 @@ namespace dbaui denotes the connection to work for. Must not be <NULL/>. */ ImageProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); /** returns the image to be used for a database object with the given name diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index 6dfe871ac8ab..5d43d8fb6451 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -32,7 +32,7 @@ namespace dbaui class OIndexCollection { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xIndexes; // cached information @@ -42,7 +42,7 @@ namespace dbaui // construction OIndexCollection(); OIndexCollection(const OIndexCollection& _rSource); - // OIndexCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); + // OIndexCollection(const css::uno::Reference< css::container::XNameAccess >& _rxIndexes); const OIndexCollection& operator=(const OIndexCollection& _rSource); @@ -76,7 +76,7 @@ namespace dbaui void resetIndex(const Indexes::iterator& _rPos); // attach to a new key container - void attach(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); + void attach(const css::uno::Reference< css::container::XNameAccess >& _rxIndexes); // detach from the container void detach(); @@ -91,8 +91,8 @@ namespace dbaui bool dropNoRemove(const Indexes::iterator& _rPos); protected: - void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); - static void implFillIndexInfo(OIndex& _rIndex, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxDescriptor); + void implConstructFrom(const css::uno::Reference< css::container::XNameAccess >& _rxIndexes); + static void implFillIndexInfo(OIndex& _rIndex, css::uno::Reference< css::beans::XPropertySet > _rxDescriptor); void implFillIndexInfo(OIndex& _rIndex); }; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index c4cc5c620a90..7e9733353644 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -42,7 +42,7 @@ namespace dbaui class DbaIndexList : public SvTreeListBox { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; Link<> m_aSelectHdl; Link<> m_aEndEditHdl; bool m_bSuspendSelectHdl; @@ -63,7 +63,7 @@ namespace dbaui void SelectNoHandlerCall( SvTreeListEntry* pEntry ); - inline void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection) + inline void setConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection) { m_xConnection = _rxConnection; } @@ -82,8 +82,8 @@ namespace dbaui public OToolBoxHelper { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - SvtViewOptions m_aGeometrySettings; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; + SvtViewOptions m_aGeometrySettings; VclPtr<ToolBox> m_pActions; VclPtr<DbaIndexList> m_pIndexList; @@ -95,19 +95,19 @@ namespace dbaui VclPtr<IndexFieldsControl> m_pFields; VclPtr<PushButton> m_pClose; - OIndexCollection* m_pIndexes; - SvTreeListEntry* m_pPreviousSelection; - bool m_bEditAgain; + OIndexCollection* m_pIndexes; + SvTreeListEntry* m_pPreviousSelection; + bool m_bEditAgain; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; + css::uno::Reference< css::uno::XComponentContext > + m_xContext; public: DbaIndexDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Sequence< OUString >& _rFieldNames, + const css::uno::Reference< css::container::XNameAccess >& _rxIndexes, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, sal_Int32 _nMaxColumnsInIndex ); virtual ~DbaIndexDialog(); diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 2a0519872e60..bb4d2421f987 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -54,7 +54,7 @@ namespace dbaui virtual ~IndexFieldsControl(); virtual void dispose() SAL_OVERRIDE; - void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); + void Init(const css::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index a13383b71955..d530ad8a8dbd 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -42,13 +42,13 @@ namespace dbaui class OLinkedDocumentsAccess { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xDocumentContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> + css::uno::Reference< css::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > + css::uno::Reference< css::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; VclPtr<vcl::Window> m_pDialogParent; OUString m_sCurrentlyEditing; @@ -57,29 +57,29 @@ namespace dbaui public: OLinkedDocumentsAccess( vcl::Window* _pDialogParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::container::XNameAccess >& _rxContainer, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _sDataSourceName ); ~OLinkedDocumentsAccess(); inline bool isConnected() const { return m_xConnection.is(); } - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> + css::uno::Reference< css::lang::XComponent> open( const OUString& _rLinkName, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, + css::uno::Reference< css::lang::XComponent>& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > newDocument( sal_Int32 i_nActionID, const ::comphelper::NamedValueCollection& i_rCreationArgs, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_rDefinition + css::uno::Reference< css::lang::XComponent >& o_rDefinition ); void newFormWithPilot( @@ -100,10 +100,10 @@ namespace dbaui CANCEL }; private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > impl_open( const OUString& _rLinkName, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition, + css::uno::Reference< css::lang::XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ); diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 7a52aa15d9a7..6c52896a149e 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -58,41 +58,41 @@ namespace dbaui VclPtr<OKButton> m_pOKBtn; VclPtr<CancelButton> m_pCancelBtn; - sal_Int32 m_nCurrentlySelected; - - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > - m_xParams; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > - m_xFormatter; + sal_Int32 m_nCurrentlySelected; + + css::uno::Reference< css::container::XIndexAccess > + m_xParams; + css::uno::Reference< css::sdbc::XConnection > + m_xConnection; + css::uno::Reference< css::util::XNumberFormatter > + m_xFormatter; ::dbtools::OPredicateInputController - m_aPredicateInput; + m_aPredicateInput; - ByteVector m_aVisitedParams; - Timer m_aResetVisitFlag; + ByteVector m_aVisitedParams; + Timer m_aResetVisitFlag; // we reset the "visited flag" 1 second after and entry has been selected - bool m_bNeedErrorOnCurrent; + bool m_bNeedErrorOnCurrent; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - m_aFinalValues; /// the final values as entered by the user + css::uno::Sequence< css::beans::PropertyValue > + m_aFinalValues; /// the final values as entered by the user public: OParameterDialog(vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & _rParamContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); + const css::uno::Reference< css::container::XIndexAccess > & _rParamContainer, + const css::uno::Reference< css::sdbc::XConnection > & _rxConnection, + const css::uno::Reference< css::uno::XComponentContext >& rxContext); virtual ~OParameterDialog(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > getValues() const { return m_aFinalValues; } protected: void Construct(); - ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField); + ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const css::uno::Reference< css::beans::XPropertySet > & _rxField); private: DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index ae34e761c121..fc310a3b682d 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -31,19 +31,19 @@ namespace dbaui */ class OPropertySetItem : public SfxPoolItem { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; + css::uno::Reference< css::beans::XPropertySet > m_xSet; public: TYPEINFO_OVERRIDE(); OPropertySetItem(sal_Int16 nWhich); OPropertySetItem(sal_Int16 nWhich, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); + const css::uno::Reference< css::beans::XPropertySet >& _rxSet); OPropertySetItem(const OPropertySetItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getPropertySet() const { return m_xSet; } }; diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index 233bb1fd7b9c..0d54f7a083ed 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -33,8 +33,8 @@ namespace dbaui class SAL_NO_VTABLE PropertyStorage { public: - virtual void getPropertyValue( ::com::sun::star::uno::Any& _out_rValue ) const = 0; - virtual void setPropertyValue( const ::com::sun::star::uno::Any& _rValue ) = 0; + virtual void getPropertyValue( css::uno::Any& _out_rValue ) const = 0; + virtual void setPropertyValue( const css::uno::Any& _rValue ) = 0; virtual ~PropertyStorage(); }; @@ -60,8 +60,8 @@ namespace dbaui { } - virtual void getPropertyValue( ::com::sun::star::uno::Any& _out_rValue ) const SAL_OVERRIDE; - virtual void setPropertyValue( const ::com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE; + virtual void getPropertyValue( css::uno::Any& _out_rValue ) const SAL_OVERRIDE; + virtual void setPropertyValue( const css::uno::Any& _rValue ) SAL_OVERRIDE; private: SfxItemSet& m_rItemSet; diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 5c1e151aedbe..735e60ed0f16 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -44,11 +44,11 @@ namespace dbaui OQueryViewSwitch* m_pViewSwitch; VclPtr<OBeamer> m_pBeamer; VclPtr<Splitter> m_pSplitter; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xBeamer; + css::uno::Reference< css::frame::XFrame2 > m_xBeamer; DECL_LINK( SplitHdl, void* ); public: - OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); virtual void dispose() SAL_OVERRIDE; @@ -57,11 +57,11 @@ namespace dbaui virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; // show the beamer - void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + void showPreview(const css::uno::Reference< css::frame::XFrame >& _xFrame); // called when the beamer has been disposed void disposingPreview(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > + css::uno::Reference< css::frame::XFrame2 > getPreviewFrame() const { return m_xBeamer; } OQueryDesignView* getDesignView() { return m_pViewSwitch->getDesignView(); } diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index c3e55ed9cd83..5266a0ab4665 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -60,15 +60,15 @@ namespace dbaui OTableFields m_vTableFieldDesc; OTableFields m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aFieldInformation; + css::uno::Sequence< css::beans::PropertyValue > m_aFieldInformation; ::svxform::OSystemParseContext* m_pParseContext; ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator* m_pSqlIterator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > m_xComposer; + css::uno::Reference< css::sdb::XSQLQueryComposer > m_xComposer; /// if we're editing an existing view, this is non-NULL - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAlterView > m_xAlterView; + css::uno::Reference< css::sdbcx::XAlterView > m_xAlterView; OUString m_sStatement; // contains the current sql statement OUString m_sUpdateCatalogName; // catalog for update data @@ -95,14 +95,14 @@ namespace dbaui Not allowed to be called if we design an independent SQL command. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > getObjectContainer() const; - inline bool editingView() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::TABLE; } - inline bool editingQuery() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::QUERY; } - inline bool editingCommand() const { return m_nCommandType == ::com::sun::star::sdb::CommandType::COMMAND; } + inline bool editingView() const { return m_nCommandType == css::sdb::CommandType::TABLE; } + inline bool editingQuery() const { return m_nCommandType == css::sdb::CommandType::QUERY; } + inline bool editingCommand() const { return m_nCommandType == css::sdb::CommandType::COMMAND; } - bool askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements, + bool askForNewName( const css::uno::Reference< css::container::XNameAccess>& _xElements, bool _bSaveAs); // creates the querycomposer void setQueryComposer(); @@ -121,10 +121,10 @@ namespace dbaui protected: // all the features which should be handled by this class virtual void describeSupportedFeatures() SAL_OVERRIDE; - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; virtual void reconnect( bool _bUI ) SAL_OVERRIDE; virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; @@ -132,7 +132,7 @@ namespace dbaui OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } public: - OQueryController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + OQueryController(const css::uno::Reference< css::uno::XComponentContext >& _rM); virtual ~OQueryController(); OTableFields& getTableFieldDesc() { return m_vTableFieldDesc; } @@ -159,7 +159,7 @@ namespace dbaui sal_Int32 getColWidth(sal_uInt16 _nColPos) const; - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& + const css::uno::Sequence< css::beans::PropertyValue >& getFieldInformation() const { return m_aFieldInformation; } ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } @@ -170,45 +170,45 @@ namespace dbaui DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) // XPropertySet - virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XController - virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager) SAL_OVERRIDE; + virtual void onLoadedMenu(const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager) SAL_OVERRIDE; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& rConvertedValue, - ::com::sun::star::uno::Any& rOldValue, + css::uno::Any& rConvertedValue, + css::uno::Any& rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + const css::uno::Any& rValue + ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; + const css::uno::Any& rValue + ) throw (css::uno::Exception, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; @@ -220,7 +220,7 @@ namespace dbaui void impl_reset( const bool i_bIgnoreQuerySettings = false ); /// tells the user that we needed to switch to SQL view automatically - void impl_showAutoSQLViewError( const ::com::sun::star::uno::Any& _rErrorDetails ); + void impl_showAutoSQLViewError( const css::uno::Any& _rErrorDetails ); /** switches to the graphical or SQL view mode, as determined by m_bGraphicalDesign */ diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index b6a584949b52..dcc7b792b027 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -83,10 +83,10 @@ namespace dbaui OUString m_aSTR_COMPARE_OPERATORS; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xQueryComposer; + css::uno::Reference< css::container::XNameAccess> m_xColumns; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; + css::uno::Reference< css::sdbc::XDatabaseMetaData> m_xMetaData; ::dbtools::OPredicateInputController m_aPredicateInput; @@ -94,23 +94,23 @@ namespace dbaui DECL_LINK( ListSelectHdl, ListBox * ); DECL_LINK( ListSelectCompHdl, ListBox * ); - void SetLine( sal_uInt16 nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,bool _bOr ); + void SetLine( sal_uInt16 nIdx,const css::beans::PropertyValue& _rItem,bool _bOr ); void EnableLines(); sal_Int32 GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const; static sal_uInt16 GetSelectionPos(sal_Int32 eType,const ListBox& rListBox); - bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; - void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); + bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,css::beans::PropertyValue& _rFilter) const; + void fillLines(const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& _aValues); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const OUString& _rFieldName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; + css::uno::Reference< css::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; + css::uno::Reference< css::beans::XPropertySet > getColumn( const OUString& _rFieldName ) const; + css::uno::Reference< css::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: DlgFilterCrit( vcl::Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::sdbc::XConnection>& _rxConnection, + const css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& _rxComposer, + const css::uno::Reference< css::container::XNameAccess>& _rxCols ); virtual ~DlgFilterCrit(); virtual void dispose() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 46da94464b53..9e65263b038f 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -65,12 +65,12 @@ namespace dbaui VclPtr<ListBox> m_pLB_ORDERVALUE2; VclPtr<ListBox> m_pLB_ORDERFIELD3; VclPtr<ListBox> m_pLB_ORDERVALUE3; - OUString aSTR_NOENTRY; - OUString m_sOrgOrder; + OUString aSTR_NOENTRY; + OUString m_sOrgOrder; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xQueryComposer; + css::uno::Reference< css::container::XNameAccess> m_xColumns; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; VclPtr<ListBox> m_aColumnList[DOG_ROWS]; VclPtr<ListBox> m_aValueList[DOG_ROWS]; @@ -80,9 +80,9 @@ namespace dbaui public: DlgOrderCrit( vcl::Window * pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); + const css::uno::Reference< css::sdbc::XConnection>& _rxConnection, + const css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& _rxComposer, + const css::uno::Reference< css::container::XNameAccess>& _rxCols); virtual ~DlgOrderCrit(); virtual void dispose() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 645525ca8874..8b2730fd5f1b 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,7 +27,7 @@ namespace dbaui class OQueryView : public OJoinDesignView { public: - OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryView(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); virtual bool isCutAllowed() = 0; virtual bool isPasteAllowed() = 0; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index b4df5f58f800..c4019306a9fb 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -43,49 +43,49 @@ namespace com { namespace sun { namespace star { namespace dbaui { - struct SbaURLCompare : public ::std::binary_function< ::com::sun::star::util::URL, ::com::sun::star::util::URL, bool> + struct SbaURLCompare : public ::std::binary_function< css::util::URL, css::util::URL, bool> { - bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const { return x.Complete == y.Complete; } + bool operator() (const css::util::URL& x, const css::util::URL& y) const { return x.Complete == y.Complete; } }; class SbaXStatusMultiplexer; class SbaXGridControl :public FmXGridControl - ,public ::com::sun::star::frame::XDispatch + ,public css::frame::XDispatch { typedef std::map<css::util::URL, SbaXStatusMultiplexer*, SbaURLCompare> StatusMultiplexerArray; StatusMultiplexerArray m_aStatusMultiplexer; public: - SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + SbaXGridControl(const css::uno::Reference< css::uno::XComponentContext >&); virtual ~SbaXGridControl(); // UNO DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); - // ::com::sun::star::frame::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 ) SAL_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, std::exception ) SAL_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 ) SAL_OVERRIDE; + // css::frame::XDispatch + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) SAL_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 ) SAL_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 ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::lang::XComponent + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE; @@ -95,53 +95,53 @@ namespace dbaui class SbaXGridPeer :public FmXGridPeer - ,public ::com::sun::star::frame::XDispatch + ,public css::frame::XDispatch { cppu::OMultiTypeInterfaceContainerHelperVar< css::util::URL, void, SbaURLCompare> m_aStatusListeners; public: - SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + SbaXGridPeer(const css::uno::Reference< css::uno::XComponentContext >&); virtual ~SbaXGridPeer(); // UNO virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { FmXGridPeer::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { FmXGridPeer::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 > & rId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static SbaXGridPeer* getImplementation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxIFace); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 > & rId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + static SbaXGridPeer* getImplementation(const css::uno::Reference< css::uno::XInterface>& _rxIFace); - // ::com::sun::star::frame::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 ) SAL_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, std::exception ) SAL_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 ) SAL_OVERRIDE; + // css::frame::XDispatch + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) SAL_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 ) SAL_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 ) SAL_OVERRIDE; - // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::lang::XComponent + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; #ifdef _MSC_VER - typedef ::com::sun::star::frame::XStatusListener xstlist_type; - typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; - void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, const xlistener_type & xControl = xlistener_type() ); + typedef css::frame::XStatusListener xstlist_type; + typedef css::uno::Reference< xstlist_type > xlistener_type; + void NotifyStatusChanged(const css::util::URL& aUrl, const xlistener_type & xControl = xlistener_type() ); #else - void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > ()); + void NotifyStatusChanged(const css::util::URL& aUrl, const css::uno::Reference< css::frame::XStatusListener > & xControl = css::uno::Reference< css::frame::XStatusListener > ()); #endif // # _MSC_VER private: // for any execution of XDispatch::dispatch struct DispatchArgs { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::util::URL aURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; ::std::queue< DispatchArgs > m_aDispatchArgs; DECL_LINK( OnDispatchEvent, void* ); @@ -156,7 +156,7 @@ namespace dbaui dtUnknown }; - static DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); + static DispatchType classifyDispatchURL( const css::util::URL& _rURL ); typedef std::map<DispatchType, sal_Bool> MapDispatchToBool; MapDispatchToBool m_aDispatchStates; @@ -229,7 +229,7 @@ namespace dbaui sal_uInt16 GetCurrentActionColumn() const { return m_nCurrentActionColId; } public: - SbaGridControl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); + SbaGridControl(css::uno::Reference< css::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); virtual ~SbaGridControl(); virtual void dispose() SAL_OVERRIDE; @@ -290,10 +290,10 @@ namespace dbaui void AfterDrop(); // get a fields property set from a model pos - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getField(sal_uInt16 nModelPos); + css::uno::Reference< css::beans::XPropertySet > getField(sal_uInt16 nModelPos); // get my data source - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const; + css::uno::Reference< css::beans::XPropertySet > getDataSource() const; // drag events void DoColumnDrag(sal_uInt16 nColumnPos); diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 3ad706b6354d..0d88cdb2ca42 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -70,17 +70,17 @@ namespace dbaui classname( ::cppu::OWeakObject& rSource, \ ::osl::Mutex& rMutex); \ DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ - const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual css::uno::Any SAL_CALL queryInterface( \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + /* css::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ - virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ - virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ #define END_DECLARE_LISTENER_MULTIPLEXER() \ /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ @@ -98,25 +98,25 @@ namespace dbaui { \ } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ - const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + css::uno::Any SAL_CALL classname::queryInterface( \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) \ { \ - ::com::sun::star::uno::Any aReturn = \ + css::uno::Any aReturn = \ OSbaWeakSubObject::queryInterface(_rType); \ if (!aReturn.hasValue()) \ aReturn = ::cppu::queryInterface(_rType, \ static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + static_cast< css::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ ); \ \ return aReturn; \ } \ - void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::disposing(const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)\ { \ } \ #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \ - void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) \ { \ eventtype aMulti(e); \ aMulti.Source = &m_rParent; \ @@ -126,7 +126,7 @@ namespace dbaui } \ #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \ - sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) \ { \ eventtype aMulti(e); \ aMulti.Source = &m_rParent; \ @@ -139,21 +139,21 @@ namespace dbaui // helper for classes which do event multiplexing #define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::add##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l) throw(css::uno::RuntimeException, std::exception)\ { \ multiplexer.addInterface(l); \ if (multiplexer.getLength() == 1) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->add##listenerdesc(&multiplexer); \ } \ } \ - void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::remove##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l) throw(css::uno::RuntimeException, std::exception)\ { \ if (multiplexer.getLength() == 1) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->remove##listenerdesc(&multiplexer); \ } \ @@ -163,7 +163,7 @@ namespace dbaui #define STOP_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ if (multiplexer.getLength()) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->remove##listenerdesc(&multiplexer); \ } \ @@ -171,7 +171,7 @@ namespace dbaui #define START_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ if (multiplexer.getLength()) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->add##listenerdesc(&multiplexer); \ } \ @@ -191,17 +191,17 @@ namespace dbaui public: \ classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \ - const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual css::uno::Any SAL_CALL queryInterface( \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ \ - /* ::com::sun::star::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + /* css::lang::XEventListener */ \ + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ \ virtual void SAL_CALL methodname(const eventtype& e) throw exceptions SAL_OVERRIDE; \ \ public: \ - void addInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ - void removeInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void addInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener); \ + void removeInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener); \ \ void disposeAndClear(); \ \ @@ -222,20 +222,20 @@ namespace dbaui { \ } \ \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \ - const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + css::uno::Any SAL_CALL classname::queryInterface( \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) \ { \ - ::com::sun::star::uno::Any aReturn = \ + css::uno::Any aReturn = \ OSbaWeakSubObject::queryInterface(_rType); \ if (!aReturn.hasValue()) \ aReturn = ::cppu::queryInterface(_rType, \ static_cast< listenerclass* >(this), \ - static_cast< ::com::sun::star::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ + static_cast< css::lang::XEventListener* >(static_cast< listenerclass* >(this)) \ ); \ \ return aReturn; \ } \ - void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::disposing(const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)\ { \ } \ \ @@ -252,27 +252,27 @@ namespace dbaui } \ \ void classname::addInterface(const OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + const css::uno::Reference< css::uno::XInterface > & rListener) \ { \ m_aListeners.addInterface(rName, rListener); \ } \ \ void classname::removeInterface(const OUString& rName, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ + const css::uno::Reference< css::uno::XInterface > & rListener) \ { \ m_aListeners.removeInterface(rName, rListener); \ } \ \ void classname::disposeAndClear() \ { \ - ::com::sun::star::lang::EventObject aEvt(m_rParent); \ + css::lang::EventObject aEvt(m_rParent); \ m_aListeners.disposeAndClear(aEvt); \ } \ \ sal_Int32 classname::getOverallLen() const \ { \ sal_Int32 nLen = 0; \ - ::com::sun::star::uno::Sequence< OUString > aContained = m_aListeners.getContainedTypes(); \ + css::uno::Sequence< OUString > aContained = m_aListeners.getContainedTypes(); \ const OUString* pContained = aContained.getConstArray(); \ for ( sal_Int32 i=0; i<aContained.getLength(); ++i, ++pContained) \ { \ @@ -295,21 +295,21 @@ namespace dbaui // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ - void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::add##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)\ { \ multiplexer.addInterface(rName, l); \ if (multiplexer.getOverallLen() == 1) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ } \ - void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)\ { \ if (multiplexer.getOverallLen() == 1) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ @@ -319,7 +319,7 @@ namespace dbaui #define STOP_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ if (multiplexer.getOverallLen()) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ @@ -327,75 +327,75 @@ namespace dbaui #define START_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ if (multiplexer.getOverallLen()) \ { \ - ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ + css::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, css::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ // some listener multiplexers - // ::com::sun::star::frame::XStatusListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXStatusMultiplexer, ::com::sun::star::frame::XStatusListener) - DECLARE_MULTIPLEXER_VOID_METHOD(statusChanged, ::com::sun::star::frame::FeatureStateEvent) + // css::frame::XStatusListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXStatusMultiplexer, css::frame::XStatusListener) + DECLARE_MULTIPLEXER_VOID_METHOD(statusChanged, css::frame::FeatureStateEvent) private: - ::com::sun::star::frame::FeatureStateEvent m_aLastKnownStatus; + css::frame::FeatureStateEvent m_aLastKnownStatus; public: \ - inline ::com::sun::star::frame::FeatureStateEvent getLastEvent( ) const { return m_aLastKnownStatus; } + inline css::frame::FeatureStateEvent getLastEvent( ) const { return m_aLastKnownStatus; } END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::form::XLoadListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener) - DECLARE_MULTIPLEXER_VOID_METHOD(loaded, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(unloaded, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(unloading, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(reloading, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(reloaded, ::com::sun::star::lang::EventObject) + // css::form::XLoadListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXLoadMultiplexer, css::form::XLoadListener) + DECLARE_MULTIPLEXER_VOID_METHOD(loaded, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(unloaded, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(unloading, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(reloading, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(reloaded, css::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::form::XDatabaseParameterListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXParameterMultiplexer, ::com::sun::star::form::XDatabaseParameterListener) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveParameter, ::com::sun::star::form::DatabaseParameterEvent) + // css::form::XDatabaseParameterListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXParameterMultiplexer, css::form::XDatabaseParameterListener) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveParameter, css::form::DatabaseParameterEvent) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::form::XSubmitListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSubmitMultiplexer, ::com::sun::star::form::XSubmitListener) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveSubmit, ::com::sun::star::lang::EventObject) + // css::form::XSubmitListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSubmitMultiplexer, css::form::XSubmitListener) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveSubmit, css::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::form::XResetListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXResetMultiplexer, ::com::sun::star::form::XResetListener) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveReset, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(resetted, ::com::sun::star::lang::EventObject) + // css::form::XResetListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXResetMultiplexer, css::form::XResetListener) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveReset, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(resetted, css::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::sdbc::XRowSetListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetMultiplexer, ::com::sun::star::sdbc::XRowSetListener) - DECLARE_MULTIPLEXER_VOID_METHOD(cursorMoved, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(rowChanged, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, ::com::sun::star::lang::EventObject) + // css::sdbc::XRowSetListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetMultiplexer, css::sdbc::XRowSetListener) + DECLARE_MULTIPLEXER_VOID_METHOD(cursorMoved, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(rowChanged, css::lang::EventObject) + DECLARE_MULTIPLEXER_VOID_METHOD(rowSetChanged, css::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::sdb::XRowSetApproveListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetApproveMultiplexer, ::com::sun::star::sdb::XRowSetApproveListener) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveCursorMove, ::com::sun::star::lang::EventObject) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowChange, ::com::sun::star::sdb::RowChangeEvent) - DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, ::com::sun::star::lang::EventObject) + // css::sdb::XRowSetApproveListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXRowSetApproveMultiplexer, css::sdb::XRowSetApproveListener) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveCursorMove, css::lang::EventObject) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowChange, css::sdb::RowChangeEvent) + DECLARE_MULTIPLEXER_BOOL_METHOD(approveRowSetChange, css::lang::EventObject) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::sdb::XSQLErrorListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSQLErrorMultiplexer, ::com::sun::star::sdb::XSQLErrorListener) - DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, ::com::sun::star::sdb::SQLErrorEvent) + // css::sdb::XSQLErrorListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXSQLErrorMultiplexer, css::sdb::XSQLErrorListener) + DECLARE_MULTIPLEXER_VOID_METHOD(errorOccured, css::sdb::SQLErrorEvent) END_DECLARE_LISTENER_MULTIPLEXER() - // ::com::sun::star::beans::XPropertyChangeListener - DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, ::com::sun::star::beans::XPropertyChangeListener, propertyChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::uno::RuntimeException, std::exception)) + // css::beans::XPropertyChangeListener + DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent, (css::uno::RuntimeException, std::exception)) - // ::com::sun::star::beans::XVetoableChangeListener - DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, ::com::sun::star::beans::XVetoableChangeListener, vetoableChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception)) + // css::beans::XVetoableChangeListener + DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent, (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception)) - // ::com::sun::star::beans::XPropertiesChangeListener - BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXPropertiesChangeMultiplexer, ::com::sun::star::beans::XPropertiesChangeListener) - DECLARE_MULTIPLEXER_VOID_METHOD(propertiesChange, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >) + // css::beans::XPropertiesChangeListener + BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXPropertiesChangeMultiplexer, css::beans::XPropertiesChangeListener) + DECLARE_MULTIPLEXER_VOID_METHOD(propertiesChange, css::uno::Sequence< css::beans::PropertyChangeEvent >) END_DECLARE_LISTENER_MULTIPLEXER() // the SbaXPropertiesChangeMultiplexer doesn't care about the property names a listener logs on for, it simply // forwards _all_ changes to _all_ listeners diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index e6730b0152c6..1e3a8d97026c 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -35,12 +35,12 @@ namespace dbaui // OSingleDocumentController struct OSingleDocumentController_Data; typedef ::cppu::ImplInheritanceHelper< DBSubComponentController - , ::com::sun::star::document::XUndoManagerSupplier + , css::document::XUndoManagerSupplier > OSingleDocumentController_Base; class OSingleDocumentController : public OSingleDocumentController_Base { protected: - OSingleDocumentController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB ); + OSingleDocumentController( const css::uno::Reference< css::uno::XComponentContext>& _rxORB ); virtual ~OSingleDocumentController(); // OComponentHelper @@ -61,13 +61,13 @@ namespace dbaui // OGenericUnoController virtual FeatureState GetState( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual void Execute( sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs ) SAL_OVERRIDE; + virtual void Execute( sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs ) SAL_OVERRIDE; // XUndoManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: ::std::unique_ptr< OSingleDocumentController_Data > m_pData; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 2e8a8a2be294..3d1495f37762 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -44,14 +44,13 @@ namespace dbaui Link<> m_lnkTextModifyHdl; OUString m_strOrigText; // is restored on undo VclPtr<OQueryTextView> m_pView; - bool m_bAccelAction; // is set on cut, copy, paste - bool m_bStopTimer; + bool m_bAccelAction; // is set on cut, copy, paste + bool m_bStopTimer; svtools::ColorConfig m_ColorConfig; rtl::Reference< ChangesListener > m_listener; - osl::Mutex m_mutex; - com::sun::star::uno::Reference< - com::sun::star::beans::XMultiPropertySet > m_notifier; + osl::Mutex m_mutex; + css::uno::Reference< css::beans::XMultiPropertySet > m_notifier; DECL_LINK_TYPED(OnUndoActionTimer, Timer*, void); DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 51cc296b5624..0ae541b4794e 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -67,7 +67,7 @@ public: /** display an SQLException with auto-recognizing a main and a detailed message The first two messages from the exception chain are used as main and detailed message (recognizing the - detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). + detailed field of an <type scope="css::sdb">SQLContext</type>). */ OSQLMessageBox( vcl::Window* _pParent, diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index dd5d0ac62a89..e4f589e80d59 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -33,17 +33,17 @@ namespace dbaui */ class OStringListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence< OUString > m_aList; + css::uno::Sequence< OUString > m_aList; public: TYPEINFO_OVERRIDE(); - OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); + OStringListItem(sal_Int16 nWhich, const css::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; } + css::uno::Sequence< OUString > getList() const { return m_aList; } }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index a8afc9c2e39e..4cd9f8f8a8e6 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -38,11 +38,11 @@ namespace dbaui class OTableTreeListBox : public OMarkableTreeListBox { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > m_xConnection; // the connection we're working for, set in implOnNewConnection, called by UpdateTableList boost::scoped_ptr< ImageProvider > m_xImageProvider; // provider for our images - bool m_bVirtualRoot; // should the first entry be visible + bool m_bVirtualRoot; // should the first entry be visible bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: @@ -74,11 +74,11 @@ public: @param _rxConnection the connection, which must support the service com.sun.star.sdb.Connection @throws - <type scope="com::sun::star::sdbc">SQLException</type> if no connection could be created + <type scope="css::sdbc">SQLException</type> if no connection could be created */ void UpdateTableList( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection - ) throw(::com::sun::star::sdbc::SQLException, std::exception); + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection + ) throw(css::sdbc::SQLException, std::exception); /** fill the table list with the tables and views determined by the two given containers. The views sequence is used to determine which table is of type view. @@ -88,14 +88,14 @@ public: @param _rViews view sequence */ void UpdateTableList( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Sequence< OUString>& _rTables, - const ::com::sun::star::uno::Sequence< OUString>& _rViews + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Sequence< OUString>& _rTables, + const css::uno::Sequence< OUString>& _rViews ); /** returns a NamedDatabaseObject record which describes the given entry */ - ::com::sun::star::sdb::application::NamedDatabaseObject + css::sdb::application::NamedDatabaseObject describeObject( SvTreeListEntry* _pEntry ); /** to be used if a foreign instance added a table @@ -141,16 +141,16 @@ protected: belong. */ SvTreeListEntry* implAddEntry( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxMeta, const OUString& _rTableName, bool _bCheckName = true ); void implSetDefaultImages(); - void implOnNewConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); + void implOnNewConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); - bool impl_getAndAssertMetaData( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _out_rMetaData ) const; + bool impl_getAndAssertMetaData( css::uno::Reference< css::sdbc::XDatabaseMetaData >& _out_rMetaData ) const; bool haveVirtualRoot() const { return m_bVirtualRoot; } @@ -160,7 +160,7 @@ protected: @param _rTables table/view sequence, the second argument is <TRUE/> if it is a table, otherwise it is a view. */ void UpdateTableList( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const TNames& _rTables ); diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index a450ac9c4cbd..dd34ce07315f 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -31,7 +31,7 @@ class PopupMenu; namespace dbaui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> TToolboxController_BASE; + typedef ::cppu::ImplHelper1 < css::lang::XServiceInfo> TToolboxController_BASE; class OToolboxController : public ::svt::ToolboxController ,public TToolboxController_BASE @@ -43,21 +43,21 @@ namespace dbaui ::std::unique_ptr<PopupMenu> getMenu(); public: - OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OToolboxController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); // 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) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 11dc888d593b..2238680c9b9b 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -37,7 +37,7 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase; class ODatabaseAdministrationDialog :public ODatabaseAdministrationDialogBase { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; protected: SfxItemSet* m_pDatasourceItems; // item set for the dialog SfxItemPool* m_pItemPool; // item pool for the item set for the dialog @@ -45,16 +45,16 @@ protected: ::dbaccess::ODsnTypeCollection* m_pCollection; // datasource type collection - ::com::sun::star::uno::Any m_aInitialSelection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; + css::uno::Any m_aInitialSelection; + css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: - ODatabaseAdministrationDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + ODatabaseAdministrationDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ODatabaseAdministrationDialog(); protected: // OGenericUnoDialog overridables virtual void destroyDialog() SAL_OVERRIDE; - virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; + virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 6f3eb8f49904..2bf340655d8a 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -56,11 +56,11 @@ namespace dbaui struct DBTreeEditedEntry; class ImageProvider; - typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XStatusListener - , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::document::XScriptInvocationContext - , ::com::sun::star::ui::XContextMenuInterception - , ::com::sun::star::sdb::XDatabaseRegistrationsListener + typedef ::cppu::ImplHelper5 < css::frame::XStatusListener + , css::view::XSelectionSupplier + , css::document::XScriptInvocationContext + , css::ui::XContextMenuInterception + , css::sdb::XDatabaseRegistrationsListener > SbaTableQueryBrowser_Base; class SbaTableQueryBrowser :public SbaXDataBrowserController @@ -70,19 +70,19 @@ namespace dbaui { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMainToolbar; + css::uno::Reference< css::i18n::XCollator > m_xCollator; + css::uno::Reference< css::frame::XFrame > m_xCurrentFrameParent; + css::uno::Reference< css::awt::XWindow > m_xMainToolbar; struct ExternalFeature { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - xDispatcher; + css::util::URL aURL; + css::uno::Reference< css::frame::XDispatch > + xDispatcher; bool bEnabled; ExternalFeature() : bEnabled( false ) { } - ExternalFeature( const ::com::sun::star::util::URL& _rURL ) : aURL( _rURL ), bEnabled( false ) { } + ExternalFeature( const css::util::URL& _rURL ) : aURL( _rURL ), bEnabled( false ) { } }; typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less< sal_uInt16 > > ExternalFeaturesMap; @@ -118,18 +118,18 @@ namespace dbaui virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; // attribute access public: - SbaTableQueryBrowser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); + SbaTableQueryBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM); virtual ~SbaTableQueryBrowser(); enum EntryType { // don't change the above definitions! There are places (in particular SbaTableQueryBrowser::getCurrentSelection) // which rely on the fact that the EntryType values really equal the DatabaseObject(Container) values! - etDatasource = ::com::sun::star::sdb::application::DatabaseObjectContainer::DATA_SOURCE, - etQueryContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer::QUERIES, - etTableContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer::TABLES, - etQuery = ::com::sun::star::sdb::application::DatabaseObject::QUERY, - etTableOrView = ::com::sun::star::sdb::application::DatabaseObject::TABLE, + etDatasource = css::sdb::application::DatabaseObjectContainer::DATA_SOURCE, + etQueryContainer = css::sdb::application::DatabaseObjectContainer::QUERIES, + etTableContainer = css::sdb::application::DatabaseObjectContainer::TABLES, + etQuery = css::sdb::application::DatabaseObject::QUERY, + etTableOrView = css::sdb::application::DatabaseObject::TABLE, etUnknown = -1 }; @@ -140,82 +140,82 @@ namespace dbaui static sal_Int32 getDatabaseObjectType( EntryType _eType ); // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction virtual bool Construct(vcl::Window* pParent) SAL_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) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XController + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::frame::XFrameActionListener + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //IController virtual void notifyHiContrastChanged() SAL_OVERRIDE; // XScriptInvocationContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContextMenuInterception - virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDatabaseRegistrationsListener - virtual void SAL_CALL registeredDatabaseLocation( const ::com::sun::star::sdb::DatabaseRegistrationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokedDatabaseLocation( const ::com::sun::star::sdb::DatabaseRegistrationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL changedDatabaseLocation( const ::com::sun::star::sdb::DatabaseRegistrationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registeredDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // SbaXDataBrowserController overridables - virtual bool InitializeForm( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; - virtual bool InitializeGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid) SAL_OVERRIDE; + virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; + virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) SAL_OVERRIDE; virtual bool preReloadForm() SAL_OVERRIDE; virtual void postReloadForm() SAL_OVERRIDE; - virtual void addModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; - virtual void removeModelListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; + virtual void addModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; + virtual void removeModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; - virtual void AddColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; - virtual void RemoveColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; + virtual void AddColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) SAL_OVERRIDE; + virtual void RemoveColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) SAL_OVERRIDE; virtual void LoadFinished(bool _bWasSynch) SAL_OVERRIDE; @@ -223,7 +223,7 @@ namespace dbaui virtual void describeSupportedFeatures() SAL_OVERRIDE; virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; // IControlActionListener overridables virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const SAL_OVERRIDE; @@ -236,7 +236,7 @@ namespace dbaui virtual IController& getCommandController() SAL_OVERRIDE; virtual ::cppu::OInterfaceContainerHelper* getContextMenuInterceptors() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getCurrentSelection( Control& _rControl ) const SAL_OVERRIDE; virtual void impl_initialize() SAL_OVERRIDE; @@ -260,7 +260,7 @@ namespace dbaui // select the path of the entry (which must be an entry without children) void selectPath(SvTreeListEntry* _pEntry, bool _bSelect = true); - virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) SAL_OVERRIDE; + virtual void loadMenu(const css::uno::Reference< css::frame::XFrame >& _xFrame) SAL_OVERRIDE; private: // check the state of the external slot given, update any UI elements if necessary @@ -312,13 +312,13 @@ namespace dbaui */ void closeConnection(SvTreeListEntry* _pEntry, bool _bDisposeConnection = true); - void populateTree(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xNameAccess, SvTreeListEntry* _pParent, EntryType _eEntryType); + void populateTree(const css::uno::Reference< css::container::XNameAccess>& _xNameAccess, SvTreeListEntry* _pParent, EntryType _eEntryType); void initializeTreeModel(); /** search in the tree for query- or tablecontainer equal to this interface and return this container entry */ - SvTreeListEntry* getEntryFromContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxNameAccess); + SvTreeListEntry* getEntryFromContainer(const css::uno::Reference< css::container::XNameAccess>& _rxNameAccess); // return true when there is connection available bool ensureConnection(SvTreeListEntry* _pDSEntry, void * pDSData, SharedConnection& _rConnection ); bool ensureConnection(SvTreeListEntry* _pAnyEntry, SharedConnection& _rConnection ); @@ -427,9 +427,9 @@ namespace dbaui static void extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing); - void transferChangedControlProperty(const OUString& _rProperty, const ::com::sun::star::uno::Any& _rNewValue); + void transferChangedControlProperty(const OUString& _rProperty, const css::uno::Any& _rNewValue); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connectWithStatus( + css::uno::Reference< css::sdbc::XConnection > connectWithStatus( const OUString& _rDataSourceName, void* _pTreeListUserData // in reality a DBTreeListUserData*, but we do not know this class here... ); @@ -450,7 +450,7 @@ namespace dbaui void copyEntry(SvTreeListEntry* _pEntry); // remove all grid columns and dispose them - static void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer); + static void clearGridColumns(const css::uno::Reference< css::container::XNameContainer >& _xColContainer); /** checks if the currently displayed entry changed @param _sName diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 5a41729aee2c..617f18405a3d 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -32,43 +32,43 @@ class OSQLMessageDialog :public OSQLMessageDialogBase ,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog > { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; protected: // <properties> - ::com::sun::star::uno::Any m_aException; + css::uno::Any m_aException; OUString m_sHelpURL; // </properties> protected: - OSQLMessageDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OSQLMessageDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - SAL_CALL Create(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: - virtual void SAL_CALL initialize(com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & args) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper overridables // (overwrittin these three, because we have some special handling for our property) - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; // OGenericUnoDialog overridables virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index f8465fe856be..8b971f286e33 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -83,7 +83,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper ODatabaseExport::ODatabaseExport(sal_Int32 nRows, const TPositions &_rColumnPositions, const Reference< XNumberFormatter >& _rxNumberF, - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled, @@ -138,7 +138,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, const Reference< XNumberFormatter >& _rxNumberF, - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, SvStream& _rInputStream) @@ -745,7 +745,7 @@ bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTe return bError; } -void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e) +void ODatabaseExport::showErrorDialog(const css::sdbc::SQLException& e) { if(!m_bDontAskAgain) { diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 436995b63cf3..121b88ad2362 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -69,8 +69,8 @@ using namespace ::com::sun::star::awt; // OHTMLReader OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) : HTMLParser(rIn) @@ -89,8 +89,8 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, OHTMLReader::OHTMLReader(SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled) @@ -478,16 +478,16 @@ bool OHTMLReader::CreateTable(int nToken) TableFontOn(aFont,nTextColor); break; case HTML_BOLD_ON: - aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD; + aFont.Weight = css::awt::FontWeight::BOLD; break; case HTML_ITALIC_ON: - aFont.Slant = ::com::sun::star::awt::FontSlant_ITALIC; + aFont.Slant = css::awt::FontSlant_ITALIC; break; case HTML_UNDERLINE_ON: - aFont.Underline = ::com::sun::star::awt::FontUnderline::SINGLE; + aFont.Underline = css::awt::FontUnderline::SINGLE; break; case HTML_STRIKE_ON: - aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; + aFont.Strikeout = css::awt::FontStrikeout::SINGLE; break; } nToken = GetNextToken(); diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index a4ece11b42f5..963fd617ac1f 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -59,8 +59,8 @@ using namespace ::com::sun::star::awt; // ORTFReader ORTFReader::ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) :SvRTFParser(rIn) @@ -72,8 +72,8 @@ ORTFReader::ORTFReader( SvStream& rIn, ORTFReader::ORTFReader(SvStream& rIn, sal_Int32 nRows, const TPositions &_rColumnPositions, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::util::XNumberFormatter >& _rxNumberF, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled) @@ -289,16 +289,16 @@ bool ORTFReader::CreateTable(int nToken) case RTF_CF: break; case RTF_B: - aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD; + aFont.Weight = css::awt::FontWeight::BOLD; break; case RTF_I: - aFont.Slant = ::com::sun::star::awt::FontSlant_ITALIC; + aFont.Slant = css::awt::FontSlant_ITALIC; break; case RTF_UL: - aFont.Underline = ::com::sun::star::awt::FontUnderline::SINGLE; + aFont.Underline = css::awt::FontUnderline::SINGLE; break; case RTF_STRIKE: - aFont.Strikeout = ::com::sun::star::awt::FontStrikeout::SINGLE; + aFont.Strikeout = css::awt::FontStrikeout::SINGLE; break; } nToken = GetNextToken(); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 0ad8c09ab4b4..a7fda1c9ebc6 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -84,7 +84,7 @@ const static char sFontSize[] = "font-size: "; ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, + const Reference< css::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange) :m_bBookmarkSelection( false ) ,m_xFormatter(_rxNumberF) @@ -119,7 +119,7 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& ,m_xConnection(_rxConnection) ,m_xFormatter(_rxNumberF) ,m_xContext(_rM) - ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE) + ,m_nCommandType(css::sdb::CommandType::TABLE) ,m_bNeedToReInitialize(false) ,m_pReader(NULL) ,m_pRowMarker(NULL) @@ -169,7 +169,7 @@ void ODatabaseImportExport::dispose() m_xFormatter.clear(); } -void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(css::uno::RuntimeException, std::exception) { Reference<XConnection> xCon(Source.Source,UNO_QUERY); if(m_xConnection.is() && m_xConnection == xCon) @@ -370,10 +370,10 @@ bool ORTFImportExport::Write() m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING ); rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; - bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - bool bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - bool bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + bool bBold = ( css::awt::FontWeight::BOLD == m_aFont.Weight ); + bool bItalic = ( css::awt::FontSlant_ITALIC == m_aFont.Slant ); + bool bUnderline = ( css::awt::FontUnderline::NONE != m_aFont.Underline ); + bool bStrikeout = ( css::awt::FontStrikeout::NONE != m_aFont.Strikeout ); sal_Int32 nColor = 0; if(m_xObject.is()) @@ -555,10 +555,10 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); } - const bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - const bool bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - const bool bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - const bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + const bool bBold = ( css::awt::FontWeight::BOLD == m_aFont.Weight ); + const bool bItalic = ( css::awt::FontSlant_ITALIC == m_aFont.Slant ); + const bool bUnderline = ( css::awt::FontUnderline::NONE != m_aFont.Underline ); + const bool bStrikeout = ( css::awt::FontStrikeout::NONE != m_aFont.Strikeout ); Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); m_pStream->WriteChar( '{' ); @@ -638,7 +638,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\ OHTMLImportExport::OHTMLImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, - const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, + const Reference< css::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange) : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) ,m_nIndent(0) @@ -934,7 +934,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal aStrTD = aStrTD + "="; aStrTD = aStrTD + pChar; - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); + Reference< css::util::XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; if(pFormatter) @@ -956,10 +956,10 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal FontOn(); - bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); - bool bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant ); - bool bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline ); - bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout ); + bool bBold = ( css::awt::FontWeight::BOLD == m_aFont.Weight ); + bool bItalic = ( css::awt::FontSlant_ITALIC == m_aFont.Slant ); + bool bUnderline = ( css::awt::FontUnderline::NONE != m_aFont.Underline ); + bool bStrikeout = ( css::awt::FontStrikeout::NONE != m_aFont.Strikeout ); if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 5fa0ba84f11e..9a573a1943fa 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -131,10 +131,10 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::frame::XModel; SQLExceptionInfo createConnection( const OUString& _rsDataSourceName, - const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, - Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) + const Reference< css::container::XNameAccess >& _xDatabaseContext, + const Reference< css::uno::XComponentContext >& _rxContext, + Reference< css::lang::XEventListener>& _rEvtLst, + Reference< css::sdbc::XConnection>& _rOUTConnection ) { Reference<XPropertySet> xProp; try @@ -149,10 +149,10 @@ SQLExceptionInfo createConnection( const OUString& _rsDataSourceName, return createConnection(xProp,_rxContext,_rEvtLst,_rOUTConnection); } -SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource, - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, - Reference< ::com::sun::star::sdbc::XConnection>& _rOUTConnection ) +SQLExceptionInfo createConnection( const Reference< css::beans::XPropertySet>& _xDataSource, + const Reference< css::uno::XComponentContext >& _rxContext, + Reference< css::lang::XEventListener>& _rEvtLst, + Reference< css::sdbc::XConnection>& _rOUTConnection ) { SQLExceptionInfo aInfo; if ( !_xDataSource.is() ) @@ -425,7 +425,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, return pTypeInfo; } -void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, +void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, const OUString& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters) @@ -704,7 +704,7 @@ OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const return sDefaultName; } -bool checkDataSourceAvailable(const OUString& _sDataSourceName,const Reference< ::com::sun::star::uno::XComponentContext >& _xContext) +bool checkDataSourceAvailable(const OUString& _sDataSourceName,const Reference< css::uno::XComponentContext >& _xContext) { Reference< XDatabaseContext > xDataBaseContext = DatabaseContext::create(_xContext); bool bRet = xDataBaseContext->hasByName(_sDataSourceName); @@ -723,13 +723,13 @@ bool checkDataSourceAvailable(const OUString& _sDataSourceName,const Reference< sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) { - sal_Int32 nAlignment = com::sun::star::awt::TextAlign::LEFT; + sal_Int32 nAlignment = css::awt::TextAlign::LEFT; switch (_eAlignment) { case SVX_HOR_JUSTIFY_STANDARD: - case SVX_HOR_JUSTIFY_LEFT: nAlignment = ::com::sun::star::awt::TextAlign::LEFT; break; - case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; + case SVX_HOR_JUSTIFY_LEFT: nAlignment = css::awt::TextAlign::LEFT; break; + case SVX_HOR_JUSTIFY_CENTER: nAlignment = css::awt::TextAlign::CENTER; break; + case SVX_HOR_JUSTIFY_RIGHT: nAlignment = css::awt::TextAlign::RIGHT; break; default: SAL_WARN("dbaccess.ui", "Invalid TextAlign!"); } @@ -741,9 +741,9 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) SvxCellHorJustify eJustify = SVX_HOR_JUSTIFY_LEFT; switch (_nAlignment) { - case ::com::sun::star::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; - case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; - case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; + case css::awt::TextAlign::LEFT : eJustify = SVX_HOR_JUSTIFY_LEFT; break; + case css::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; + case css::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: SAL_WARN("dbaccess.ui", "Invalid TextAlign!"); } @@ -1114,7 +1114,7 @@ namespace try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), - Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); if ( ( aCnt.getPropertyValue("AnchorName") >>= sAnchor ) ) { @@ -1138,9 +1138,9 @@ namespace } } // anonymous -::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId) +css::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId) { - ::com::sun::star::util::URL aURL; + css::util::URL aURL; aURL.Complete = "vnd.sun.star.help://" + _sModuleName + "/" + OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); @@ -1157,12 +1157,12 @@ namespace return aURL; } -void setEvalDateFormatForFormatter(Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) +void setEvalDateFormatForFormatter(Reference< css::util::XNumberFormatter >& _rxFormatter) { OSL_ENSURE( _rxFormatter.is(),"setEvalDateFormatForFormatter: Formatter is NULL!"); if ( _rxFormatter.is() ) { - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = _rxFormatter->getNumberFormatsSupplier(); + Reference< css::util::XNumberFormatsSupplier > xSupplier = _rxFormatter->getNumberFormatsSupplier(); Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); SvNumberFormatsSupplierObj* pSupplierImpl = reinterpret_cast<SvNumberFormatsSupplierObj*>(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); @@ -1489,14 +1489,14 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo return true; } -Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >& _rxConnection, const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) +Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >& _rxConnection, const Reference< css::uno::XComponentContext >& _rxContext ) { // create a formatter working with the connections format supplier Reference< XNumberFormatter > xFormatter; try { - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(_rxConnection, true, _rxContext)); + Reference< css::util::XNumberFormatsSupplier > xSupplier(::dbtools::getNumberFormats(_rxConnection, true, _rxContext)); if ( xSupplier.is() ) { diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index 5a6b97b4d1ca..1f3d28b3d486 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -31,12 +31,12 @@ namespace dbaui { class ORowUpdateHelper : public IUpdateHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xResultSetUpdate; + css::uno::Reference< css::sdbc::XRowUpdate > m_xRowUpdate; + css::uno::Reference< css::sdbc::XResultSetUpdate > m_xResultSetUpdate; public: - explicit ORowUpdateHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _xRowSet) - :m_xRowUpdate(_xRowSet,::com::sun::star::uno::UNO_QUERY) - ,m_xResultSetUpdate(_xRowSet,::com::sun::star::uno::UNO_QUERY) + explicit ORowUpdateHelper(const css::uno::Reference< css::sdbc::XRowSet>& _xRowSet) + :m_xRowUpdate(_xRowSet,css::uno::UNO_QUERY) + ,m_xResultSetUpdate(_xRowSet,css::uno::UNO_QUERY) { } virtual ~ORowUpdateHelper() {} @@ -48,15 +48,15 @@ namespace dbaui { m_xRowUpdate->updateDouble(_nPos, _nValue); } - virtual void updateDate(sal_Int32 _nPos,const ::com::sun::star::util::Date& _nValue) SAL_OVERRIDE + virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) SAL_OVERRIDE { m_xRowUpdate->updateDate(_nPos, _nValue); } - virtual void updateTime(sal_Int32 _nPos,const ::com::sun::star::util::Time& _nValue) SAL_OVERRIDE + virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) SAL_OVERRIDE { m_xRowUpdate->updateTime(_nPos, _nValue); } - virtual void updateTimestamp(sal_Int32 _nPos,const ::com::sun::star::util::DateTime& _nValue) SAL_OVERRIDE + virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) SAL_OVERRIDE { m_xRowUpdate->updateTimestamp(_nPos, _nValue); } @@ -80,13 +80,13 @@ namespace dbaui class OParameterUpdateHelper : public IUpdateHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xPrepared; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xParameters; + css::uno::Reference< css::sdbc::XPreparedStatement > m_xPrepared; + css::uno::Reference< css::sdbc::XParameters > m_xParameters; public: - explicit OParameterUpdateHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement >& _xPrepared) + explicit OParameterUpdateHelper(const css::uno::Reference< css::sdbc::XPreparedStatement >& _xPrepared) :m_xPrepared(_xPrepared) - ,m_xParameters(_xPrepared,::com::sun::star::uno::UNO_QUERY) + ,m_xParameters(_xPrepared,css::uno::UNO_QUERY) { } virtual ~OParameterUpdateHelper() {} @@ -98,15 +98,15 @@ namespace dbaui { m_xParameters->setDouble(_nPos, _nValue); } - virtual void updateDate(sal_Int32 _nPos,const ::com::sun::star::util::Date& _nValue) SAL_OVERRIDE + virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) SAL_OVERRIDE { m_xParameters->setDate(_nPos, _nValue); } - virtual void updateTime(sal_Int32 _nPos,const ::com::sun::star::util::Time& _nValue) SAL_OVERRIDE + virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) SAL_OVERRIDE { m_xParameters->setTime(_nPos, _nValue); } - virtual void updateTimestamp(sal_Int32 _nPos,const ::com::sun::star::util::DateTime& _nValue) SAL_OVERRIDE + virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) SAL_OVERRIDE { m_xParameters->setTimestamp(_nPos, _nValue); } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 0c99a437378d..3ddd917c0eed 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; +namespace CopyTableOperation = css::sdb::application::CopyTableOperation; // Klasse OCopyTable OCopyTable::OCopyTable(vcl::Window * pParent) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index f32dba666b7f..9e07344f49eb 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -408,16 +408,16 @@ public: static const DummyCopySource& Instance(); // ICopyTableSourceObject overridables - virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; + virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > getColumnNames() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > + virtual css::uno::Sequence< OUString > getPrimaryKeyColumnNames() const SAL_OVERRIDE; virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; - virtual OUString getSelectStatement() const SAL_OVERRIDE; + virtual OUString getSelectStatement() const SAL_OVERRIDE; virtual ::utl::SharedUNOComponent< XPreparedStatement > getPreparedSelectStatement() const SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index f005583b8761..abd51cebee81 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -184,7 +184,7 @@ bool OWizNameMatching::LeavePage() pTypeInfo = m_pParent->convertType((*aDestIter)->second->getSpecialTypeInfo(), bNotConvert); } - sal_Int32 nType = ::com::sun::star::sdbc::DataType::VARCHAR; + sal_Int32 nType = css::sdbc::DataType::VARCHAR; if ( pTypeInfo.get() ) nType = pTypeInfo->nType; m_pParent->m_vColumnTypes[nPos] = nType; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index dcde972e33d3..f631f99cf95f 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -176,7 +176,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) saveCurrentFieldDescData(); } -::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const +css::lang::Locale OWizTypeSelectControl::GetLocale() const { return static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_pParent->GetLocale(); } @@ -196,12 +196,12 @@ const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const return &static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_pParent->getDestTypeInfo(); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> OWizTypeSelectControl::getMetaData() +css::uno::Reference< css::sdbc::XDatabaseMetaData> OWizTypeSelectControl::getMetaData() { return static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_pParent->m_xDestConnection->getMetaData(); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> OWizTypeSelectControl::getConnection() +css::uno::Reference< css::sdbc::XConnection> OWizTypeSelectControl::getConnection() { return static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_pParent->m_xDestConnection; } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 7e3dae216af6..55a73e38d669 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -79,16 +79,16 @@ namespace dbaui virtual ~FrameWindowActivationListener(); // XTopWindowListener - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void impl_checkDisposed_throw() const; diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index f203c417370b..74e0e2a3ad5a 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -324,15 +324,15 @@ namespace dbaui OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); - com::sun::star::sdbc::SQLException aSQLException; + css::sdbc::SQLException aSQLException; aSQLException.Message = sMessage; aInfo = dbtools::SQLExceptionInfo(aSQLException); } return xRet; } - catch(const com::sun::star::io::WrongFormatException &e) + catch(const css::io::WrongFormatException &e) { - com::sun::star::sdbc::SQLException aSQLException; + css::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; aInfo = dbtools::SQLExceptionInfo(aSQLException); @@ -349,10 +349,10 @@ namespace dbaui catch(const Exception& e) { Any aAny = ::cppu::getCaughtException(); - com::sun::star::sdbc::SQLException a; + css::sdbc::SQLException a; if ( !(aAny >>= a) || (a.ErrorCode != dbtools::ParameterInteractionCancelled) ) { - com::sun::star::sdbc::SQLException aSQLException; + css::sdbc::SQLException aSQLException; aSQLException.Message = e.Message; aSQLException.Context = e.Context; aInfo = dbtools::SQLExceptionInfo(aSQLException); diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 9b584be0715b..2b7f4ae55b3f 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -178,7 +178,7 @@ namespace dbaui m_pParent.clear(); vcl::Window::dispose(); } - Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) { return this; } diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index c76d2f8c933f..5ef3db8704b7 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -87,7 +87,7 @@ namespace dbaui { return AccessibleRole::VIEW_PORT; } - Reference< XAccessibleContext > SAL_CALL OJoinDesignViewAccess::getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL OJoinDesignViewAccess::getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) { return this; } diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 3852ef9d3322..193c35d844bd 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -90,7 +90,7 @@ public: virtual ~AddTableDialogContext() {} // IAddTableDialogContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + virtual css::uno::Reference< css::sdbc::XConnection > getConnection() const SAL_OVERRIDE; virtual bool allowViews() const SAL_OVERRIDE; virtual bool allowQueries() const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index a422c6c92810..6a7d1a8e9803 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -143,7 +143,7 @@ void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry) bool OQueryTableWindow::ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo) { - OSL_ENSURE(m_xListBox != nullptr, "OQueryTableWindow::ExistsField : doesn't have ::com::sun::star::form::ListBox !"); + OSL_ENSURE(m_xListBox != nullptr, "OQueryTableWindow::ExistsField : doesn't have css::form::ListBox !"); OSL_ENSURE(rInfo.is(),"OQueryTableWindow::ExistsField: invalid argument for OTableFieldDescRef!"); Reference< XConnection> xConnection = getTableView()->getDesignView()->getController().getConnection(); bool bExists = false; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index 8f64918b4eb5..c480b4be4bd1 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -72,8 +72,8 @@ namespace dbaui @return the user data which will be append at the listbox entry, may be <NULL/> */ - virtual void* createUserData(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet>& _xColumn, + virtual void* createUserData(const css::uno::Reference< + css::beans::XPropertySet>& _xColumn, bool _bPrimaryKey) SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index bdb2dc77ede5..52f4f076f586 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -188,7 +188,7 @@ namespace OUString ParseCondition( OQueryController& rController ,const ::connectivity::OSQLParseNode* pCondition ,const OUString& _sDecimal - ,const ::com::sun::star::lang::Locale& _rLocale + ,const css::lang::Locale& _rLocale ,sal_uInt32 _nStartIndex) { OUString aCondition; @@ -1330,10 +1330,10 @@ namespace bool bHaving, bool bAddOrOnOneLine) { - const ::com::sun::star::lang::Locale aLocale = _pView->getLocale(); + const css::lang::Locale aLocale = _pView->getLocale(); const OUString sDecimal = _pView->getDecimalSeparator(); - // I will need a cast pointer to my com::sun::star::sdbcx::Container + // I will need a cast pointer to my css::sdbcx::Container OQueryController& rController = static_cast<OQueryController&>(_pView->getController()); SqlParseError eErrorCode = eOk; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 2b0955c370f6..86fb9f75b581 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -130,7 +130,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) m_pOrderCell->SetHelpId(HID_QRYDGN_ROW_ORDER); m_pFunctionCell->SetHelpId(HID_QRYDGN_ROW_FUNCTION); - // switch off triState of ::com::sun::star::form::CheckBox + // switch off triState of css::form::CheckBox m_pVisibleCell->GetBox().EnableTriState( false ); vcl::Font aTitleFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE,Window::GetSettings().GetLanguageTag().getLanguageType(),GetDefaultFontFlags::OnlyOne); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 6e48bf033d1d..3999f592633a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -179,7 +179,7 @@ namespace dbaui @param nRow The row index of the cell. @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; protected: virtual bool SeekRow( long nRow ) SAL_OVERRIDE; @@ -272,12 +272,12 @@ namespace dbaui <TRUE/> if an error occurred otherwise <FALSE/> */ bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, bool& _bListAction); bool fillColumnRef( const OUString& _sColumnName, const OUString& _sTableRange, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData, OTableFieldDescRef& _pEntry, bool& _bListAction); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index db44c06a982b..0c0c1e10a3f4 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -147,7 +147,7 @@ namespace }; } -void OTableFieldDesc::Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ) +void OTableFieldDesc::Load( const css::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ) { ::comphelper::NamedValueCollection aFieldDesc( i_rSettings.Value ); diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 3e78a61c8d49..1ca50329c091 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -760,17 +760,17 @@ OUString OTableWindow::getTitle() const return m_xTitle->GetText(); } -void OTableWindow::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OTableWindow::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { FillListBox(); } -void OTableWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OTableWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { FillListBox(); } -void OTableWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OTableWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { FillListBox(); } diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index a2fb61435c13..94c8c36983f4 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -249,7 +249,7 @@ namespace dbaui sAccessibleName = m_pTable->getTitle(); return sAccessibleName; } - Reference< XAccessibleContext > SAL_CALL OTableWindowAccess::getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL OTableWindowAccess::getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) { return this; } diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index f6bfa841c49a..397a62d94b33 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -74,7 +74,7 @@ bool OTableWindowData::HasSize() const return ( (m_aSize.Width() != -1) && (m_aSize.Height() !=-1) ); } -void OTableWindowData::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) +void OTableWindowData::_disposing( const css::lang::EventObject& /*_rSource*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); // it doesn't matter which one was disposed diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 1ced90514142..1866a423fcd5 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -28,15 +28,15 @@ class LimitBoxImpl; * to set\get the value of limitbox when switching between views */ class LimitBoxController: public svt::ToolboxController, - public ::com::sun::star::lang::XServiceInfo + public css::lang::XServiceInfo { public: explicit LimitBoxController( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~LimitBoxController(); /// XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; @@ -44,19 +44,19 @@ class LimitBoxController: public svt::ToolboxController, DECLARE_SERVICE_INFO_STATIC(); /// XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /// XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void dispatchCommand( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); using svt::ToolboxController::dispatchCommand; private: diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 47ef55bbc19c..edf49a59f14d 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -69,7 +69,7 @@ namespace dbaui m_pBeamer.clear(); if ( m_xBeamer.is() ) { - Reference< ::com::sun::star::util::XCloseable > xCloseable(m_xBeamer,UNO_QUERY); + Reference< css::util::XCloseable > xCloseable(m_xBeamer,UNO_QUERY); m_xBeamer = NULL; if(xCloseable.is()) xCloseable->close(sal_False); // false - holds the ownership of this frame diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index d06a78f0c097..76bd6c1110b2 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -255,7 +255,7 @@ namespace { void ensureToolbars( OQueryController& _rController, bool _bDesign ) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = OGenericUnoController::getLayoutManager( _rController.getFrame() ); + Reference< css::frame::XLayoutManager > xLayoutManager = OGenericUnoController::getLayoutManager( _rController.getFrame() ); if ( xLayoutManager.is() ) { xLayoutManager->lock(); @@ -726,7 +726,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& case SID_DB_QUERY_PREVIEW: try { - Reference< ::com::sun::star::util::XCloseable > xCloseFrame( getContainer()->getPreviewFrame(), UNO_QUERY ); + Reference< css::util::XCloseable > xCloseFrame( getContainer()->getPreviewFrame(), UNO_QUERY ); if ( xCloseFrame.is() ) { try @@ -811,7 +811,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& InvalidateFeature(_nId); } -void OQueryController::impl_showAutoSQLViewError( const ::com::sun::star::uno::Any& _rErrorDetails ) +void OQueryController::impl_showAutoSQLViewError( const css::uno::Any& _rErrorDetails ) { SQLContext aErrorContext; aErrorContext.Message = lcl_getObjectResourceString( STR_ERROR_PARSING_STATEMENT, m_nCommandType ); @@ -1064,7 +1064,7 @@ void OQueryController::impl_initialize() } } -void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XLayoutManager >& /*_xLayoutManager*/) +void OQueryController::onLoadedMenu(const Reference< css::frame::XLayoutManager >& /*_xLayoutManager*/) { ensureToolbars( *this, m_bGraphicalDesign ); } diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index ec31515d007e..02009b20bf31 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -51,7 +51,7 @@ namespace dbaui EJoinType eJoinType; TTableConnectionData::value_type m_pConnData; // contains left and right table TTableConnectionData::value_type m_pOrigConnData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; DECL_LINK( OKClickHdl, Button* ); @@ -66,7 +66,7 @@ namespace dbaui DlgQryJoin( OQueryTableView * pParent, const TTableConnectionData::value_type& pData, OJoinTableView::OTableWindowMap* _pTableMap, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, bool _bAllowTableSelect); virtual ~DlgQryJoin(); virtual void dispose() SAL_OVERRIDE; @@ -82,7 +82,7 @@ namespace dbaui */ virtual void setValid(bool _bValid) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } + virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 922750997824..81b3a2a6dccf 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -384,12 +384,12 @@ bool ORelationTableView::allowQueries() const return false; } -void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { } -void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) { m_bInRemove = true; OUString sName; @@ -409,7 +409,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve m_bInRemove = false; } -void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 8d173d862732..08265142077d 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -457,7 +457,7 @@ void OFieldDescription::SetPrimaryKey(bool _bPKey) { m_bIsPrimaryKey = _bPKey; if ( _bPKey ) - SetIsNullable(::com::sun::star::sdbc::ColumnValue::NO_NULLS); + SetIsNullable(css::sdbc::ColumnValue::NO_NULLS); } void OFieldDescription::SetCurrency(bool _bIsCurrency) @@ -489,7 +489,7 @@ OUString OFieldDescription::GetHelpText() const return m_sHelpText; } -::com::sun::star::uno::Any OFieldDescription::GetControlDefault() const +css::uno::Any OFieldDescription::GetControlDefault() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT) ) return m_xDest->getPropertyValue(PROPERTY_CONTROLDEFAULT); @@ -601,9 +601,9 @@ bool OFieldDescription::IsAutoIncrement() const bool OFieldDescription::IsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) - return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)) == ::com::sun::star::sdbc::ColumnValue::NULLABLE; + return ::comphelper::getINT32(m_xDest->getPropertyValue(PROPERTY_ISNULLABLE)) == css::sdbc::ColumnValue::NULLABLE; else - return m_nIsNullable == ::com::sun::star::sdbc::ColumnValue::NULLABLE; + return m_nIsNullable == css::sdbc::ColumnValue::NULLABLE; } void OFieldDescription::SetTypeName(const OUString& _sTypeName) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e118049bc39e..c1a5a170c9f5 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -744,7 +744,7 @@ void OTableEditorCtrl::CopyRows() if(!vClipboardList.empty()) { OTableRowExchange* pData = new OTableRowExchange(vClipboardList); - Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; + Reference< css::datatransfer::XTransferable> xRef = pData; pData->CopyToClipboard(GetParent()); } } @@ -940,7 +940,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeIn SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : OUString()); } -void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) +void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rNewData ) { // Relocate the current pointer if( nRow == -1 ) @@ -1311,7 +1311,7 @@ bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) Reference<XPropertySet> xTable = rController.getTable(); // Key must not be changed - // This applies only if the table is not new and not a ::com::sun::star::sdbcx::View. Otherwise no DROP is executed + // This applies only if the table is not new and not a css::sdbcx::View. Otherwise no DROP is executed if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == "VIEW") return false; @@ -1332,7 +1332,7 @@ bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) { // Memo and Image fields cannot be primary keys // or if the column cannot be dropped and the Required flag is not set - // or if a ::com::sun::star::sdbcx::View is available and the Required flag is not set + // or if a css::sdbcx::View is available and the Required flag is not set TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo(); if( pTypeInfo->nSearchType == ColumnSearch::NONE || (pFieldDescr->IsNullable() && pRow->IsReadOnly()) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index fe02afd68fef..7a714ef6807f 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -140,8 +140,8 @@ namespace dbaui void DisplayData( long nRow, bool bGrabFocus = true ); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) SAL_OVERRIDE; - virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; + virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rSaveData ) SAL_OVERRIDE; + virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) SAL_OVERRIDE; virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 550bc3f59328..af401933de7e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -82,7 +82,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) } if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { - ::com::sun::star::util::URL aUrl; + css::util::URL aUrl; aUrl.Complete = ".uno:DSBEditDoc"; GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 2ff476abbabd..87596e7b9405 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -56,7 +56,7 @@ bool OTableFieldControl::IsReadOnly() bool bRead(GetCtrl()->IsReadOnly()); if( !bRead ) { - // The columns of a ::com::sun::star::sdbcx::View could not be locked + // The columns of a css::sdbcx::View could not be locked Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == "VIEW") bRead = true; @@ -99,12 +99,12 @@ void OTableFieldControl::SetModified(bool bModified) GetCtrl()->GetView()->getController().setModified(bModified); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> OTableFieldControl::getConnection() +css::uno::Reference< css::sdbc::XConnection> OTableFieldControl::getConnection() { return GetCtrl()->GetView()->getController().getConnection(); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> OTableFieldControl::getMetaData() +css::uno::Reference< css::sdbc::XDatabaseMetaData> OTableFieldControl::getMetaData() { Reference<XConnection> xCon = GetCtrl()->GetView()->getController().getConnection(); if(!xCon.is()) diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index 80e6bd5aa114..4e830e8b3b89 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -36,14 +36,14 @@ namespace dbaui virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; virtual bool IsReadOnly() SAL_OVERRIDE; virtual void SetModified(bool bModified) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale GetLocale() const SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; - virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; + virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); @@ -51,8 +51,8 @@ namespace dbaui OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 25ed58951048..ee3e88022259 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -30,7 +30,7 @@ namespace dbaui : m_vTableRow(_rvTableRow) { } - bool OTableRowExchange::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) + bool OTableRowExchange::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& /*rFlavor*/ ) { if(nUserObjectId == SotClipboardFormatId::SBA_TABED) { diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 7022dea104a0..420a23079fab 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -60,10 +60,10 @@ namespace dbaui class OTableDesignCellUndoAct : public OTableDesignUndoAct { protected: - sal_uInt16 m_nCol; - long m_nRow; - ::com::sun::star::uno::Any m_sOldText; - ::com::sun::star::uno::Any m_sNewText; + sal_uInt16 m_nCol; + long m_nRow; + css::uno::Any m_sOldText; + css::uno::Any m_sNewText; virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 40ba3603258a..0434dea54c9d 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -39,24 +39,24 @@ namespace dbaui { protected: - explicit OAdvancedSettingsDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + explicit OAdvancedSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index fe7a24e969c6..726672a7fd2e 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -87,7 +87,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit updateFromModel(); xV->setZoom( aComponentInfos.nZoomX, aComponentInfos.nZoomY ); - setPosSize( aComponentInfos.nX, aComponentInfos.nY, aComponentInfos.nWidth, aComponentInfos.nHeight, ::com::sun::star::awt::PosSize::POSSIZE ); + setPosSize( aComponentInfos.nX, aComponentInfos.nY, aComponentInfos.nWidth, aComponentInfos.nHeight, css::awt::PosSize::POSSIZE ); Reference<XPropertySet> xProp(getModel(), UNO_QUERY); if ( xProp.is() ) @@ -125,7 +125,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit if (maPaintListeners.getLength()) xW->addPaintListener( &maPaintListeners ); - Reference< ::com::sun::star::awt::XView > xPeerView(getPeer(), UNO_QUERY); + Reference< css::awt::XView > xPeerView(getPeer(), UNO_QUERY); xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY ); xPeerView->setGraphics( xGraphics ); diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index c02622fea2b6..058767e10ff8 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -31,9 +31,9 @@ namespace dbaui class OColumnControl : public UnoControl { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference< css::uno::XComponentContext> m_xContext; public: - explicit OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext); + explicit OColumnControl(const css::uno::Reference< css::uno::XComponentContext>& rxContext); // UnoControl virtual OUString GetComponentServiceName() SAL_OVERRIDE; @@ -41,8 +41,8 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); - // ::com::sun::star::awt::XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::awt::XControl + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index ce72c992b1f5..125106f62dfa 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -122,7 +122,7 @@ Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (Ru return OColumnControlModel_BASE::queryInterface( _rType ); } -// com::sun::star::XAggregation +// css::XAggregation Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception) { Any aRet(OColumnControlModel_BASE::queryAggregation(rType)); @@ -136,12 +136,12 @@ OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException return OUString(); } -void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException, std::exception) +void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( css::io::IOException, RuntimeException, std::exception) { // TODO } -void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException, std::exception) +void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( css::io::IOException, RuntimeException, std::exception) { // TODO } diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index db2dc10c918e..ddcfd58f7590 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -35,10 +35,10 @@ namespace dbaui { // OColumnControlModel -typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - , ::com::sun::star::io::XPersistObject +typedef ::cppu::WeakAggComponentImplHelper4 < css::awt::XControlModel + , css::lang::XServiceInfo + , css::util::XCloneable + , css::io::XPersistObject > OColumnControlModel_BASE; class OColumnControlModel; @@ -49,31 +49,31 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper ,public OColumnControlModel_BASE { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB; + css::uno::Reference< css::lang::XMultiServiceFactory> m_xORB; // [properties] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; - OUString m_sDefaultControl; - ::com::sun::star::uno::Any m_aTabStop; + css::uno::Reference< css::sdbc::XConnection> m_xConnection; + css::uno::Reference< css::beans::XPropertySet > m_xColumn; + OUString m_sDefaultControl; + css::uno::Any m_aTabStop; bool m_bEnable; - sal_Int16 m_nBorder; - sal_Int32 m_nWidth; + sal_Int16 m_nBorder; + sal_Int32 m_nWidth; // [properties] - inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> getORB() const { return m_xORB; } + inline css::uno::Reference< css::lang::XMultiServiceFactory> getORB() const { return m_xORB; } void registerProperties(); protected: virtual ~OColumnControlModel(); OColumnControlModel(const OColumnControlModel* _pSource - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + ,const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory); public: - explicit OColumnControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + explicit OColumnControlModel(const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory); // UNO Anbindung DECLARE_XINTERFACE( ) -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo DECLARE_SERVICE_INFO_STATIC(); virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() @@ -81,18 +81,18 @@ public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// com::sun::star::uno::XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::uno::XAggregation + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertyArrayUsageHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 5e15a10ed344..985063f27ca2 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -29,19 +29,19 @@ namespace dbaui class OFieldDescription; class OColumnPeer : public VCLXWindow { - OFieldDescription* m_pActFieldDescr; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; + OFieldDescription* m_pActFieldDescr; + css::uno::Reference< css::beans::XPropertySet> m_xColumn; public: OColumnPeer(vcl::Window* _pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + ,const css::uno::Reference< css::uno::XComponentContext>& _rxContext); - void setColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); - void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xCon); + void setColumn(const css::uno::Reference< css::beans::XPropertySet>& _xColumn); + void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon); void setEditWidth(sal_Int32 _nWidth); // VCLXWindow - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 48217e2f09dc..e1193ab19c54 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -31,24 +31,24 @@ class ODBTypeWizDialog { protected: - explicit ODBTypeWizDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + explicit ODBTypeWizDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 2a7112678154..0ff240faad6a 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -33,24 +33,24 @@ class ODBTypeWizDialogSetup bool m_bStartTableWizard; protected: - ODBTypeWizDialogSetup(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index f3798c29b2d6..0b036fada0a7 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -31,24 +31,24 @@ class OTableFilterDialog { protected: - OTableFilterDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index f8aa793a279e..0923ffcb8ad5 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -31,24 +31,24 @@ class OUserSettingsDialog { protected: - OUserSettingsDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 7c5737d99d5f..1ee90aee432e 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -31,24 +31,24 @@ class ODataSourcePropertyDialog { protected: - ODataSourcePropertyDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index a4b29d889ecf..d60cddcd9a35 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -134,8 +134,8 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_SUPPORTS(RowsetFilterDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetFilterDialog, "com.sun.star.sdb.FilterDialog") - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL RowsetFilterDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) + css::uno::Reference< css::uno::XInterface > + SAL_CALL RowsetFilterDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB))); } @@ -150,11 +150,11 @@ namespace dbaui if( aArguments.getLength() == 3 ) { // this is the FilterDialog::createWithQuery method - Reference<com::sun::star::sdb::XSingleSelectQueryComposer> xQueryComposer; + Reference<css::sdb::XSingleSelectQueryComposer> xQueryComposer; aArguments[0] >>= xQueryComposer; - Reference<com::sun::star::sdbc::XRowSet> xRowSet; + Reference<css::sdbc::XRowSet> xRowSet; aArguments[1] >>= xRowSet; - Reference<com::sun::star::awt::XWindow> xParentWindow; + Reference<css::awt::XWindow> xParentWindow; aArguments[2] >>= xParentWindow; setPropertyValue( "QueryComposer", makeAny( xQueryComposer ) ); setPropertyValue( "RowSet", makeAny( xRowSet ) ); @@ -182,8 +182,8 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_SUPPORTS(RowsetOrderDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetOrderDialog, "com.sun.star.sdb.OrderDialog") - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL RowsetOrderDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) + css::uno::Reference< css::uno::XInterface > + SAL_CALL RowsetOrderDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB))); } @@ -197,9 +197,9 @@ namespace dbaui { if( aArguments.getLength() == 2 ) { - Reference<com::sun::star::sdb::XSingleSelectQueryComposer> xQueryComposer; + Reference<css::sdb::XSingleSelectQueryComposer> xQueryComposer; aArguments[0] >>= xQueryComposer; - Reference<com::sun::star::beans::XPropertySet> xRowSet; + Reference<css::beans::XPropertySet> xRowSet; aArguments[1] >>= xRowSet; setPropertyValue( "QueryComposer", makeAny( xQueryComposer ) ); setPropertyValue( "RowSet", makeAny( xRowSet ) ); diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 3423427d89af..df98196cefce 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -44,14 +44,14 @@ namespace dbaui OModuleClient m_aModuleClient; protected: // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > + css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // </properties> protected: - ComposerDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ComposerDialog(); public: @@ -64,8 +64,8 @@ namespace dbaui // own overridables virtual VclPtr<Dialog> createComposerDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::container::XNameAccess >& _rxColumns ) = 0; private: @@ -78,7 +78,7 @@ namespace dbaui { public: RowsetFilterDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); DECLARE_SERVICE_INFO_STATIC( ); @@ -87,14 +87,14 @@ namespace dbaui // own overridables virtual VclPtr<Dialog> createComposerDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; // OGenericUnoDialog overridables virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; - 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) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -103,7 +103,7 @@ namespace dbaui { public: RowsetOrderDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); DECLARE_SERVICE_INFO_STATIC( ); @@ -112,14 +112,14 @@ namespace dbaui // own overridables virtual VclPtr<Dialog> createComposerDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; // OGenericUnoDialog overridables virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; - 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) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 1ba693445cdc..3ba09f0409a7 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -205,7 +205,7 @@ namespace dbaui /** returns our typed dialog - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if we don't have a dialog at the moment the method is called */ OCopyTableWizard& diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 07ded2d4f208..4c5e9c3ef64c 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -45,8 +45,8 @@ namespace dbaui { // BasicInteractionHandler - typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::task::XInteractionHandler2 + typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo + , css::task::XInteractionHandler2 > BasicInteractionHandler_Base; /** implements an <type scope="com.sun.star.task">XInteractionHandler</type> for database related interaction requests. @@ -63,44 +63,44 @@ namespace dbaui :public BasicInteractionHandler_Base { const OModuleClient m_aModuleClient; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + const css::uno::Reference< css::uno::XComponentContext > m_xContext; const bool m_bFallbackToGeneric; public: BasicInteractionHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const bool i_bFallbackToGeneric ); // XInteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInteractionHandler - virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: bool - impl_handle_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_Request ); + impl_handle_throw( const css::uno::Reference< css::task::XInteractionRequest >& i_Request ); /// handle SQLExceptions (and derived classes) static void implHandle( const ::dbtools::SQLExceptionInfo& _rSqlInfo, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& _rContinuations); /// handle parameter requests void implHandle( - const ::com::sun::star::sdb::ParametersRequest& _rParamRequest, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); + const css::sdb::ParametersRequest& _rParamRequest, + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& _rContinuations); /// handle document save requests void implHandle( - const ::com::sun::star::sdb::DocumentSaveRequest& _rParamRequest, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); + const css::sdb::DocumentSaveRequest& _rParamRequest, + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& _rContinuations); /// handles requests which are not SDB-specific bool implHandleUnknown( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ); + const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ); /// known continuation types enum Continuation @@ -118,7 +118,7 @@ namespace dbaui */ static sal_Int32 getContinuation( Continuation _eCont, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& _rContinuations); }; // SQLExceptionInteractionHandler @@ -126,7 +126,7 @@ namespace dbaui { public: SQLExceptionInteractionHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, false ) { @@ -154,7 +154,7 @@ namespace dbaui { public: LegacyInteractionHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, true ) { diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 1b2dea50043c..f9c1c36b4cf7 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -57,14 +57,14 @@ namespace dbaui class OTextConnectionSettingsDialog; typedef ::cppu::ImplInheritanceHelper< ODatabaseAdministrationDialog - , ::com::sun::star::sdb::XTextConnectionSettings + , css::sdb::XTextConnectionSettings > OTextConnectionSettingsDialog_BASE; typedef ::comphelper::OPropertyArrayUsageHelper< OTextConnectionSettingsDialog > OTextConnectionSettingsDialog_PBASE; class OTextConnectionSettingsDialog :public OTextConnectionSettingsDialog_BASE ,public OTextConnectionSettingsDialog_PBASE - ,public ::cppu::WeakImplHelper< com::sun::star::sdb::XTextConnectionSettings > + ,public ::cppu::WeakImplHelper< css::sdb::XTextConnectionSettings > { OModuleClient m_aModuleClient; PropertyValues m_aPropertyValues; @@ -105,7 +105,7 @@ namespace dbaui protected: // OGenericUnoDialog overridables virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; - virtual void implInitialize( const com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE; + virtual void implInitialize( const css::uno::Any& _rValue ) SAL_OVERRIDE; protected: using OTextConnectionSettingsDialog_BASE::getFastPropertyValue; }; @@ -132,8 +132,8 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_SUPPORTS(OTextConnectionSettingsDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OTextConnectionSettingsDialog, "com.sun.star.sdb.TextConnectionSettings") - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL OTextConnectionSettingsDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) + css::uno::Reference< css::uno::XInterface > + SAL_CALL OTextConnectionSettingsDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 94b57f10f090..796e7f4d4dfc 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -70,8 +70,8 @@ namespace dbaui IMPLEMENT_SERVICE_INFO_SUPPORTS(ODirectSQLDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG) - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL ODirectSQLDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) + css::uno::Reference< css::uno::XInterface > + SAL_CALL ODirectSQLDialog::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODirectSQLDialog( comphelper::getComponentContext(_rxORB))); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index d3330170b538..1c5ff4e2f400 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -41,10 +41,10 @@ namespace dbaui ,public ODirectSQLDialog_PBASE { OModuleClient m_aModuleClient; - OUString m_sInitialSelection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; + OUString m_sInitialSelection; + css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: - ODirectSQLDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ODirectSQLDialog(); public: @@ -58,7 +58,7 @@ namespace dbaui protected: // OGenericUnoDialog overridables virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; - virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; + virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 914974d9efed..897974ca7f2d 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -85,21 +85,21 @@ OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeExceptio return aSupported; } -void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) +void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { - OUString title; - Reference< com::sun::star::awt::XWindow > parentWindow; - com::sun::star::uno::Any sqlException; - - if ((args.getLength() == 3) && (args[0] >>= title) && (args[1] >>= parentWindow) && (args[2] >>= sqlException)) { - Sequence<Any> s(3); - s[0] <<= PropertyValue( "Title", -1, makeAny(title), PropertyState_DIRECT_VALUE); - s[1] <<= PropertyValue( "ParentWindow", -1, makeAny(parentWindow), PropertyState_DIRECT_VALUE); - s[2] <<= PropertyValue( "SQLException", -1, sqlException, PropertyState_DIRECT_VALUE); - OGenericUnoDialog::initialize(s); - } else { - OGenericUnoDialog::initialize(args); - } + OUString title; + Reference< css::awt::XWindow > parentWindow; + css::uno::Any sqlException; + + if ((args.getLength() == 3) && (args[0] >>= title) && (args[1] >>= parentWindow) && (args[2] >>= sqlException)) { + Sequence<Any> s(3); + s[0] <<= PropertyValue( "Title", -1, makeAny(title), PropertyState_DIRECT_VALUE); + s[1] <<= PropertyValue( "ParentWindow", -1, makeAny(parentWindow), PropertyState_DIRECT_VALUE); + s[2] <<= PropertyValue( "SQLException", -1, sqlException, PropertyState_DIRECT_VALUE); + OGenericUnoDialog::initialize(s); + } else { + OGenericUnoDialog::initialize(args); + } } sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) |