vcl/generic/glyphs/gcach_layout.cxx | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 1d188294fd96a82e7200550f8950aa456a481410
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 9 15:35:24 2014 +0100
use vcl::unohelper::CreateBreakIterator consistently
Change-Id: I69eee7804ffe0b0c8ae8e8bc628bf35585f5e69c
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index ff644e3..cbf3f9c 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -27,6 +27,7 @@
#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sal/alloca.h>
#include <rtl/instance.hxx>
@@ -34,15 +35,13 @@
#include <hb-icu.h>
#include <hb-ot.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-#include <comphelper/processfactory.hxx>
// layout implementation for ServerFont
-
ServerFontLayout::ServerFontLayout( ServerFont& rFont )
: mrServerFont( rFont )
-{ }
+{
+}
void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
{
@@ -86,12 +85,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs&
rArgs, sal_Int32 nCharPos
using namespace ::com::sun::star;
if (!mxBreak.is())
- {
- uno::Reference< lang::XMultiServiceFactory > xFactory =
- comphelper::getProcessServiceFactory();
- mxBreak = uno::Reference< i18n::XBreakIterator
>(xFactory->createInstance(
- "com.sun.star.i18n.BreakIterator"), uno::UNO_QUERY);
- }
+ mxBreak = vcl::unohelper::CreateBreakIterator();
lang::Locale aLocale(rArgs.maLanguageTag.getLocale());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
