diff options
author | Noel Grandin <noel@peralex.com> | 2012-12-21 11:09:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2012-12-21 11:09:51 +0200 |
commit | 40e526e497cb449441149062f9cec4e6f823732c (patch) | |
tree | 47b032b22a22d4889739fc692d95975bc4846f33 | |
parent | bb121c864cc3c101ef733a4088c7ba3e36eced14 (diff) |
Fixes for my UNO commits
- fix missing SAL_CALL annotations
- fix missing namespace usage
Change-Id: I8fa462bcbeaad63ad6a73cba68236b74bbe97e70
-rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.hxx | 2 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheckjob.cxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index d3bad7a193fe..99645b4ed8a1 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -149,8 +149,7 @@ namespace dbaui return new DlgFilterCrit( _pParent, m_aContext.getUNOContext(), _rxConnection, m_xComposer, _rxColumns ); } - void RowsetFilterDialog::initialize( const Sequence< Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) + void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { if( aArguments.getLength() == 3 ) { diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 9a718c06991e..8dc83d00d326 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -98,7 +98,7 @@ namespace dbaui // OGenericUnoDialog overridables virtual void executedDialog( sal_Int16 _nExecutionResult ); - virtual void initialize( const ::com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) + 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); }; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 3deb8461980f..540b98ee8045 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -724,7 +724,7 @@ ShutdownThread::run() xQuickStarter->setFastPropertyValue(0, uno::makeAny(false)); // Shutdown the office - uno::Reference< frame::XDesktop2 > xDesktop = Desktop::create(m_xContext); + uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext); xDesktop->terminate(); } diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 62913cfd467c..1d33c7be2b6e 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -152,7 +152,7 @@ void InitUpdateCheckJobThread::setTerminating() { UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) : m_xContext(xContext) { - m_xDesktop.set( Desktop::create(xContext) ); + m_xDesktop.set( frame::Desktop::create(xContext) ); m_xDesktop->addTerminateListener( this ); } |