Skip to content

C
core
Kaydet (Commit) 59a601d1 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 61 deletions
include/dbaccess/IController.hxx
Dosyayı görüntüle @ 59a601d1
......@@ -44,25 +44,25 @@ namespace dbaui
/** executes the given command without checking if it is allowed
@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
@param _rCommand
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
@param _nCommandId
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
@param _nCommandId
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
......@@ -114,8 +114,8 @@ namespace dbaui
This must be the same model as returned by XController::getModel, and might be <NULL/> when
the controller does not have an own model.
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
getXController() throw( ::com::sun::star::uno::RuntimeException ) = 0;
virtual css::uno::Reference< css::frame::XController >
getXController() throw( css::uno::RuntimeException ) = 0;
/** allows interception of user input, aka mouse clicks and key events
*/
......
include/dbaccess/controllerframe.hxx
Dosyayı görüntüle @ 59a601d1
......@@ -46,13 +46,13 @@ namespace dbaui
~ControllerFrame();
/// attaches a new frame
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
const css::uno::Reference< css::frame::XFrame >&
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
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
const css::uno::Reference< css::frame::XFrame >&
getFrame() const;
/** determines whether the frame is currently active
......@@ -61,7 +61,7 @@ namespace dbaui
/** 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:
::std::unique_ptr< ControllerFrame_Data > m_pData;
......
include/dbaccess/dataview.hxx
Dosyayı görüntüle @ 59a601d1
......@@ -34,7 +34,7 @@ namespace dbaui
class IController;
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:
rtl::Reference<IController> m_xController; // the controller in where we resides in
......@@ -44,7 +44,7 @@ namespace dbaui
public:
ODataView( vcl::Window* pParent,
IController& _rController,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,
const css::uno::Reference< css::uno::XComponentContext >& ,
WinBits nStyle = 0 );
virtual ~ODataView();
virtual void dispose() override;
......@@ -60,12 +60,12 @@ namespace dbaui
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() )
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:
// window overridables
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) override;
......
include/dbaccess/dbaundomanager.hxx
Dosyayı görüntüle @ 59a601d1
......@@ -39,7 +39,7 @@ namespace dbaui
//= UndoManager
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
{
public:
......@@ -56,32 +56,32 @@ namespace dbaui
void disposing();
// XUndoManager
virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::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 leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::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 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 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 sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::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 getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::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 clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL reset( ) throw (::com::sun::star::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 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 enterUndoContext( const OUString& i_title ) throw (css::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 (css::util::InvalidStateException, css::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 (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::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 (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::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 (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::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 (css::document::UndoContextNotClosedException, css::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 (css::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 css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
// XLockable (base of XUndoManager)
virtual void SAL_CALL lock( ) throw (::com::sun::star::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 sal_Bool SAL_CALL isLocked( ) 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 (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override;
// 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 void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
private:
std::unique_ptr< UndoManager_Impl > m_xImpl;
......
include/dbaccess/dbsubcomponentcontroller.hxx
Dosyayı görüntüle @ 59a601d1
......@@ -48,8 +48,8 @@ namespace dbaui
class DBSubComponentController;
typedef ::cppu::ImplInheritanceHelper< OGenericUnoController
, ::com::sun::star::document::XScriptInvocationContext
, ::com::sun::star::util::XModifiable
, css::document::XScriptInvocationContext
, css::util::XModifiable
> DBSubComponentController_Base;
struct DBSubComponentController_Impl;
......@@ -62,16 +62,16 @@ namespace dbaui
/** forces usage of a connection which we do not own
<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:
// OGenericUnoController - initialization
virtual void impl_initialize() override;
// 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;
virtual void impl_onModifyChanged();
......@@ -87,17 +87,17 @@ namespace dbaui
bool isConnected() const;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >
getMetaData( ) const;
css::uno::Reference< css::sdbc::XDatabaseMetaData >
getMetaData( ) const;
// access to the data source / document
OUString getDataSourceName() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
const css::uno::Reference< css::beans::XPropertySet >&
getDataSource() const;
bool haveDataSource() const;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
css::uno::Reference< css::frame::XModel >
getDatabaseDocument() const;
/** provides access to the SDB-level database meta data of the current connection
......@@ -137,33 +137,33 @@ namespace dbaui
@return
the currently used connection.
*/
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
const css::uno::Reference< css::sdbc::XConnection >&
getConnection() const;
/** 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
virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::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;
// css::frame::XController
virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::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
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
virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::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 sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// 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:
DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB);
DBSubComponentController(const css::uno::Reference< css::uno::XComponentContext>& _rxORB);
virtual ~DBSubComponentController();
void disconnect();
......@@ -177,16 +177,16 @@ namespace dbaui
protected:
// 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
virtual void SAL_CALL disposing() override;
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
// 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:
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