diff options
author | Noel Grandin <noel@peralex.com> | 2013-02-04 16:18:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:43 +0200 |
commit | 53ec703c14470cb18845fc4483ec36c13b0d744e (patch) | |
tree | 4cde768b9b70c00e34801680ac6bcc4a889c5489 /linguistic/inc | |
parent | fdo#46808, convert xmloff module code to use XComponentContext (diff) | |
download | core-53ec703c14470cb18845fc4483ec36c13b0d744e.tar.gz core-53ec703c14470cb18845fc4483ec36c13b0d744e.zip |
fdo#46808, Adapt linguistic2::DictionaryList UNO service to new style
Change-Id: Iaf81a38063411b8a003b78f7eb7d6aab6c9df292
Diffstat (limited to 'linguistic/inc')
-rw-r--r-- | linguistic/inc/iprcache.hxx | 6 | ||||
-rw-r--r-- | linguistic/inc/linguistic/misc.hxx | 8 | ||||
-rw-r--r-- | linguistic/inc/linguistic/spelldta.hxx | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index c31724a8aa7b..9f67ed29c0b7 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/linguistic2/XDictionaryListEventListener.hpp> -#include <com/sun/star/linguistic2/XDictionaryList.hpp> +#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <rtl/string.hxx> #include <i18npool/lang.h> @@ -59,7 +59,7 @@ class FlushListener : > { ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > xDicList; + ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet; Flushable *pFlushObj; @@ -74,7 +74,7 @@ public: inline void SetFlushObj( Flushable *pFO) { pFlushObj = pFO; } - void SetDicList( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &rDL ); + void SetDicList( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &rDL ); void SetPropSet( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rPS ); //XEventListener diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index df5e1eedc78c..aa6a3223918a 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -58,7 +58,6 @@ class LocaleDataWrapper; #define SN_HYPHENATOR "com.sun.star.linguistic2.Hyphenator" #define SN_THESAURUS "com.sun.star.linguistic2.Thesaurus" #define SN_LINGU_PROPERTIES "com.sun.star.linguistic2.LinguProperties" -#define SN_DICTIONARY_LIST "com.sun.star.linguistic2.DictionaryList" namespace linguistic @@ -153,8 +152,7 @@ LNG_DLLPUBLIC sal_Bool IsNumeric( const String &rText ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName ); LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties(); -::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetSearchableDictionaryList(); -::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList(); +::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > GetDictionaryList(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); @@ -169,7 +167,7 @@ sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rP ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SearchDicList( - const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList, + const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList, const ::rtl::OUString& rWord, sal_Int16 nLanguage, sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry ); @@ -179,7 +177,7 @@ LNG_DLLPUBLIC sal_uInt8 AddEntryToDic( const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang, sal_Bool bStripDot = sal_True ); -LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList ); +LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList ); // AppExitLstnr: // virtual base class that calls it AtExit function when the application diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index 8eec9c19f5a9..220a406e9dd9 100644 --- a/linguistic/inc/linguistic/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -23,6 +23,7 @@ #include <vector> #include <com/sun/star/linguistic2/XSpellAlternatives.hpp> #include <com/sun/star/linguistic2/XSetSpellAlternatives.hpp> +#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <tools/solar.h> @@ -51,7 +52,7 @@ namespace linguistic void SeqRemoveNegEntries( ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq, ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > &rxDicList, + ::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList, sal_Int16 nLanguage ); sal_Bool SeqHasEntry( @@ -62,7 +63,7 @@ sal_Bool SeqHasEntry( void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage, ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > &xDicList, + ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList, std::vector< rtl::OUString > & rDicListProps ); /////////////////////////////////////////////////////////////////////////// |