Kaydet (Commit) 1d188294 authored tarafından Caolán McNamara's avatar Caolán McNamara

use vcl::unohelper::CreateBreakIterator consistently

Change-Id: I69eee7804ffe0b0c8ae8e8bc628bf35585f5e69c
üst c149c6cc
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <sal/alloca.h> #include <sal/alloca.h>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
...@@ -34,15 +35,13 @@ ...@@ -34,15 +35,13 @@
#include <hb-icu.h> #include <hb-icu.h>
#include <hb-ot.h> #include <hb-ot.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <comphelper/processfactory.hxx>
// layout implementation for ServerFont // layout implementation for ServerFont
ServerFontLayout::ServerFontLayout( ServerFont& rFont ) ServerFontLayout::ServerFontLayout( ServerFont& rFont )
: mrServerFont( rFont ) : mrServerFont( rFont )
{ } {
}
void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
{ {
...@@ -86,12 +85,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos ...@@ -86,12 +85,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos
using namespace ::com::sun::star; using namespace ::com::sun::star;
if (!mxBreak.is()) if (!mxBreak.is())
{ mxBreak = vcl::unohelper::CreateBreakIterator();
uno::Reference< lang::XMultiServiceFactory > xFactory =
comphelper::getProcessServiceFactory();
mxBreak = uno::Reference< i18n::XBreakIterator >(xFactory->createInstance(
"com.sun.star.i18n.BreakIterator"), uno::UNO_QUERY);
}
lang::Locale aLocale(rArgs.maLanguageTag.getLocale()); lang::Locale aLocale(rArgs.maLanguageTag.getLocale());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment