diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /linguistic/inc | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'linguistic/inc')
-rw-r--r-- | linguistic/inc/iprcache.hxx | 6 | ||||
-rw-r--r-- | linguistic/inc/linguistic/hyphdta.hxx | 10 | ||||
-rw-r--r-- | linguistic/inc/linguistic/lngdllapi.h | 3 | ||||
-rw-r--r-- | linguistic/inc/linguistic/lngprophelp.hxx | 10 | ||||
-rw-r--r-- | linguistic/inc/linguistic/lngprops.hxx | 2 | ||||
-rw-r--r-- | linguistic/inc/linguistic/misc.hxx | 36 | ||||
-rw-r--r-- | linguistic/inc/linguistic/spelldta.hxx | 2 | ||||
-rw-r--r-- | linguistic/inc/pch/precompiled_linguistic.cxx | 2 | ||||
-rw-r--r-- | linguistic/inc/pch/precompiled_linguistic.hxx | 2 | ||||
-rw-r--r-- | linguistic/inc/thesdta.hxx | 4 |
10 files changed, 24 insertions, 53 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 842747a723cb..be48fac9bd46 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,7 +49,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class Flushable { @@ -56,7 +56,6 @@ public: virtual void Flush() = 0; }; -/////////////////////////////////////////////////////////////////////////// class FlushListener : public cppu::WeakImplHelper2 @@ -94,7 +93,6 @@ public: virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// class SpellCache : public Flushable @@ -123,9 +121,9 @@ public: bool CheckWord( const ::rtl::OUString& rWord, LanguageType nLang ); }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index 7814c7821aa9..ffdc36a01509 100644 --- a/linguistic/inc/linguistic/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,8 +39,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// - class HyphenatedWord : public cppu::WeakImplHelper1 < @@ -94,8 +93,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PossibleHyphens : public cppu::WeakImplHelper1 < @@ -141,11 +138,8 @@ public: const ::rtl::OUString &rHyphWord, const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions); }; - - -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/lngdllapi.h b/linguistic/inc/linguistic/lngdllapi.h index 5db6d4dbd799..265a11d8b51a 100644 --- a/linguistic/inc/linguistic/lngdllapi.h +++ b/linguistic/inc/linguistic/lngdllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ #define LNG_DLLPRIVATE SAL_DLLPRIVATE #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx index 879b67e46b50..18528eb465b0 100644 --- a/linguistic/inc/linguistic/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,7 +50,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { namespace linguistic { -/////////////////////////////////////////////////////////////////////////// // PropertyChgHelper // Base class for all XPropertyChangeListener members of the // various lingu services. @@ -58,7 +58,6 @@ namespace linguistic // Flags for type of events allowed to be launched #define AE_SPELLCHECKER 1 #define AE_HYPHENATOR 2 -//#define AE_THESAURUS 4 typedef cppu::WeakImplHelper2 < @@ -159,7 +158,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Thes : public PropertyChgHelper { @@ -203,8 +201,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PropertyHelper_Spell : public PropertyChgHelper { @@ -289,7 +285,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Hyphen : public PropertyChgHelper @@ -368,9 +363,8 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx index 68f599d50a8c..2b611d530ef8 100644 --- a/linguistic/inc/linguistic/lngprops.hxx +++ b/linguistic/inc/linguistic/lngprops.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 957fbd429b9f..4061701c1f66 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace frame { class LocaleDataWrapper; -/////////////////////////////////////////////////////////////////////////// + #define SN_GRAMMARCHECKER "com.sun.star.linguistic2.Proofreader" #define SN_GRAMMARCHECKINGITERATOR "com.sun.star.linguistic2.ProofreadingIterator" #define SN_SPELLCHECKER "com.sun.star.linguistic2.SpellChecker" @@ -76,7 +77,7 @@ namespace linguistic { // ascii to OUString conversion -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) +#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) /// Flags to be used with the multi-path related functions /// @see GetDictionaryPaths, GetLinguisticPaths @@ -93,14 +94,11 @@ namespace linguistic #define DIC_ERR_UNKNOWN 3 #define DIC_ERR_NOT_EXISTS 4 -/////////////////////////////////////////////////////////////////////////// LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex(); LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ); -/////////////////////////////////////////////////////////////////////////// - rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ); inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc) @@ -115,12 +113,8 @@ inline ByteString OU2BS(const ::rtl::OUString &rText, rtl_TextEncoding nEnc) rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ); -/////////////////////////////////////////////////////////////////////////// - sal_Int32 LevDistance( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ); -/////////////////////////////////////////////////////////////////////////// - ::com::sun::star::lang::Locale CreateLocale( LanguageType eLang ); @@ -137,8 +131,6 @@ LNG_DLLPUBLIC LanguageType LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > &rLocaleSeq ); -/////////////////////////////////////////////////////////////////////////// - // checks if file pointed to by rURL is readonly // and may also check return if such a file exists or not sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 ); @@ -146,15 +138,6 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 ); // checks if a file with the given URL exists sal_Bool FileExists( const String &rURL ); -#ifdef TL_OUTDATED -// returns complete file URL for given filename that is to be searched in -// the specified path -String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName ); - -String GetModulePath( SvtPathOptions::Pathes ePath, sal_Bool bAddAccessDelim = sal_True ); -#endif - -/////////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDictionaryWriteablePath(); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL ); @@ -165,12 +148,10 @@ String GetModulePath( SvtPathOptions::Pathes ePath, sal_Bool bAddAccessDelim = LNG_DLLPUBLIC String GetWritableDictionaryURL( const String &rDicName ); // looks for the specified file in the list of paths. -// In case of multiple occurences only the first found is returned. +// In case of multiple occurrences only the first found is returned. String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rPaths ); -/////////////////////////////////////////////////////////////////////////// - LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ); ::com::sun::star::uno::Reference< @@ -179,7 +160,6 @@ LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int3 ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); -/////////////////////////////////////////////////////////////////////////// LNG_DLLPUBLIC sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); LNG_DLLPUBLIC sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); @@ -195,7 +175,6 @@ sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage ); LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString &rText ); 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(); @@ -203,7 +182,6 @@ LNG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XProper ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, const ::com::sun::star::uno::Reference< @@ -228,12 +206,9 @@ LNG_DLLPUBLIC sal_uInt8 AddEntryToDic( LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList ); -/////////////////////////////////////////////////////////////////////////// -// // AppExitLstnr: // virtual base class that calls it AtExit function when the application // (ie the Desktop) is about to terminate -// class AppExitListener : public cppu::WeakImplHelper1 @@ -261,9 +236,8 @@ public: virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index aab68ac63eb7..81ff61791b30 100644 --- a/linguistic/inc/linguistic/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx index bc06ba5df311..0cf855ebe4f6 100644 --- a/linguistic/inc/pch/precompiled_linguistic.cxx +++ b/linguistic/inc/pch/precompiled_linguistic.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_linguistic.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx index 8f0a3f8c0291..e0e70ffb9bd9 100644 --- a/linguistic/inc/pch/precompiled_linguistic.hxx +++ b/linguistic/inc/pch/precompiled_linguistic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 2267a7d4c2fd..f6922dacc4fa 100644 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class ThesaurusMeaning : @@ -76,9 +76,9 @@ public: }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |