diff options
Diffstat (limited to 'linguistic/inc')
| -rw-r--r-- | linguistic/inc/lngprops.hxx | 36 | ||||
| -rw-r--r-- | linguistic/inc/misc.hxx | 27 |
2 files changed, 31 insertions, 32 deletions
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx index 41052f9eb1..4a104eed58 100644 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/lngprops.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #ifndef _LINGUISTIC_LNGPROPS_HHX_ #define _LINGUISTIC_LNGPROPS_HHX_ -#include <svtools/linguprops.hxx> +#include <unotools/linguprops.hxx> // maximal number of suggestions to be returned in spelling context-menu // (may not include results added by looking up user dictionaries) @@ -41,24 +41,24 @@ //!! Don't change values! They are used as the property handles in //!! the service description #define WID_IS_GERMAN_PRE_REFORM UPH_IS_GERMAN_PRE_REFORM /*! deprecated !*/ -#define WID_IS_USE_DICTIONARY_LIST UPH_IS_USE_DICTIONARY_LIST +#define WID_IS_USE_DICTIONARY_LIST UPH_IS_USE_DICTIONARY_LIST #define WID_IS_IGNORE_CONTROL_CHARACTERS UPH_IS_IGNORE_CONTROL_CHARACTERS -#define WID_IS_SPELL_UPPER_CASE UPH_IS_SPELL_UPPER_CASE -#define WID_IS_SPELL_WITH_DIGITS UPH_IS_SPELL_WITH_DIGITS -#define WID_IS_SPELL_CAPITALIZATION UPH_IS_SPELL_CAPITALIZATION -#define WID_HYPH_MIN_LEADING UPH_HYPH_MIN_LEADING -#define WID_HYPH_MIN_TRAILING UPH_HYPH_MIN_TRAILING -#define WID_HYPH_MIN_WORD_LENGTH UPH_HYPH_MIN_WORD_LENGTH -#define WID_DEFAULT_LOCALE UPH_DEFAULT_LOCALE -#define WID_IS_SPELL_AUTO UPH_IS_SPELL_AUTO +#define WID_IS_SPELL_UPPER_CASE UPH_IS_SPELL_UPPER_CASE +#define WID_IS_SPELL_WITH_DIGITS UPH_IS_SPELL_WITH_DIGITS +#define WID_IS_SPELL_CAPITALIZATION UPH_IS_SPELL_CAPITALIZATION +#define WID_HYPH_MIN_LEADING UPH_HYPH_MIN_LEADING +#define WID_HYPH_MIN_TRAILING UPH_HYPH_MIN_TRAILING +#define WID_HYPH_MIN_WORD_LENGTH UPH_HYPH_MIN_WORD_LENGTH +#define WID_DEFAULT_LOCALE UPH_DEFAULT_LOCALE +#define WID_IS_SPELL_AUTO UPH_IS_SPELL_AUTO #define WID_IS_SPELL_HIDE UPH_IS_SPELL_HIDE /*! deprecated !*/ -#define WID_IS_SPELL_IN_ALL_LANGUAGES UPH_IS_SPELL_IN_ALL_LANGUAGES /*! deprecated !*/ -#define WID_IS_SPELL_SPECIAL UPH_IS_SPELL_SPECIAL -#define WID_IS_HYPH_AUTO UPH_IS_HYPH_AUTO -#define WID_IS_HYPH_SPECIAL UPH_IS_HYPH_SPECIAL -#define WID_IS_WRAP_REVERSE UPH_IS_WRAP_REVERSE -#define WID_DEFAULT_LANGUAGE UPH_DEFAULT_LANGUAGE -#define WID_DEFAULT_LOCALE_CJK UPH_DEFAULT_LOCALE_CJK +#define WID_IS_SPELL_IN_ALL_LANGUAGES UPH_IS_SPELL_IN_ALL_LANGUAGES /*! deprecated !*/ +#define WID_IS_SPELL_SPECIAL UPH_IS_SPELL_SPECIAL +#define WID_IS_HYPH_AUTO UPH_IS_HYPH_AUTO +#define WID_IS_HYPH_SPECIAL UPH_IS_HYPH_SPECIAL +#define WID_IS_WRAP_REVERSE UPH_IS_WRAP_REVERSE +#define WID_DEFAULT_LANGUAGE UPH_DEFAULT_LANGUAGE +#define WID_DEFAULT_LOCALE_CJK UPH_DEFAULT_LOCALE_CJK #define WID_DEFAULT_LOCALE_CTL UPH_DEFAULT_LOCALE_CTL #endif diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 803341bb8b..5b3f4bffe4 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,12 @@ #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include <cppuhelper/implbase1.hxx> // helper for implementations -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <i18npool/lang.h> #include <tools/string.hxx> #include <unotools/charclass.hxx> #include <osl/thread.h> #include <osl/mutex.hxx> -#include <vcl/svapp.hxx> namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; @@ -89,7 +88,7 @@ namespace linguistic #define PATH_FLAG_WRITABLE 0x04 #define PATH_FLAG_ALL (PATH_FLAG_INTERNAL | PATH_FLAG_USER | PATH_FLAG_WRITABLE) - + // AddEntryToDic return values #define DIC_ERR_NONE 0 #define DIC_ERR_FULL 1 @@ -138,7 +137,7 @@ LanguageType LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< INT16 > &rLangSeq ); ::com::sun::star::uno::Sequence< INT16 > - LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< + LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > &rLocaleSeq ); /////////////////////////////////////////////////////////////////////////// @@ -179,7 +178,7 @@ INT32 GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > - RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord, + RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); @@ -210,24 +209,24 @@ BOOL IsNumeric( const String &rText ); /////////////////////////////////////////////////////////////////////////// BOOL IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); -::com::sun::star::uno::Reference< +::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > - SearchDicList( + SearchDicList( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList, - const ::rtl::OUString& rWord, INT16 nLanguage, + const ::rtl::OUString& rWord, INT16 nLanguage, BOOL bSearchPosDics, BOOL bSearchSpellEntry ); -sal_uInt8 AddEntryToDic( +sal_uInt8 AddEntryToDic( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic, const ::rtl::OUString &rWord, sal_Bool bIsNeg, - const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang, + const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang, sal_Bool bStripDot = sal_True ); sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList ); @@ -241,7 +240,7 @@ sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::s class AppExitListener : public cppu::WeakImplHelper1 - < + < ::com::sun::star::frame::XTerminateListener > { |