fdo#46808, Use BreakIterator ::create method

Change-Id: Iff603ebe772cfcd34ed3669ce46bc9112ba902ae

3 files changed, 15 insertions, 21 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8322f90aa879..bf42a4ece481 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -141,6 +141,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection
 	ObjectInspectorModel \
 	StringRepresentation \
 ))
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
+	BreakIterator \
+))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
 	LanguageGuessing \
 	Proofreader \
@@ -822,7 +825,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic
 	MediaProperties \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
-	BreakIterator \
 	ChapterCollator \
 	CharacterClassification \
 	Collator \
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index c7a33f111ed8..ce60a1a3dda3 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -52,7 +52,6 @@ namespace com { namespace sun { namespace star { namespace lang {
     struct Locale;
     struct EventObject;
     struct ChangesEvent;
-    class XMultiServiceFactory;
 } } } }
 
 namespace com { namespace sun { namespace star { namespace beans {
@@ -92,7 +91,6 @@ private:
     std::set< rtl::OUString > maDisabledSmartTagTypes;
     std::multimap < rtl::OUString, ActionReference > maSmartTagMap;
     mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext;
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxConfigurationSettings;
     bool mbLabelTextWithSmartTags;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 52355947de5c..6fcbcb8dd8d4 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <com/sun/star/text/XTextMarkup.hpp>
 #include <com/sun/star/smarttags/SmartTagRecognizerMode.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -45,6 +45,7 @@
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
+using namespace com::sun::star::i18n;
 
 #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
 
@@ -55,7 +56,7 @@ SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName )
       maActionList(),
       maDisabledSmartTagTypes(),
       maSmartTagMap(),
-      mxMSF( ::comphelper::getProcessServiceFactory() ),
+      mxContext( ::comphelper::getProcessComponentContext() ),
       mbLabelTextWithSmartTags(true)
 {
 }
@@ -67,27 +68,20 @@ SmartTagMgr::~SmartTagMgr()
 void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName )
 {
     // get component context to pass to components:
-    if ( mxMSF.is() )
+    if ( mxContext.is() )
     {
-        Reference< beans::XPropertySet > xPropSet = Reference< beans::XPropertySet>( mxMSF, UNO_QUERY);
-        const Any aAny = xPropSet->getPropertyValue( C2U("DefaultContext"));
-        aAny >>= mxContext;
-
-        if ( mxContext.is() )
-        {
-            PrepareConfiguration( rConfigurationGroupName );
-            ReadConfiguration( true, true );
-            RegisterListener();
-            LoadLibraries();
-        }
+        PrepareConfiguration( rConfigurationGroupName );
+        ReadConfiguration( true, true );
+        RegisterListener();
+        LoadLibraries();
     }
 }
 void SmartTagMgr::CreateBreakIterator() const
 {
-    if ( !mxBreakIter.is() && mxMSF.is() && mxContext.is() )
+    if ( !mxBreakIter.is() && mxContext.is() )
     {
         // get the break iterator
-        mxBreakIter.set(mxMSF->createInstance( C2U( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY);
+        mxBreakIter.set( BreakIterator::create(mxContext) );
     }
 }
 
@@ -316,7 +310,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run
 */
 void SmartTagMgr::LoadLibraries()
 {
-    Reference< container::XContentEnumerationAccess > rContent( mxMSF , UNO_QUERY );
+    Reference< container::XContentEnumerationAccess > rContent( mxContext , UNO_QUERY );
     if ( !rContent.is() )
         return;
 
@@ -388,7 +382,7 @@ void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroup
     aPathArgument.Value = aAny;
     Sequence< Any > aArguments( 1 );
     aArguments[ 0 ] <<= aPathArgument;
-    Reference< lang::XMultiServiceFactory > xConfProv( mxMSF->createInstance(C2U ("com.sun.star.configuration.ConfigurationProvider")), UNO_QUERY );
+    Reference< lang::XMultiServiceFactory > xConfProv( mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.configuration.ConfigurationProvider", mxContext), UNO_QUERY );
 
     if ( !xConfProv.is() )
         return;