From 0c8634317979af80a32be729ed169229e8ecff99 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 23 Oct 2015 13:23:17 +0200 Subject: com::sun::star->css in linguistic Change-Id: I3708931dd96d83d1daa332e930e291c3d6cfd73b --- linguistic/inc/iprcache.hxx | 17 +++--- linguistic/source/convdic.hxx | 48 ++++++++-------- linguistic/source/convdiclist.cxx | 25 ++++----- linguistic/source/convdiclist.hxx | 34 ++++++------ linguistic/source/convdicxml.cxx | 4 +- linguistic/source/convdicxml.hxx | 10 ++-- linguistic/source/dicimp.hxx | 112 +++++++++++++++++--------------------- linguistic/source/dlistimp.hxx | 54 +++++++++--------- linguistic/source/gciterator.hxx | 72 ++++++++++++------------ linguistic/source/hhconvdic.hxx | 10 ++-- linguistic/source/hyphdsp.hxx | 84 ++++++++++++---------------- linguistic/source/hyphdta.cxx | 6 +- linguistic/source/lngopt.hxx | 60 ++++++++++---------- linguistic/source/lngprophelp.cxx | 46 +++++++--------- linguistic/source/lngsvcmgr.cxx | 6 +- linguistic/source/lngsvcmgr.hxx | 89 +++++++++++++++--------------- linguistic/source/misc.cxx | 12 ++-- linguistic/source/misc2.cxx | 2 +- linguistic/source/spelldsp.hxx | 54 ++++++++---------- linguistic/source/spelldta.cxx | 4 +- linguistic/source/thesdsp.hxx | 44 ++++++--------- linguistic/workben/sspellimp.cxx | 4 +- 22 files changed, 371 insertions(+), 426 deletions(-) (limited to 'linguistic') diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index a5c653daa536..ab021c5b1311 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -44,8 +44,8 @@ class SpellCache; class FlushListener : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XDictionaryListEventListener, - ::com::sun::star::beans::XPropertyChangeListener + css::linguistic2::XDictionaryListEventListener, + css::beans::XPropertyChangeListener > { css::uno::Reference< css::linguistic2::XSearchableDictionaryList > xDicList; @@ -59,24 +59,23 @@ public: FlushListener( SpellCache& rFO ) : mrSpellCache(rFO) {} virtual ~FlushListener() {} - void SetDicList( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &rDL ); - void SetPropSet( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > &rPS ); + void SetDicList( css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rDL ); + void SetPropSet( css::uno::Reference< css::linguistic2::XLinguProperties > &rPS ); //XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override; // XDictionaryListEventListener - virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processDictionaryListEvent( const css::linguistic2::DictionaryListEvent& rDicListEvent ) throw(css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvt ) throw(css::uno::RuntimeException, std::exception) override; }; class SpellCache { - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryListEventListener > + css::uno::Reference< css::linguistic2::XDictionaryListEventListener > xFlushLstnr; FlushListener *pFlushLstnr; diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index ae60627031fb..4a3a0e45342c 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -69,10 +69,10 @@ typedef std::unordered_multimap< OUString, sal_Int16, class ConvDic : public ::cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XConversionDictionary, - ::com::sun::star::linguistic2::XConversionPropertyType, - ::com::sun::star::util::XFlushable, - ::com::sun::star::lang::XServiceInfo + css::linguistic2::XConversionDictionary, + css::linguistic2::XConversionPropertyType, + css::util::XFlushable, + css::lang::XServiceInfo > { friend class ConvDicXMLExport; @@ -115,36 +115,36 @@ public: virtual ~ConvDic(); // XConversionDictionary - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getConversionType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getConversionEntries( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getMaxCharCount( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override; // XConversionPropertyType - virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; // XFlushable - virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); bool HasEntry( const OUString &rLeftText, const OUString &rRightText ); diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index e0173a319c22..442e5d070c67 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -83,10 +83,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory } class ConvDicNameContainer : - public cppu::WeakImplHelper - < - ::com::sun::star::container::XNameContainer - >, + public cppu::WeakImplHelper< css::container::XNameContainer >, private boost::noncopyable { uno::Sequence< uno::Reference< XConversionDictionary > > aConvDics; @@ -98,20 +95,20 @@ public: virtual ~ConvDicNameContainer(); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // looks for conversion dictionaries with the specified extension // in the directory and adds them to the container @@ -283,11 +280,11 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) try { ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( "delete", makeAny( true ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( css::ucb::CommandAbortedException& ) { SAL_WARN( "linguistic", "HangulHanjaOptionsDialog::OkHdl(): CommandAbortedException" ); } diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 615ce3e0d9e1..dd02dee99340 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -36,9 +36,9 @@ class ConvDicNameContainer; class ConvDicList : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XConversionDictionaryList, - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XServiceInfo + css::linguistic2::XConversionDictionaryList, + css::lang::XComponent, + css::lang::XServiceInfo > { @@ -55,11 +55,11 @@ class ConvDicList : ::cppu::OInterfaceContainerHelper aEvtListeners; ConvDicNameContainer *pNameContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer > xNameContainer; + css::uno::Reference< + css::container::XNameContainer > xNameContainer; MyAppExitListener *pExitListener; - ::com::sun::star::uno::Reference< ::com::sun::star::frame:: + css::uno::Reference< css::frame:: XTerminateListener > xExitListener; bool bDisposing; @@ -74,25 +74,25 @@ public: virtual ~ConvDicList(); // XConversionDictionaryList - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL queryMaxCharCount( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (css::lang::NoSupportException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL queryMaxCharCount( const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // non UNO-specific diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index c1a9fddfe564..c6dfffcf69b9 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -119,7 +119,7 @@ public: } // SvXMLImportContext - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override; }; @@ -140,7 +140,7 @@ public: } // SvXMLImportContext - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override; const OUString & GetLeftText() const { return aLeftText; } diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 1f7c60250b6c..2966c2b9a148 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -45,9 +45,9 @@ class ConvDicXMLExport : public SvXMLExport public: ConvDicXMLExport( ConvDic &rConvDic, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler) : + css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler) : SvXMLExport ( comphelper::getProcessComponentContext(), "com.sun.star.lingu2.ConvDicXMLExport", rFileName, - ::com::sun::star::util::MeasureUnit::CM, rHandler ), + css::util::MeasureUnit::CM, rHandler ), rDic ( rConvDic ), bSuccess ( false ) { @@ -95,12 +95,12 @@ public: { } - virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL startDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual SvXMLImportContext * CreateContext( sal_uInt16 nPrefix, const OUString &rLocalName, - const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList > &rxAttrList ) override; + const css::uno::Reference < css::xml::sax::XAttributeList > &rxAttrList ) override; ConvDic * GetDic() { return pDic; } sal_Int16 GetLanguage() const { return nLanguage; } diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index ef4b82012331..9f594e4bed0d 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -38,18 +38,17 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg ); class DictionaryNeo : public ::cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XDictionary, - ::com::sun::star::frame::XStorable + css::linguistic2::XDictionary, + css::frame::XStorable > { ::cppu::OInterfaceContainerHelper aDicEvtListeners; - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > > aEntries; + css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionaryEntry > > + aEntries; OUString aDicName; OUString aMainURL; - ::com::sun::star::linguistic2::DictionaryType eDicType; + css::linguistic2::DictionaryType eDicType; sal_Int16 nCount; sal_Int16 nLanguage; sal_Int16 nDicVersion; @@ -62,8 +61,7 @@ class DictionaryNeo : DictionaryNeo & operator = (const DictionaryNeo &) = delete; void launchEvent(sal_Int16 nEvent, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > xEntry); + css::uno::Reference< css::linguistic2::XDictionaryEntry > xEntry); sal_uLong loadEntries(const OUString &rMainURL); sal_uLong saveEntries(const OUString &rMainURL); @@ -74,13 +72,12 @@ class DictionaryNeo : bool bSimilarOnly = false); bool isSorted(); - bool addEntry_Impl(const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry >& rDicEntry, + bool addEntry_Impl(const css::uno::Reference< css::linguistic2::XDictionaryEntry >& rDicEntry, bool bIsLoadEntries = false); public: DictionaryNeo(const OUString &rName, sal_Int16 nLang, - ::com::sun::star::linguistic2::DictionaryType eType, + css::linguistic2::DictionaryType eType, const OUString &rMainURL, bool bWriteable ); virtual ~DictionaryNeo(); @@ -88,100 +85,91 @@ public: // XNamed virtual OUString SAL_CALL getName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XDictionary - virtual ::com::sun::star::linguistic2::DictionaryType SAL_CALL + virtual css::linguistic2::DictionaryType SAL_CALL getDictionaryType() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActive( sal_Bool bActivate ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isActive() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getCount() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - setLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL + setLocale( const css::lang::Locale& aLocale ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::linguistic2::XDictionaryEntry > SAL_CALL getEntry( const OUString& aWord ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - addEntry( const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry >& xDicEntry ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + addEntry( const css::uno::Reference< + css::linguistic2::XDictionaryEntry >& xDicEntry ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL add( const OUString& aWord, sal_Bool bIsNegative, const OUString& aRplcText ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL remove( const OUString& aWord ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFull() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > > SAL_CALL + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionaryEntry > > SAL_CALL getEntries() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clear() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - addDictionaryEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + addDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - removeDictionaryEventListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + removeDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; // XStorable virtual sal_Bool SAL_CALL hasLocation() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLocation() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isReadonly() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL store() - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL storeAsURL( const OUString& aURL, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aArgs ) - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) + throw(css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL storeToURL( const OUString& aURL, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aArgs ) - throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) + throw(css::io::IOException, + css::uno::RuntimeException, std::exception) override; }; class DicEntry : - public cppu::WeakImplHelper - < - ::com::sun::star::linguistic2::XDictionaryEntry - > + public cppu::WeakImplHelper< css::linguistic2::XDictionaryEntry > { OUString aDicWord, // including hyphen positions represented by "=" aReplacement; // including hyphen positions represented by "=" @@ -202,11 +190,11 @@ public: // XDictionaryEntry virtual OUString SAL_CALL - getDictionaryWord() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + getDictionaryWord() throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isNegative() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + isNegative() throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL - getReplacementText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + getReplacementText() throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index d07c7c269683..25ad796bc815 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -38,9 +38,9 @@ class DicEvtListenerHelper; class DicList : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XSearchableDictionaryList, - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XServiceInfo + css::linguistic2::XSearchableDictionaryList, + css::lang::XComponent, + css::lang::XServiceInfo > { class MyAppExitListener : public linguistic::AppExitListener @@ -56,14 +56,14 @@ class DicList : ::cppu::OInterfaceContainerHelper aEvtListeners; - typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > DictionaryVec_t; + typedef std::vector< css::uno::Reference< css::linguistic2::XDictionary > > DictionaryVec_t; DictionaryVec_t aDicList; - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2:: + css::uno::Reference< css::linguistic2:: XDictionaryEventListener > xDicEvtLstnrHelper; DicEvtListenerHelper *pDicEvtLstnrHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::frame:: + css::uno::Reference< css::frame:: XTerminateListener > xExitListener; MyAppExitListener *pExitListener; @@ -83,42 +83,42 @@ class DicList : void SearchForDictionaries( DictionaryVec_t &rDicList, const OUString &rDicDir, bool bIsWritePath ); - sal_Int32 GetDicPos(const com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > &xDic); + sal_Int32 GetDicPos(const css::uno::Reference< + css::linguistic2::XDictionary > &xDic); public: DicList(); virtual ~DicList(); // XDictionaryList - virtual ::sal_Int16 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL addDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL addDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL removeDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const css::lang::Locale& aLocale, css::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override; // XSearchableDictionaryList - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const css::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // non UNO-specific void SaveDics(); diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index b197fdb53097..a93957931fb1 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -47,19 +47,19 @@ struct FPEntry { // flat paragraph iterator - ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > m_xParaIterator; + css::uno::Reference< css::text::XFlatParagraphIterator > m_xParaIterator; // flat paragraph - ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > m_xPara; + css::uno::WeakReference< css::text::XFlatParagraph > m_xPara; // document ID to identify different documents - OUString m_aDocId; + OUString m_aDocId; // the starting position to be checked sal_Int32 m_nStartIndex; // the flag to identify whether the document does automatical grammar checking - bool m_bAutomatic; + bool m_bAutomatic; FPEntry() : m_aDocId() @@ -75,11 +75,11 @@ struct FPEntry class GrammarCheckingIterator: public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XProofreadingIterator, - ::com::sun::star::linguistic2::XLinguServiceEventListener, - ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster, - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XServiceInfo + css::linguistic2::XProofreadingIterator, + css::linguistic2::XLinguServiceEventListener, + css::linguistic2::XLinguServiceEventBroadcaster, + css::lang::XComponent, + css::lang::XServiceInfo >, public LinguDispatcher { @@ -103,7 +103,7 @@ class GrammarCheckingIterator: GCImplNames_t m_aGCImplNamesByLang; // implname -> UNO reference mapping - typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > > GCReferences_t; + typedef std::map< OUString, css::uno::Reference< css::linguistic2::XProofreader > > GCReferences_t; GCReferences_t m_aGCReferencesByService; OUString m_aCurCheckedDocId; @@ -117,29 +117,29 @@ class GrammarCheckingIterator: cppu::OInterfaceContainerHelper m_aEventListeners; cppu::OInterfaceContainerHelper m_aNotifyListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > m_xBreakIterator; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > m_xUpdateAccess; + css::uno::Reference< css::i18n::XBreakIterator > m_xBreakIterator; + mutable css::uno::Reference< css::util::XChangesBatch > m_xUpdateAccess; void TerminateThread(); sal_Int32 NextDocId(); - OUString GetOrCreateDocId( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xComp ); + OUString GetOrCreateDocId( const css::uno::Reference< css::lang::XComponent > &xComp ); void AddEntry( - ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraphIterator > xFlatParaIterator, - ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > xFlatPara, + css::uno::WeakReference< css::text::XFlatParagraphIterator > xFlatParaIterator, + css::uno::WeakReference< css::text::XFlatParagraph > xFlatPara, const OUString &rDocId, sal_Int32 nStartIndex, bool bAutomatic ); - void ProcessResult( const ::com::sun::star::linguistic2::ProofreadingResult &rRes, - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > &rxFlatParagraphIterator, + void ProcessResult( const css::linguistic2::ProofreadingResult &rRes, + const css::uno::Reference< css::text::XFlatParagraphIterator > &rxFlatParagraphIterator, bool bIsAutomaticChecking ); - sal_Int32 GetSuggestedEndOfSentence( const OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale ); + sal_Int32 GetSuggestedEndOfSentence( const OUString &rText, sal_Int32 nSentenceStartPos, const css::lang::Locale &rLocale ); void GetConfiguredGCSvcs_Impl(); - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > GetGrammarChecker( const ::com::sun::star::lang::Locale & rLocale ); + css::uno::Reference< css::linguistic2::XProofreader > GetGrammarChecker( const css::lang::Locale & rLocale ); - ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > GetUpdateAccess() const; + css::uno::Reference< css::util::XChangesBatch > GetUpdateAccess() const; GrammarCheckingIterator( const GrammarCheckingIterator & ) = delete; GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) = delete; @@ -152,34 +152,34 @@ public: virtual ~GrammarCheckingIterator(); // XProofreadingIterator - virtual void SAL_CALL startProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetIgnoreRules( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const css::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL resetIgnoreRules( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument ) throw (css::uno::RuntimeException, std::exception) override; // XLinguServiceEventListener - virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (css::uno::RuntimeException, std::exception) override; // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // LinguDispatcher - virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ) override; - virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const override; + virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override; + virtual css::uno::Sequence< OUString > GetServiceList( const css::lang::Locale &rLocale ) const override; }; diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index c13ffd932aba..69d227b69e9e 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -41,17 +41,17 @@ public: virtual ~HHConvDic(); // XConversionDictionary - virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); }; diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 053207cb38c0..9623e07d5a82 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -45,7 +45,7 @@ class LngSvcMgr; class HyphenatorDispatcher : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XHyphenator + css::linguistic2::XHyphenator >, public LinguDispatcher { @@ -53,36 +53,28 @@ class HyphenatorDispatcher : typedef std::map< LanguageType, LangSvcEntries_Hyph_Ptr_t > HyphSvcByLangMap_t; HyphSvcByLangMap_t aSvcMap; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > xPropSet; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; + css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet; + css::uno::Reference< css::linguistic2::XSearchableDictionaryList > xDicList; LngSvcMgr &rMgr; HyphenatorDispatcher(const HyphenatorDispatcher &) = delete; HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) = delete; - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > + inline css::uno::Reference< css::linguistic2::XLinguProperties > GetPropSet(); - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > + inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > GetDicList(); void ClearSvcList(); - static com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord> + static css::uno::Reference< css::linguistic2::XHyphenatedWord> buildHyphWord( const OUString& rOrigWord, - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry> &xEntry, + const css::uno::Reference< css::linguistic2::XDictionaryEntry> &xEntry, sal_Int16 nLang, sal_Int16 nMaxLeading ); - static com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XPossibleHyphens > - buildPossHyphens( const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryEntry > &xEntry, + static css::uno::Reference< css::linguistic2::XPossibleHyphens > + buildPossHyphens( const css::uno::Reference< css::linguistic2::XDictionaryEntry > &xEntry, sal_Int16 nLanguage ); public: @@ -90,52 +82,47 @@ public: virtual ~HyphenatorDispatcher(); // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::lang::Locale > SAL_CALL + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - hasLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + hasLocale( const css::lang::Locale& aLocale ) + throw(css::uno::RuntimeException, std::exception) override; // XHyphenator - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, + const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, + const css::lang::Locale& aLocale, sal_Int16 nIndex, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, - const ::com::sun::star::lang::Locale& aLocale, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& aLocale, + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // LinguDispatcher virtual void - SetServiceList( const ::com::sun::star::lang::Locale &rLocale, - const ::com::sun::star::uno::Sequence< - OUString > &rSvcImplNames ) override; - virtual ::com::sun::star::uno::Sequence< OUString > - GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const override; + SetServiceList( const css::lang::Locale &rLocale, + const css::uno::Sequence< OUString > &rSvcImplNames ) override; + virtual css::uno::Sequence< OUString > + GetServiceList( const css::lang::Locale &rLocale ) const override; }; -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > +inline css::uno::Reference< css::linguistic2::XLinguProperties > HyphenatorDispatcher::GetPropSet() { return xPropSet.is() ? @@ -143,8 +130,7 @@ inline ::com::sun::star::uno::Reference< } -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > +inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > HyphenatorDispatcher::GetDicList() { return xDicList.is() ? diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index fe17634e29b2..844b2fbd4442 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -168,17 +168,17 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() return aOrigHyphenPos; } -com::sun::star::uno::Reference HyphenatedWord::CreateHyphenatedWord( +css::uno::Reference HyphenatedWord::CreateHyphenatedWord( const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, const OUString &rHyphenatedWord, sal_Int16 nHyphenPos ) { return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos ); } -com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens +css::uno::Reference < css::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens (const OUString &rWord, sal_Int16 nLang, const OUString &rHyphWord, - const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions) + const css::uno::Sequence< sal_Int16 > &rPositions) { return new PossibleHyphens( rWord, nLang, rHyphWord, rPositions ); } diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index b2195be1c529..13a705d9fc9c 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -59,7 +59,7 @@ public: static OUString GetName( sal_Int32 nWID ); - const ::com::sun::star::uno::Sequence< OUString > + const css::uno::Sequence< OUString > GetActiveDics() const { return pData->aActiveDics; } }; @@ -69,11 +69,11 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar class LinguProps : public cppu::WeakImplHelper < - com::sun::star::linguistic2::XLinguProperties, - com::sun::star::beans::XFastPropertySet, - com::sun::star::beans::XPropertyAccess, - com::sun::star::lang::XComponent, - com::sun::star::lang::XServiceInfo + css::linguistic2::XLinguProperties, + css::beans::XFastPropertySet, + css::beans::XPropertyAccess, + css::lang::XComponent, + css::lang::XServiceInfo > { ::cppu::OInterfaceContainerHelper aEvtListeners; @@ -87,7 +87,7 @@ class LinguProps : LinguProps(const LinguProps &) = delete; LinguProps & operator = (const LinguProps &) = delete; - void launchEvent( const ::com::sun::star::beans::PropertyChangeEvent &rEvt ) const; + void launchEvent( const css::beans::PropertyChangeEvent &rEvt ) const; bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException); sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException); @@ -134,9 +134,9 @@ public: { return getPropertyInt16(UPN_HYPH_MIN_WORD_LENGTH); } virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty(UPN_HYPH_MIN_WORD_LENGTH, p1); } - virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException, std::exception) override + virtual css::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException, std::exception) override { return getPropertyLocale(UPN_DEFAULT_LOCALE); } - virtual void SAL_CALL setDefaultLocale(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDefaultLocale(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override { setProperty(UPN_DEFAULT_LOCALE, p1); } virtual sal_Bool SAL_CALL getIsHyphAuto() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool(UPN_IS_HYPH_AUTO); } @@ -158,45 +158,45 @@ public: { return getPropertyBool(UPN_IS_WRAP_REVERSE); } virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty(UPN_IS_WRAP_REVERSE, (bool) p1); } - virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException, std::exception) override + virtual css::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException, std::exception) override { return getPropertyLocale(UPN_DEFAULT_LOCALE_CJK); } - virtual void SAL_CALL setDefaultLocale_CJK(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDefaultLocale_CJK(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override { setProperty(UPN_DEFAULT_LOCALE_CJK, p1); } virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() throw (css::uno::RuntimeException, std::exception) override { return getPropertyLocale(UPN_DEFAULT_LOCALE_CTL); } - virtual void SAL_CALL setDefaultLocale_CTL(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDefaultLocale_CTL(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override { setProperty(UPN_DEFAULT_LOCALE_CTL, p1); } // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static() throw(); - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); }; inline OUString LinguProps::getImplementationName_Static() throw() diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 3083d5c028b8..14856146c9da 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -673,10 +673,8 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals ) } PropertyHelper_Thesaurus::PropertyHelper_Thesaurus( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ) + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ) { pInst = new PropertyHelper_Thes( rxSource, rxPropSet ); xPropHelper = pInst; @@ -696,16 +694,14 @@ void PropertyHelper_Thesaurus::RemoveAsPropListener() pInst->RemoveAsPropListener(); } -void PropertyHelper_Thesaurus::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) +void PropertyHelper_Thesaurus::SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) { pInst->SetTmpPropVals( rPropVals ); } PropertyHelper_Hyphenation::PropertyHelper_Hyphenation( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet) + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet) { pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet ); xPropHelper = pInst; @@ -725,7 +721,7 @@ void PropertyHelper_Hyphenation::RemoveAsPropListener() pInst->RemoveAsPropListener(); } -void PropertyHelper_Hyphenation::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) +void PropertyHelper_Hyphenation::SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) { pInst->SetTmpPropVals( rPropVals ); } @@ -746,26 +742,22 @@ sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const } bool PropertyHelper_Hyphenation::addLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException) + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException) { return pInst->addLinguServiceEventListener( rxListener ); } bool PropertyHelper_Hyphenation::removeLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException) + const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException) { return pInst->removeLinguServiceEventListener( rxListener ); } PropertyHelper_Spelling::PropertyHelper_Spelling( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > &rxSource, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > &rxPropSet ) + const css::uno::Reference< css::uno::XInterface > &rxSource, + css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet ) { pInst = new PropertyHelper_Spell( rxSource, rxPropSet ); xPropHelper = pInst; @@ -785,7 +777,7 @@ void PropertyHelper_Spelling::RemoveAsPropListener() pInst->RemoveAsPropListener(); } -void PropertyHelper_Spelling::SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals ) +void PropertyHelper_Spelling::SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) { pInst->SetTmpPropVals( rPropVals ); } @@ -806,17 +798,17 @@ bool PropertyHelper_Spelling::IsSpellCapitalization() const } bool PropertyHelper_Spelling::addLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException) + const css::uno::Reference< + css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException) { return pInst->addLinguServiceEventListener( rxListener ); } bool PropertyHelper_Spelling::removeLinguServiceEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener >& rxListener ) - throw(::com::sun::star::uno::RuntimeException) + const css::uno::Reference< + css::linguistic2::XLinguServiceEventListener >& rxListener ) + throw(css::uno::RuntimeException) { return pInst->removeLinguServiceEventListener( rxListener ); } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 43afb44ea4b5..75fda0ea6429 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -269,7 +269,7 @@ long LngSvcMgrListenerHelper::Timeout() // probably do not know (and need not to know) about the specific // SpellChecker's or Hyphenator's. linguistic2::LinguServiceEvent aEvtObj( - static_cast(&rMyManager), nCombinedLngSvcEvt ); + static_cast(&rMyManager), nCombinedLngSvcEvt ); nCombinedLngSvcEvt = 0; if (rMyManager.pSpellDsp) @@ -363,7 +363,7 @@ void SAL_CALL void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16 nLngSvcEvtFlags ) { linguistic2::LinguServiceEvent aEvt( - static_cast(&rMyManager), nLngSvcEvtFlags ); + static_cast(&rMyManager), nLngSvcEvtFlags ); // pass event on to linguistic2::XLinguServiceEventListener's cppu::OInterfaceIteratorHelper aIt( aLngSvcMgrListeners ); @@ -497,7 +497,7 @@ LngSvcMgr::LngSvcMgr() } } -// ::com::sun::star::util::XModifyListener +// css::util::XModifyListener void LngSvcMgr::modified(const lang::EventObject&) throw(uno::RuntimeException, std::exception) { diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 5be4fce65b86..d28216cd5cc5 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -57,9 +57,9 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class LngSvcMgr : public cppu::WeakImplHelper < - com::sun::star::linguistic2::XLinguServiceManager2, - com::sun::star::lang::XServiceInfo, - com::sun::star::util::XModifyListener + css::linguistic2::XLinguServiceManager2, + css::lang::XServiceInfo, + css::util::XModifyListener >, private utl::ConfigItem { @@ -67,32 +67,32 @@ class LngSvcMgr : ::cppu::OInterfaceContainerHelper aEvtListeners; - com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker > xSpellDsp; - com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XProofreadingIterator > xGrammarDsp; - com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyphDsp; - com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > xThesDsp; + css::uno::Reference< + css::linguistic2::XSpellChecker > xSpellDsp; + css::uno::Reference< + css::linguistic2::XProofreadingIterator > xGrammarDsp; + css::uno::Reference< + css::linguistic2::XHyphenator > xHyphDsp; + css::uno::Reference< + css::linguistic2::XThesaurus > xThesDsp; - com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > xListenerHelper; + css::uno::Reference< + css::lang::XEventListener > xListenerHelper; - com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyBroadcaster> xMB; + css::uno::Reference< + css::util::XModifyBroadcaster> xMB; Idle aUpdateIdle; - com::sun::star::uno::Sequence< - com::sun::star::lang::Locale > aAvailSpellLocales; - com::sun::star::uno::Sequence< - com::sun::star::lang::Locale > aAvailGrammarLocales; - com::sun::star::uno::Sequence< - com::sun::star::lang::Locale > aAvailHyphLocales; - com::sun::star::uno::Sequence< - com::sun::star::lang::Locale > aAvailThesLocales; + css::uno::Sequence< + css::lang::Locale > aAvailSpellLocales; + css::uno::Sequence< + css::lang::Locale > aAvailGrammarLocales; + css::uno::Sequence< + css::lang::Locale > aAvailHyphLocales; + css::uno::Sequence< + css::lang::Locale > aAvailThesLocales; SpellCheckerDispatcher * pSpellDsp; GrammarCheckingIterator * pGrammarDsp; @@ -133,7 +133,7 @@ class LngSvcMgr : static void clearSvcInfoArray(SvcInfoArray *&rpInfo); // utl::ConfigItem (to allow for listening of changes of relevant properties) - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; virtual void ImplCommit() override; void UpdateAll(); @@ -145,42 +145,41 @@ public: virtual ~LngSvcMgr(); // XLinguServiceManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale, const css::uno::Sequence< OUString >& aServiceImplNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) throw (css::uno::RuntimeException, std::exception) override; // XAvailableLocales - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) throw(css::uno::RuntimeException, std::exception) override; static inline OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); bool AddLngSvcEvtBroadcaster( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster ); + const css::uno::Reference< css::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster ); }; diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index c685f60032a0..699900cf23f3 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -79,17 +79,17 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) return aLclDtaWrp; } -LanguageType LinguLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale ) +LanguageType LinguLocaleToLanguage( const css::lang::Locale& rLocale ) { if ( rLocale.Language.isEmpty() ) return LANGUAGE_NONE; return LanguageTag::convertToLanguageType( rLocale ); } -::com::sun::star::lang::Locale LinguLanguageToLocale( LanguageType nLanguage ) +css::lang::Locale LinguLanguageToLocale( LanguageType nLanguage ) { if (nLanguage == LANGUAGE_NONE) - return ::com::sun::star::lang::Locale(); + return css::lang::Locale(); return LanguageTag::convertToLocale( nLanguage); } @@ -415,7 +415,7 @@ bool IsReadOnly( const OUString &rURL, bool *pbExist ) { try { - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv; + uno::Reference< css::ucb::XCommandEnvironment > xCmdEnv; ::ucbhelper::Content aContent( rURL, xCmdEnv, comphelper::getProcessComponentContext() ); bExists = aContent.isDocument(); @@ -615,7 +615,7 @@ CapType SAL_CALL capitalType(const OUString& aTerm, CharClass * pCC) for (sal_Int32 tindex = 0; tindex < tlen; ++tindex) { if (pCC->getCharacterType(aStr,tindex) & - ::com::sun::star::i18n::KCharacterType::UPPER) nc++; + css::i18n::KCharacterType::UPPER) nc++; } if (nc == 0) @@ -623,7 +623,7 @@ CapType SAL_CALL capitalType(const OUString& aTerm, CharClass * pCC) if (nc == tlen) return CapType::ALLCAP; if ((nc == 1) && (pCC->getCharacterType(aStr,0) & - ::com::sun::star::i18n::KCharacterType::UPPER)) + css::i18n::KCharacterType::UPPER)) return CapType::INITCAP; return CapType::MIXED; diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index eeee5cab3eca..c5f6a1f24ab2 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -63,7 +63,7 @@ bool FileExists( const OUString &rMainURL ) try { ::ucbhelper::Content aContent( rMainURL, - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); bExists = aContent.isDocument(); } diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index c46bb368e69e..241e6fff206f 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -46,8 +46,8 @@ class LngSvcMgr; class SpellCheckerDispatcher : public cppu::WeakImplHelper < - ::com::sun::star::linguistic2::XSpellChecker1, - ::com::sun::star::linguistic2::XSpellChecker + css::linguistic2::XSpellChecker1, + css::linguistic2::XSpellChecker >, public LinguDispatcher { @@ -56,10 +56,8 @@ class SpellCheckerDispatcher : SpellSvcByLangMap_t aSvcMap; LinguOptions aOpt; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > xPropSet; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; + css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet; + css::uno::Reference< css::linguistic2::XSearchableDictionaryList > xDicList; LngSvcMgr &rMgr; mutable linguistic::SpellCache *pCache; // Spell Cache (holds known words) @@ -70,50 +68,48 @@ class SpellCheckerDispatcher : inline linguistic::SpellCache & GetCache() const; - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > + inline css::uno::Reference< css::linguistic2::XLinguProperties > GetPropSet(); - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > + inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > GetDicList(); void ClearSvcList(); bool isValid_Impl(const OUString& aWord, LanguageType nLanguage, - const ::com::sun::star::beans::PropertyValues& aProperties, + const css::beans::PropertyValues& aProperties, bool bCheckDics) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ); + throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > + css::uno::Reference< + css::linguistic2::XSpellAlternatives > spell_Impl(const OUString& aWord, LanguageType nLanguage, - const ::com::sun::star::beans::PropertyValues& aProperties, + const css::beans::PropertyValues& aProperties, bool bCheckDics) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ); + throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ); public: explicit SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ); virtual ~SpellCheckerDispatcher(); // XSupportedLocales (for XSpellChecker) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) throw(css::uno::RuntimeException, std::exception) override; // XSpellChecker - virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XSupportedLanguages - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (css::uno::RuntimeException, std::exception) override; // XSpellChecker1 - virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // LinguDispatcher - virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ) override; - virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const override; + virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override; + virtual css::uno::Sequence< OUString > GetServiceList( const css::lang::Locale &rLocale ) const override; void FlushSpellCache(); @@ -131,8 +127,7 @@ inline linguistic::SpellCache & SpellCheckerDispatcher::GetCache() const } -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > +inline css::uno::Reference< css::linguistic2::XLinguProperties > SpellCheckerDispatcher::GetPropSet() { return xPropSet.is() ? @@ -140,8 +135,7 @@ inline ::com::sun::star::uno::Reference< } -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSearchableDictionaryList > +inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > SpellCheckerDispatcher::GetDicList() { return xDicList.is() ? diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 34c931290578..d06651053558 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -277,8 +277,8 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt ) } -com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives( - const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt ) +css::uno::Reference < css::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives( + const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt ) { SpellAlternatives* pAlt = new SpellAlternatives; pAlt->SetWordLanguage( rWord, nLang ); diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 3566d12a4d6e..37c17b0f30e3 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -45,24 +45,19 @@ class ThesaurusDispatcher : - public cppu::WeakImplHelper - < - ::com::sun::star::linguistic2::XThesaurus - >, + public cppu::WeakImplHelper< css::linguistic2::XThesaurus >, public LinguDispatcher { typedef std::shared_ptr< LangSvcEntries_Thes > LangSvcEntries_Thes_Ptr_t; typedef std::map< LanguageType, LangSvcEntries_Thes_Ptr_t > ThesSvcByLangMap_t; ThesSvcByLangMap_t aSvcMap; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > xPropSet; + css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet; ThesaurusDispatcher(const ThesaurusDispatcher &) = delete; ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) = delete; - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > + inline css::uno::Reference< css::linguistic2::XLinguProperties > GetPropSet(); void ClearSvcList(); @@ -72,36 +67,31 @@ public: virtual ~ThesaurusDispatcher(); // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::lang::Locale > SAL_CALL + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - hasLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + hasLocale( const css::lang::Locale& aLocale ) + throw(css::uno::RuntimeException, std::exception) override; // XThesaurus - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XMeaning > > SAL_CALL + virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& aTerm, - const ::com::sun::star::lang::Locale& aLocale, - const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& aLocale, + const css::beans::PropertyValues& aProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // LinguDispatcher virtual void - SetServiceList( const ::com::sun::star::lang::Locale &rLocale, - const ::com::sun::star::uno::Sequence< - OUString > &rSvcImplNames ) override; - virtual ::com::sun::star::uno::Sequence< OUString > - GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const override; + SetServiceList( const css::lang::Locale &rLocale, + const css::uno::Sequence< OUString > &rSvcImplNames ) override; + virtual css::uno::Sequence< OUString > + GetServiceList( const css::lang::Locale &rLocale ) const override; }; -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > +inline css::uno::Reference< css::linguistic2::XLinguProperties > ThesaurusDispatcher::GetPropSet() { return xPropSet.is() ? diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index b7fb2cb88e23..c1570f39ab21 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -220,7 +220,7 @@ Reference< XSpellAlternatives > { aTmp.SearchAndReplaceAllAscii( "liss", "liz" ); xRes = new SpellAlternatives( aTmp, nLang, - SpellFailure::IS_NEGATIVE_WORD, ::com::sun::star::uno::Sequence< OUString >() ); + SpellFailure::IS_NEGATIVE_WORD, css::uno::Sequence< OUString >() ); } else if (-1 != aTmp.indexOf( (sal_Unicode) 'x' ) || -1 != aTmp.indexOf( (sal_Unicode) 'X' )) @@ -252,7 +252,7 @@ Reference< XSpellAlternatives > (sal_Unicode) 'S': (sal_Unicode) 's'; aTmp.GetBufferAccess()[0] = cNewChar; xRes = new SpellAlternatives( aTmp, nLang, - SpellFailure::CAPTION_ERROR, ::com::sun::star::uno::Sequence< OUString >() ); + SpellFailure::CAPTION_ERROR, css::uno::Sequence< OUString >() ); } } } -- cgit