Kaydet (Commit) 59a601d1 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in include/dbaccess

Change-Id: I90202b5a537cb64f4ddae3141e19270a93c5b6e0
Reviewed-on: https://gerrit.libreoffice.org/19487Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 08233bd2
...@@ -44,25 +44,25 @@ namespace dbaui ...@@ -44,25 +44,25 @@ namespace dbaui
/** executes the given command without checking if it is allowed /** executes the given command without checking if it is allowed
@param _rCommand the URL of the command @param _rCommand the URL of the command
*/ */
virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; virtual void executeUnChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) = 0;
/** executes the given command only when it is allowed /** executes the given command only when it is allowed
@param _rCommand @param _rCommand
the URL of the command the URL of the command
*/ */
virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; virtual void executeChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) = 0;
/** executes the given command without checking if it is allowed /** executes the given command without checking if it is allowed
@param _nCommandId @param _nCommandId
the id of the command URL the id of the command URL
*/ */
virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) = 0;
/** executes the given command only when it is allowed /** executes the given command only when it is allowed
@param _nCommandId @param _nCommandId
the id of the command URL the id of the command URL
*/ */
virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) = 0;
/** checks if the given Command is enabled /** checks if the given Command is enabled
...@@ -114,8 +114,8 @@ namespace dbaui ...@@ -114,8 +114,8 @@ namespace dbaui
This must be the same model as returned by XController::getModel, and might be <NULL/> when This must be the same model as returned by XController::getModel, and might be <NULL/> when
the controller does not have an own model. the controller does not have an own model.
*/ */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > virtual css::uno::Reference< css::frame::XController >
getXController() throw( ::com::sun::star::uno::RuntimeException ) = 0; getXController() throw( css::uno::RuntimeException ) = 0;
/** allows interception of user input, aka mouse clicks and key events /** allows interception of user input, aka mouse clicks and key events
*/ */
......
...@@ -46,13 +46,13 @@ namespace dbaui ...@@ -46,13 +46,13 @@ namespace dbaui
~ControllerFrame(); ~ControllerFrame();
/// attaches a new frame /// attaches a new frame
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& const css::uno::Reference< css::frame::XFrame >&
attachFrame( attachFrame(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame const css::uno::Reference< css::frame::XFrame >& _rxFrame
); );
// retrieves the current frame // retrieves the current frame
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& const css::uno::Reference< css::frame::XFrame >&
getFrame() const; getFrame() const;
/** determines whether the frame is currently active /** determines whether the frame is currently active
...@@ -61,7 +61,7 @@ namespace dbaui ...@@ -61,7 +61,7 @@ namespace dbaui
/** notifies the instance that a certain frame action happened with our frame /** notifies the instance that a certain frame action happened with our frame
*/ */
void frameAction( ::com::sun::star::frame::FrameAction _eAction ); void frameAction( css::frame::FrameAction _eAction );
private: private:
::std::unique_ptr< ControllerFrame_Data > m_pData; ::std::unique_ptr< ControllerFrame_Data > m_pData;
......
...@@ -34,7 +34,7 @@ namespace dbaui ...@@ -34,7 +34,7 @@ namespace dbaui
class IController; class IController;
class DBACCESS_DLLPUBLIC ODataView : public vcl::Window class DBACCESS_DLLPUBLIC ODataView : public vcl::Window
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; // the service factory to work with css::uno::Reference< css::uno::XComponentContext > m_xContext; // the service factory to work with
protected: protected:
rtl::Reference<IController> m_xController; // the controller in where we resides in rtl::Reference<IController> m_xController; // the controller in where we resides in
...@@ -44,7 +44,7 @@ namespace dbaui ...@@ -44,7 +44,7 @@ namespace dbaui
public: public:
ODataView( vcl::Window* pParent, ODataView( vcl::Window* pParent,
IController& _rController, IController& _rController,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& , const css::uno::Reference< css::uno::XComponentContext >& ,
WinBits nStyle = 0 ); WinBits nStyle = 0 );
virtual ~ODataView(); virtual ~ODataView();
virtual void dispose() override; virtual void dispose() override;
...@@ -60,12 +60,12 @@ namespace dbaui ...@@ -60,12 +60,12 @@ namespace dbaui
inline IController& getCommandController() const { return *m_xController.get(); } inline IController& getCommandController() const { return *m_xController.get(); }
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() { return m_xContext;} css::uno::Reference< css::uno::XComponentContext > getORB() { return m_xContext;}
// the default implementation simply calls resizeAll( GetSizePixel() ) // the default implementation simply calls resizeAll( GetSizePixel() )
virtual void Resize() override; virtual void Resize() override;
void attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); void attachFrame(const css::uno::Reference< css::frame::XFrame >& _xFrame);
protected: protected:
// window overridables // window overridables
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) override;
......
...@@ -39,7 +39,7 @@ namespace dbaui ...@@ -39,7 +39,7 @@ namespace dbaui
//= UndoManager //= UndoManager
struct UndoManager_Impl; struct UndoManager_Impl;
typedef ::cppu::ImplHelper1< ::com::sun::star::document::XUndoManager > UndoManager_Base; typedef ::cppu::ImplHelper1< css::document::XUndoManager > UndoManager_Base;
class DBACCESS_DLLPUBLIC UndoManager : public UndoManager_Base class DBACCESS_DLLPUBLIC UndoManager : public UndoManager_Base
{ {
public: public:
...@@ -56,32 +56,32 @@ namespace dbaui ...@@ -56,32 +56,32 @@ namespace dbaui
void disposing(); void disposing();
// XUndoManager // XUndoManager
virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enterHiddenUndoContext( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL leaveUndoContext( ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL undo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL redo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isUndoPossible( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clear( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearRedo( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
// XLockable (base of XUndoManager) // XLockable (base of XUndoManager)
virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unlock( ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override;
// XChild (base of XUndoManager) // XChild (base of XUndoManager)
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
private: private:
std::unique_ptr< UndoManager_Impl > m_xImpl; std::unique_ptr< UndoManager_Impl > m_xImpl;
......
...@@ -48,8 +48,8 @@ namespace dbaui ...@@ -48,8 +48,8 @@ namespace dbaui
class DBSubComponentController; class DBSubComponentController;
typedef ::cppu::ImplInheritanceHelper< OGenericUnoController typedef ::cppu::ImplInheritanceHelper< OGenericUnoController
, ::com::sun::star::document::XScriptInvocationContext , css::document::XScriptInvocationContext
, ::com::sun::star::util::XModifiable , css::util::XModifiable
> DBSubComponentController_Base; > DBSubComponentController_Base;
struct DBSubComponentController_Impl; struct DBSubComponentController_Impl;
...@@ -62,16 +62,16 @@ namespace dbaui ...@@ -62,16 +62,16 @@ namespace dbaui
/** forces usage of a connection which we do not own /** forces usage of a connection which we do not own
<p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p> <p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p>
*/ */
void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); void initializeConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxForeignConn );
protected: protected:
// OGenericUnoController - initialization // OGenericUnoController - initialization
virtual void impl_initialize() override; virtual void impl_initialize() override;
// OGenericUnoController // OGenericUnoController
virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) override; virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const override; virtual css::uno::Reference< css::frame::XModel > getPrivateModel() const override;
bool impl_isModified() const; bool impl_isModified() const;
virtual void impl_onModifyChanged(); virtual void impl_onModifyChanged();
...@@ -87,17 +87,17 @@ namespace dbaui ...@@ -87,17 +87,17 @@ namespace dbaui
bool isConnected() const; bool isConnected() const;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > css::uno::Reference< css::sdbc::XDatabaseMetaData >
getMetaData( ) const; getMetaData( ) const;
// access to the data source / document // access to the data source / document
OUString getDataSourceName() const; OUString getDataSourceName() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& const css::uno::Reference< css::beans::XPropertySet >&
getDataSource() const; getDataSource() const;
bool haveDataSource() const; bool haveDataSource() const;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > css::uno::Reference< css::frame::XModel >
getDatabaseDocument() const; getDatabaseDocument() const;
/** provides access to the SDB-level database meta data of the current connection /** provides access to the SDB-level database meta data of the current connection
...@@ -137,33 +137,33 @@ namespace dbaui ...@@ -137,33 +137,33 @@ namespace dbaui
@return @return
the currently used connection. the currently used connection.
*/ */
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& const css::uno::Reference< css::sdbc::XConnection >&
getConnection() const; getConnection() const;
/** returns the number formatter /** returns the number formatter
*/ */
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; css::uno::Reference< css::util::XNumberFormatter > getNumberFormatter() const;
// ::com::sun::star::frame::XController // css::frame::XController
virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override;
// XScriptInvocationContext // XScriptInvocationContext
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
// XModifiable // XModifiable
virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
// XModifyBroadcaster // XModifyBroadcaster
virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// XTitle // XTitle
virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) override;
protected: protected:
DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); DBSubComponentController(const css::uno::Reference< css::uno::XComponentContext>& _rxORB);
virtual ~DBSubComponentController(); virtual ~DBSubComponentController();
void disconnect(); void disconnect();
...@@ -177,16 +177,16 @@ namespace dbaui ...@@ -177,16 +177,16 @@ namespace dbaui
protected: protected:
// XEventListener // XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
// OComponentHelper // OComponentHelper
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
// XInterface // XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override;
protected: protected:
sal_Int32 getCurrentStartNumber() const; sal_Int32 getCurrentStartNumber() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment