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/app | |
parent | 5edd744d1021b41f59528a6e3a8adebfe63e6b6e (diff) |
com::sun::star->css in dbaccess
Change-Id: I4fbdd3fb7d1e0ad4423148aaaed3a15aebb26d14
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 32 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.hxx | 18 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 22 | ||||
-rw-r--r-- | dbaccess/source/ui/app/IApplicationController.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/subcomponentmanager.hxx | 14 |
9 files changed, 50 insertions, 50 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 ); |