diff options
| -rw-r--r-- | linguistic/inc/linguistic/misc.hxx | 1 | ||||
| -rw-r--r-- | linguistic/source/gciterator.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 8 | ||||
| -rw-r--r-- | offapi/com/sun/star/linguistic2/ProofreadingIterator.idl | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/docnew.cxx | 21 | ||||
| -rw-r--r-- | sw/source/ui/uno/dlelstnr.cxx | 6 |
6 files changed, 15 insertions, 25 deletions
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index aa6a3223918a..c7f91105d3fb 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -53,7 +53,6 @@ class LocaleDataWrapper; #define SN_GRAMMARCHECKER "com.sun.star.linguistic2.Proofreader" -#define SN_GRAMMARCHECKINGITERATOR "com.sun.star.linguistic2.ProofreadingIterator" #define SN_SPELLCHECKER "com.sun.star.linguistic2.SpellChecker" #define SN_HYPHENATOR "com.sun.star.linguistic2.Hyphenator" #define SN_THESAURUS "com.sun.star.linguistic2.Thesaurus" diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 792d406a3e84..aa35465364e3 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1126,7 +1126,7 @@ static OUString GrammarCheckingIterator_getImplementationName() throw() static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = SN_GRAMMARCHECKINGITERATOR ; + aSNS[0] = "com.sun.star.linguistic2.ProofreadingIterator"; return aSNS; } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index a41fe51224bf..63f456457b44 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/linguistic2/XSupportedLocales.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp> +#include <com/sun/star/linguistic2/ProofreadingIterator.hpp> #include <tools/solar.h> #include <unotools/lingucfg.hxx> @@ -1010,12 +1011,9 @@ void LngSvcMgr::GetGrammarCheckerDsp_Impl( sal_Bool bSetSvcList ) uno::Reference< linguistic2::XProofreadingIterator > xGCI; try { - uno::Reference< lang::XMultiServiceFactory > xMgr( - comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - xGCI = uno::Reference< linguistic2::XProofreadingIterator >( - xMgr->createInstance( SN_GRAMMARCHECKINGITERATOR ), uno::UNO_QUERY_THROW ); + xGCI = linguistic2::ProofreadingIterator::create( comphelper::getProcessComponentContext() ); } - catch (uno::Exception &) + catch (const uno::Exception &) { } DBG_ASSERT( xGCI.is(), "instantiating grammar checking iterator failed" ); diff --git a/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl index 999c072a2a92..7915dd8039af 100644 --- a/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl +++ b/offapi/com/sun/star/linguistic2/ProofreadingIterator.idl @@ -37,7 +37,7 @@ module com { module sun { module star { module linguistic2 { @since OOo 3.0.1 */ -service ProofreadingIterator : XProofreadingIterator {}; +service ProofreadingIterator : XProofreadingIterator; }; }; }; }; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 1ccc474a7385..7ffacc346c34 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/linguistic2/XProofreadingIterator.hpp> +#include <com/sun/star/linguistic2/ProofreadingIterator.hpp> #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp> #include <comphelper/processfactory.hxx> @@ -119,19 +119,14 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage"; { if (!m_xGCIterator.is() && SvtLinguConfig().HasGrammarChecker()) { - uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); - if (xMgr.is()) + uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); + try { - try - { - OUString aServiceName("com.sun.star.linguistic2.ProofreadingIterator"); - m_xGCIterator = uno::Reference< linguistic2::XProofreadingIterator > - ( xMgr->createInstance( aServiceName ), uno::UNO_QUERY_THROW ); - } - catch (uno::Exception &) - { - OSL_FAIL( "No GCIterator" ); - } + m_xGCIterator = linguistic2::ProofreadingIterator::create( xContext ); + } + catch (const uno::Exception &) + { + OSL_FAIL( "No GCIterator" ); } } diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 31572d9e8c24..93345da0889f 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/linguistic2/XDictionaryList.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> -#include <com/sun/star/linguistic2/XProofreadingIterator.hpp> +#include <com/sun/star/linguistic2/ProofreadingIterator.hpp> #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp> #include <unotools/lingucfg.hxx> @@ -48,7 +48,6 @@ using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags; SwLinguServiceEventListener::SwLinguServiceEventListener() { - Reference< XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); try { @@ -60,8 +59,7 @@ SwLinguServiceEventListener::SwLinguServiceEventListener() if (SvtLinguConfig().HasGrammarChecker()) { - OUString aSvcName( "com.sun.star.linguistic2.ProofreadingIterator" ); - xGCIterator = Reference< XProofreadingIterator >( xMgr->createInstance( aSvcName ), UNO_QUERY ); + xGCIterator = ProofreadingIterator::create(xContext); Reference< XLinguServiceEventBroadcaster > xBC( xGCIterator, UNO_QUERY ); if (xBC.is()) xBC->addLinguServiceEventListener( (XLinguServiceEventListener *) this ); |