[Libreoffice-commits] .: dbaccess/source extensions/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/uno/composerdialogs.cxx        |    3 +--
 dbaccess/source/ui/uno/composerdialogs.hxx        |    2 +-
 extensions/source/update/check/updatecheck.cxx    |    2 +-
 extensions/source/update/check/updatecheckjob.cxx |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 40e526e497cb449441149062f9cec4e6f823732c
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Dec 21 11:09:51 2012 +0200

    Fixes for my UNO commits
    
    - fix missing SAL_CALL annotations
    - fix missing namespace usage
    
    Change-Id: I8fa462bcbeaad63ad6a73cba68236b74bbe97e70

diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index d3bad7a..99645b4 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 9a718c0..8dc83d0 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 3deb846..540b98e 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 62913cf..1d33c7b 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 );
 }