diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-15 15:20:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-23 15:27:49 +0200 |
| commit | c0f865c9b5a34b272c9e0b22d18969554265914a (patch) | |
| tree | ee4bc2c0579245e92f51c82d91136e32cce7c9ca /sc | |
| parent | com.sun.star.xml.NamespaceContainer appears to be unused (diff) | |
| download | core-c0f865c9b5a34b272c9e0b22d18969554265914a.tar.gz core-c0f865c9b5a34b272c9e0b22d18969554265914a.zip | |
fdo#46808, use service constructor for i18n::BreakIterator
Note that I found a pre-existing bug in linguistic/source/gciterator.cxx
but I was not able to fix it, because doing so appears to expose
bugs elsewhere!
Change-Id: I17fb9108d98a98d0ae13fe5a8e043d2db5b27a6a
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/documen6.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 544950fd7181..4b14697a8c33 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -29,9 +29,10 @@ #include "scitems.hxx" #include <editeng/scripttypeitem.hxx> -#include <com/sun/star/i18n/XBreakIterator.hpp> +#include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/processfactory.hxx> #include "document.hxx" #include "cell.hxx" @@ -43,8 +44,6 @@ using namespace com::sun::star; -#define SC_BREAKITER_SERVICE "com.sun.star.i18n.BreakIterator" - // // this file is compiled with exceptions enabled // put functions here that need exceptions! @@ -58,10 +57,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() pScriptTypeData = new ScScriptTypeData; if ( !pScriptTypeData->xBreakIter.is() ) { - uno::Reference< uno::XInterface > xInterface = xServiceManager->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_BREAKITER_SERVICE )) ); - pScriptTypeData->xBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY ); - OSL_ENSURE( pScriptTypeData->xBreakIter.is(), "can't get BreakIterator" ); + pScriptTypeData->xBreakIter = i18n::BreakIterator::create( comphelper::getComponentContext(xServiceManager) ); } return pScriptTypeData->xBreakIter; } |