diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-04 15:11:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-09 08:08:18 +0200 |
| commit | 0b6a0657491fdd126541018ac32810f80698ebd0 (patch) | |
| tree | 8f26a27d7b2230778866d7514ed4af393d034485 /dbaccess | |
| parent | b23fd68eeeddd6973f5ea79da4cf7638094ad8d4 (diff) | |
fdo#46808, use service constructor for i18n::Collator
Change-Id: I95d2a458ad05c9a248ceb3ca11cb41339cd5d395
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/inc/stringconstants.hrc | 1 | ||||
| -rw-r--r-- | dbaccess/source/inc/stringconstants.inc | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/tablespage.cxx | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 902eba94abc4..1eab01f02c40 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -372,7 +372,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_QUERIES); DECLARE_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER); DECLARE_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP); DECLARE_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER); -DECLARE_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_TABLEDEFINITION); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COMMAND_DEFINITION); DECLARE_CONSTASCII_USTRING(SERVICE_NAME_FORM); diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc index 50be6eceb979..37627a0a5159 100644 --- a/dbaccess/source/inc/stringconstants.inc +++ b/dbaccess/source/inc/stringconstants.inc @@ -208,7 +208,6 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_TABLES, "com.sun.star.sdbcx.Tables"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERIES, "com.sun.star.sdb.Queries"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_INDEXCOLUMN, "com.sun.star.sdbcx.IndexColumn"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN, "com.sun.star.sdbcx.KeyColumn"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR, "com.sun.star.i18n.Collator"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_TABLEDEFINITION, "com.sun.star.sdb.TableDefinition"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COMMAND_DEFINITION, "com.sun.star.sdb.CommandDefinition"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DOCUMENTDEFINITION, "com.sun.star.sdb.DocumentDefinition"); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 14a16399be80..220596bbb682 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -33,6 +33,7 @@ #include "dbustrings.hrc" #include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> +#include <com/sun/star/i18n/Collator.hpp> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> @@ -271,9 +272,8 @@ DBG_NAME(OTableSubscriptionPage) // the collator for the string compares try { - m_xCollator = Reference< XCollator >(m_xORB->getServiceManager()->createInstanceWithContext(SERVICE_I18N_COLLATOR, m_xORB), UNO_QUERY); - if (m_xCollator.is()) - m_xCollator->loadDefaultCollator(Application::GetSettings().GetLanguageTag().getLocale(), 0); + m_xCollator = Collator::create(m_xORB); + m_xCollator->loadDefaultCollator(Application::GetSettings().GetLanguageTag().getLocale(), 0); } catch(const Exception&) { |