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

2 files changed, 37 insertions, 39 deletions

diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 1c6fca4b8200..68ebc91d9add 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <drawinglayer/primitive2d/texteffectprimitive2d.hxx>
 #include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/BreakIterator.hpp>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
@@ -206,11 +206,11 @@ namespace drawinglayer
 
             if(!xLocalBreakIterator.is())
             {
-                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
-                xLocalBreakIterator.set(xMSF->createInstance("com.sun.star.i18n.BreakIterator"), ::com::sun::star::uno::UNO_QUERY);
+                ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext(::comphelper::getProcessComponentContext());
+                xLocalBreakIterator = com::sun::star::i18n::BreakIterator::create(xContext);
             }
 
-            if(xLocalBreakIterator.is() && getTextLength())
+            if( getTextLength() )
             {
                 // init word iterator, get first word and truncate to possibilities
                 ::com::sun::star::i18n::Boundary aNextWordBoundary(xLocalBreakIterator->getWordBoundary(
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 5f7d8e75c8fb..1ccfc5f9aa6c 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -56,6 +56,7 @@
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustring.hxx>
+#include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <drawinglayer/primitive2d/controlprimitive2d.hxx>
@@ -1097,46 +1098,43 @@ namespace drawinglayer
                         // support for TEXT_ MetaFile actions only for decorated texts
                         if(!mxBreakIterator.is())
                         {
-                            uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
-                            mxBreakIterator.set(xMSF->createInstance("com.sun.star.i18n.BreakIterator"), uno::UNO_QUERY);
+                            uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
+                            mxBreakIterator = i18n::BreakIterator::create(xContext);
                         }
 
-                        if(mxBreakIterator.is())
-                        {
-                            const rtl::OUString& rTxt = rTextCandidate.getText();
-                            const sal_Int32 nTextLength(rTextCandidate.getTextLength()); // rTxt.getLength());
+                        const rtl::OUString& rTxt = rTextCandidate.getText();
+                        const sal_Int32 nTextLength(rTextCandidate.getTextLength()); // rTxt.getLength());
 
-                            if(nTextLength)
+                        if(nTextLength)
+                        {
+                            const ::com::sun::star::lang::Locale& rLocale = rTextCandidate.getLocale();
+                            const sal_Int32 nTextPosition(rTextCandidate.getTextPosition());
+
+                            sal_Int32 nDone;
+                            sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
+                            ::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True));
+                            sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
+                            const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+                            const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
+                            const rtl::OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
+
+                            for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
                             {
-                                const ::com::sun::star::lang::Locale& rLocale = rTextCandidate.getLocale();
-                                const sal_Int32 nTextPosition(rTextCandidate.getTextPosition());
-
-                                sal_Int32 nDone;
-                                sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
-                                ::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True));
-                                sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
-                                const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
-                                const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
-                                const rtl::OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
-
-                                for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
+                                // create the entries for the respective break positions
+                                if(i == nNextCellBreak)
+                                {
+                                    mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA, i - nTextPosition));
+                                    nNextCellBreak = mxBreakIterator->nextCharacters(rTxt, i, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
+                                }
+                                if(i == nNextWordBoundary.endPos)
+                                {
+                                    mpMetaFile->AddAction(new MetaCommentAction(aCommentStringB, i - nTextPosition));
+                                    nNextWordBoundary = mxBreakIterator->getWordBoundary(rTxt, i + 1, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True);
+                                }
+                                if(i == nNextSentenceBreak)
                                 {
-                                    // create the entries for the respective break positions
-                                    if(i == nNextCellBreak)
-                                    {
-                                        mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA, i - nTextPosition));
-                                        nNextCellBreak = mxBreakIterator->nextCharacters(rTxt, i, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
-                                    }
-                                    if(i == nNextWordBoundary.endPos)
-                                    {
-                                        mpMetaFile->AddAction(new MetaCommentAction(aCommentStringB, i - nTextPosition));
-                                        nNextWordBoundary = mxBreakIterator->getWordBoundary(rTxt, i + 1, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True);
-                                    }
-                                    if(i == nNextSentenceBreak)
-                                    {
-                                        mpMetaFile->AddAction(new MetaCommentAction(aCommentStringC, i - nTextPosition));
-                                        nNextSentenceBreak = mxBreakIterator->endOfSentence(rTxt, i + 1, rLocale);
-                                    }
+                                    mpMetaFile->AddAction(new MetaCommentAction(aCommentStringC, i - nTextPosition));
+                                    nNextSentenceBreak = mxBreakIterator->endOfSentence(rTxt, i + 1, rLocale);
                                 }
                             }
                         }