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

2012-12-21 Thread 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 n...@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::Referenceuno::XComponentContext 
xContext ) :
 m_xContext(xContext)
 {
-m_xDesktop.set( Desktop::create(xContext) );
+m_xDesktop.set( frame::Desktop::create(xContext) );
 m_xDesktop-addTerminateListener( this );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-12-06 Thread Libreoffice Gerrit user 
 dbaccess/source/core/dataaccess/databasecontext.cxx  |2 -
 dbaccess/source/inc/stringconstants.hrc  |1 
 dbaccess/source/inc/stringconstants.inc  |1 
 dbaccess/source/ui/browser/genericcontroller.cxx |8 ++-
 dbaccess/source/ui/dlg/DbAdminImpl.cxx   |8 +--
 extensions/source/propctrlr/formcomponenthandler.cxx |   20 +++
 extensions/source/propctrlr/formstrings.hxx  |1 
 svtools/source/dialogs/addresstemplate.cxx   |3 --
 8 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit 495111b249e1ef17be96dbdfbc5a13de6d5dd5f9
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 3 11:10:46 2012 +0200

fdo#46808, use service constructor for sdb::DatabaseContext

Change-Id: I4d845f289f324912b0fc4d8e26a2947e2d2f889e

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 798262f..c4c625f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -218,7 +218,7 @@ Reference XInterface  ODatabaseContext::Create(const 
Reference XComponentCont
 Sequence rtl::OUString  
ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException 
)
 {
 Sequence ::rtl::OUString  aSNS( 1 );
-aSNS[0] = SERVICE_SDB_DATABASECONTEXT;
+aSNS[0] = com.sun.star.sdb.DatabaseContext;
 return aSNS;
 }
 
diff --git a/dbaccess/source/inc/stringconstants.hrc 
b/dbaccess/source/inc/stringconstants.hrc
index d8a9ceb..6926f60 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -355,7 +355,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET);
 DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET);
diff --git a/dbaccess/source/inc/stringconstants.inc 
b/dbaccess/source/inc/stringconstants.inc
index 9d6e79e..010fd63 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/source/inc/stringconstants.inc
@@ -193,7 +193,6 @@ 
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR, com.sun.star.sdbcx
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS, 
com.sun.star.sdb.ColumnSettings);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN, 
com.sun.star.sdb.ResultColumn);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN, 
com.sun.star.sdb.DataColumn);
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT, 
com.sun.star.sdb.DatabaseContext);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE, 
com.sun.star.sdb.DataSource);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET, 
com.sun.star.sdb.ResultSet);
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ROWSET, com.sun.star.sdb.RowSet);
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 58345e6..76df18a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -258,15 +258,13 @@ sal_Bool OGenericUnoController::Construct(Window* 
/*pParent*/)
 {
 m_xDatabaseContext = 
DatabaseContext::create(comphelper::getComponentContext(getORB()));
 }
-catch(Exception)
+catch(const Exception)
 {
 OSL_FAIL(OGenericUnoController::Construct: could not create (or start 
listening at) the database context!);
+// at least notify the user. Though the whole component does not make 
any sense without the database context ...
+ShowServiceNotAvailableError(getView(), 
String(com.sun.star.sdb.DatabaseContext), sal_True);
 }
 
-if (!m_xDatabaseContext.is())
-{   // at least notify the user. Though the whole component does not 
make any sense without the database context ...
-ShowServiceNotAvailableError(getView(), 
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
-}
 return sal_True;
 }
 
//--
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 9082417..2b5cbfe 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -210,13 +210,9 @@ 
ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
 {
 m_xDatabaseContext = 
DatabaseContext::create(comphelper::getComponentContext(m_xORB));
 }
-catch(Exception)
-{
-}
-
-if ( !m_xDatabaseContext.is() )
+catch(const Exception)
 {
-ShowServiceNotAvailableError(_pParent-GetParent(), 
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
+