From 621299109c29c299919faae17586f6378ce758a3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 4 Oct 2010 15:43:59 +0100 Subject: harmonized BOOL vs sal_Bool usage --- linguistic/source/hyphdsp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 441d3ff449e9..9cc24be190d6 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -245,7 +245,7 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales() } -BOOL SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale) +sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); -- cgit From facd86ef9cdac2f0acab13a8b525f0bfb99cac28 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 4 Oct 2010 16:59:40 +0200 Subject: remove include guards using fixguard.py --- linguistic/source/convdiclist.cxx | 2 -- linguistic/source/convdicxml.cxx | 2 -- linguistic/source/dicimp.cxx | 0 linguistic/source/hhconvdic.cxx | 2 -- linguistic/workben/sspellimp.cxx | 2 -- 5 files changed, 8 deletions(-) mode change 100755 => 100644 linguistic/source/dicimp.cxx (limited to 'linguistic') diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 2916b2ee6eec..69371234eebd 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -42,9 +42,7 @@ #include #include #include -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include -#endif #include #include diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index f3d56f7024a9..7d5327e157aa 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -44,9 +44,7 @@ #include #include #include -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include -#endif #include #include #include diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 207284230b4c..fec31a54d91a 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -42,9 +42,7 @@ #include #include #include -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include -#endif #include #include "hhconvdic.hxx" diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 81981093e2f8..cb4d7c4de388 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -37,9 +37,7 @@ #include #include -#ifndef _SPELLIMP_HXX #include -#endif #include "lngprops.hxx" #include "spelldta.hxx" -- cgit From 8e2ae4afca72cda9aab8cfe4a5852c4202eed5a7 Mon Sep 17 00:00:00 2001 From: "J. Graeme Lingard" Date: Tue, 5 Oct 2010 22:17:11 +0100 Subject: Remove redundant #include directives & comments --- linguistic/source/lngsvcmgr.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 953e531960bf..ff3060172e84 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -40,8 +40,6 @@ #include #include -//#include - #include "misc.hxx" #include "defs.hxx" -- cgit From 90090c56845dcd942638a2852b9a09e3972d05d6 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 10 Oct 2010 21:29:05 -0500 Subject: merge vosremoval-thread patch --- linguistic/source/lngopt.cxx | 8 ++++---- linguistic/source/lngopt.hxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 77a1fcbd57b0..42fa463e8a0a 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::registry; // static member intialization SvtLinguOptions * LinguOptions::pData = NULL; -vos::ORefCount LinguOptions::aRefCount; +oslInterlockedCount LinguOptions::nRefCount; LinguOptions::LinguOptions() @@ -76,14 +76,14 @@ LinguOptions::LinguOptions() aLinguCfg.GetOptions( *pData ); } - ++aRefCount; + osl_incrementInterlockedCount( &nRefCount ); } LinguOptions::LinguOptions(const LinguOptions & /*rOpt*/) { DBG_ASSERT( pData, "lng : data missing" ); - ++aRefCount; + osl_incrementInterlockedCount( &nRefCount ); } @@ -91,7 +91,7 @@ LinguOptions::~LinguOptions() { MutexGuard aGuard( GetLinguMutex() ); - if (--aRefCount == 0) + if ( osl_decrementInterlockedCount( &nRefCount ) == 0 ) { delete pData; pData = NULL; } diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 7e86f31fc437..be3853fcc06c 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -68,7 +68,7 @@ namespace com { namespace sun { namespace star { class LinguOptions { static SvtLinguOptions *pData; - static vos::ORefCount aRefCount; // number of objects of this class + static oslInterlockedCount nRefCount; // number of objects of this class //! uses default assignment-operator -- cgit From 8694d2bc19ea6b531e85ac8135de34dc99956bca Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 12 Oct 2010 15:53:47 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- linguistic/inc/pch/precompiled_linguistic.cxx | 2 ++ linguistic/source/convdic.cxx | 2 ++ linguistic/source/convdiclist.cxx | 2 ++ linguistic/source/convdicxml.cxx | 2 ++ linguistic/source/dicimp.cxx | 2 ++ linguistic/source/dlistimp.cxx | 2 ++ linguistic/source/gciterator.cxx | 2 ++ linguistic/source/grammarchecker.cxx | 2 ++ linguistic/source/hhconvdic.cxx | 2 ++ linguistic/source/hyphdsp.cxx | 2 ++ linguistic/source/hyphdta.cxx | 2 ++ linguistic/source/iprcache.cxx | 2 ++ linguistic/source/lngopt.cxx | 2 ++ linguistic/source/lngprophelp.cxx | 2 ++ linguistic/source/lngreg.cxx | 2 ++ linguistic/source/lngsvcmgr.cxx | 2 ++ linguistic/source/misc.cxx | 2 ++ linguistic/source/misc2.cxx | 2 ++ linguistic/source/spelldsp.cxx | 2 ++ linguistic/source/spelldta.cxx | 2 ++ linguistic/source/thesdsp.cxx | 2 ++ linguistic/source/thesdta.cxx | 2 ++ linguistic/workben/sprophelp.cxx | 2 ++ linguistic/workben/sreg.cxx | 2 ++ linguistic/workben/sspellimp.cxx | 2 ++ 25 files changed, 50 insertions(+) (limited to 'linguistic') 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/source/convdic.cxx b/linguistic/source/convdic.cxx index 0b7245eb3019..c96a7484f38a 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.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. @@ -742,3 +743,4 @@ uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static() /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 69371234eebd..62c7426ba6eb 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.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. @@ -737,3 +738,4 @@ void * SAL_CALL ConvDicList_getFactory( /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 7d5327e157aa..c0fb8f4d876b 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.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. @@ -458,3 +459,4 @@ OUString SAL_CALL ConvDicXMLImport::getImplementationName() /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index fe53bf344ac3..f7f34694bfe9 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.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. @@ -1205,3 +1206,4 @@ OUString SAL_CALL DicEntry::getReplacementText( ) /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 817dbeb311ca..0cb5ea091bf8 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.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. @@ -967,3 +968,4 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg ) /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 6485e6e841b7..866a92b22bd6 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.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. @@ -1357,3 +1358,4 @@ sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 21e1b7a58a3c..3085ee54e0bc 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.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. @@ -324,3 +325,4 @@ void * SAL_CALL GrammarChecker_getFactory( const sal_Char * pImplName, lang::XMu return pRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index fec31a54d91a..43e4a0261e97 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.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. @@ -165,3 +166,4 @@ uno::Sequence< OUString > HHConvDic::getSupportedServiceNames_Static() /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 9cc24be190d6..ed647d3818bd 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.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. @@ -734,3 +735,4 @@ LinguDispatcher::DspType HyphenatorDispatcher::GetDspType() const /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 66c3ca3f7775..09860fe6dbf1 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.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. @@ -187,3 +188,4 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index e4c50686afcf..08d57c3ab784 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.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. @@ -282,3 +283,4 @@ void SpellCache::AddWord( const OUString& rWord, LanguageType nLang ) } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 42fa463e8a0a..d70aec887eab 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.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. @@ -709,3 +710,4 @@ void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 91b1a7ff8ebc..37d4d86198b0 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.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. @@ -715,3 +716,4 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals ) } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 6ab3db60d268..51c536061a06 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.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. @@ -196,3 +197,4 @@ void * SAL_CALL component_getFactory( /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 90e433f50f07..3d665b819f41 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.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. @@ -2040,3 +2041,4 @@ void * SAL_CALL LngSvcMgr_getFactory( /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 7fb35b26a908..8991095369f0 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.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. @@ -1007,3 +1008,4 @@ void SAL_CALL } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index df7bc2f9f636..82d77181ba83 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.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. @@ -298,3 +299,4 @@ String SearchFileInPaths( } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 2c9c99296ad7..6decf22ad198 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.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. @@ -869,3 +870,4 @@ void SpellCheckerDispatcher::FlushSpellCache() /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index cb7578f54852..b40c7ab8b14f 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.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. @@ -364,3 +365,4 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt ) } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 6bd61ef408dd..85b16efd4256 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.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. @@ -280,3 +281,4 @@ LinguDispatcher::DspType ThesaurusDispatcher::GetDspType() const /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index 85a57e000f3e..1a1846a856dc 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.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. @@ -81,3 +82,4 @@ uno::Sequence< OUString > SAL_CALL ThesaurusMeaning::querySynonyms() } // namespace linguistic +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 0a02bc22bb58..ced3e205dc96 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.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. @@ -370,3 +371,4 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index 21fa50246472..1fb80047fa11 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.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. @@ -83,3 +84,4 @@ void * SAL_CALL component_getFactory( /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index cb4d7c4de388..c8c80de16d8e 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.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. @@ -508,3 +509,4 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, /////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From b7c82daa28526c566047e158ab2ace522fc442dc Mon Sep 17 00:00:00 2001 From: Kayo Hamid Date: Thu, 14 Oct 2010 21:14:52 +0100 Subject: Switch to use SAL_N_ELEMENTS macro, everywhere --- linguistic/source/gciterator.cxx | 2 +- linguistic/source/lngopt.cxx | 2 +- linguistic/source/lngprophelp.cxx | 6 +++--- linguistic/source/misc.cxx | 2 +- linguistic/workben/sprophelp.cxx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 866a92b22bd6..ba1ce29e2337 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -138,7 +138,7 @@ static sal_Unicode aWhiteSpaces[] = 0xfffb /* INTERLINEAR ANNOTATION TERMINATOR */ }; -static int nWhiteSpaces = sizeof( aWhiteSpaces ) / sizeof( aWhiteSpaces[0] ); +static int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces ); static bool lcl_IsWhiteSpace( sal_Unicode cChar ) { diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index d70aec887eab..1f9a63071795 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -298,7 +298,7 @@ OUString LinguOptions::GetName( INT32 nWID ) OUString aRes; - INT32 nLen = sizeof( aWID_Name ) / sizeof( aWID_Name[0] ); + INT32 nLen = SAL_N_ELEMENTS( aWID_Name ); if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID) { diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 37d4d86198b0..7a13b36b1f71 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -64,7 +64,7 @@ static const char *aCH[] = UPN_IS_USE_DICTIONARY_LIST, }; -static int nCHCount = sizeof(aCH) / sizeof(aCH[0]); +static int nCHCount = SAL_N_ELEMENTS(aCH); PropertyChgHelper::PropertyChgHelper( @@ -389,7 +389,7 @@ PropertyHelper_Spell::PropertyHelper_Spell( Reference< XPropertySet > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_SPELLCHECKER ) { - AddPropNames( aSP, sizeof(aSP) / sizeof(aSP[0]) ); + AddPropNames( aSP, SAL_N_ELEMENTS(aSP)); SetDefaultValues(); GetCurrentValues(); @@ -577,7 +577,7 @@ PropertyHelper_Hyphen::PropertyHelper_Hyphen( Reference< XPropertySet > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_HYPHENATOR ) { - AddPropNames( aHP, sizeof(aHP) / sizeof(aHP[0]) ); + AddPropNames( aHP, SAL_N_ELEMENTS(aHP)); SetDefaultValues(); GetCurrentValues(); } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 8991095369f0..0568fab4bdfe 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -836,7 +836,7 @@ static const sal_uInt32 the_aDigitZeroes [] = BOOL HasDigits( const OUString &rText ) { - static const int nNumDigitZeroes = sizeof(the_aDigitZeroes) / sizeof(the_aDigitZeroes[0]); + static const int nNumDigitZeroes = SAL_N_ELEMENTS(the_aDigitZeroes); const sal_Int32 nLen = rText.getLength(); sal_Int32 i = 0; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index ced3e205dc96..d2ac04abb714 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -193,7 +193,7 @@ static const char *aSP[] = PropertyHelper_Spell::PropertyHelper_Spell( const Reference< XInterface > & rxSource, Reference< XPropertySet > &rxPropSet ) : - PropertyChgHelper ( rxSource, rxPropSet, aSP, sizeof(aSP) / sizeof(aSP[0]) ) + PropertyChgHelper ( rxSource, rxPropSet, aSP, SAL_N_ELEMENTS(aSP)) { SetDefault(); INT32 nLen = GetPropNames().getLength(); -- cgit From c63d5210fd85cf8ec41c29f8fc17d39c676726be Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 14 Oct 2010 22:33:33 +0100 Subject: add lots more missing sal/macros.h includes --- linguistic/source/gciterator.cxx | 1 + linguistic/source/lngopt.cxx | 1 + linguistic/source/lngprophelp.cxx | 1 + linguistic/source/misc.cxx | 1 + linguistic/workben/sprophelp.cxx | 1 + 5 files changed, 5 insertions(+) (limited to 'linguistic') diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index ba1ce29e2337..2519aa0cea89 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "precompiled_linguistic.hxx" +#include #include #include #include diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 1f9a63071795..179c61d6e934 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_linguistic.hxx" +#include #include "lngopt.hxx" #include "lngprops.hxx" #include "misc.hxx" diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 7a13b36b1f71..cb9ff6b6ceb5 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -30,6 +30,7 @@ #include "precompiled_linguistic.hxx" #include +#include #include #include diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 0568fab4bdfe..7a2d69a72a67 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_linguistic.hxx" +#include #include #include #include diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index d2ac04abb714..4bf29bf1e0b0 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_linguistic.hxx" +#include #include "misc.hxx" #include "sprophelp.hxx" -- cgit From c17635d5752c010405efba458cfb3a98f5afaf75 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Oct 2010 03:18:35 -0500 Subject: merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually --- linguistic/source/thesdsp.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index e7eeeff120ee..f79ad08e0caa 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -45,7 +45,7 @@ #include // helper for implementations #include -#include +#include #include #include -- cgit From 119873328acd70ca3569c21a0b1fe36277e8bf4c Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 21 Oct 2010 15:34:02 -0500 Subject: convert vos/process.hxx and related API --- linguistic/source/lngopt.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index be3853fcc06c..e800aa374086 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -47,7 +47,6 @@ #include #include "misc.hxx" #include "defs.hxx" -#include namespace com { namespace sun { namespace star { namespace beans { -- cgit From 1df23c08d442cc3e5d3714b54b8d5ab73327b954 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 21 Oct 2010 16:02:40 -0500 Subject: Finally, gut the vos module out of the build --- linguistic/prj/build.lst | 2 +- linguistic/source/makefile.mk | 1 - linguistic/workben/makefile.mk | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'linguistic') diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index 57c332f6f3ea..8b17240c316d 100644 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -1,4 +1,4 @@ -lg linguistic : svl xmloff ucbhelper vos comphelper ICU:icu NULL +lg linguistic : svl xmloff ucbhelper comphelper ICU:icu NULL lg linguistic usr1 - all lg_mkout NULL lg linguistic\prj get - all lg_prj NULL lg linguistic\inc nmake - all lg_inc NULL diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 3f68afb30575..47c8ef334b88 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -65,7 +65,6 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(SVLLIB) \ diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk index 26cbb7ec8d65..6c04929d7b73 100644 --- a/linguistic/workben/makefile.mk +++ b/linguistic/workben/makefile.mk @@ -77,7 +77,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ -- cgit From 758c8774fbbd09c4202c0744c06945e3cf7e1a99 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Oct 2010 13:11:31 +0100 Subject: add modelines to .hxx files as well --- linguistic/inc/hyphdta.hxx | 2 ++ linguistic/inc/iprcache.hxx | 2 ++ linguistic/inc/lngprophelp.hxx | 2 ++ linguistic/inc/lngprops.hxx | 2 ++ linguistic/inc/misc.hxx | 2 ++ linguistic/inc/pch/precompiled_linguistic.hxx | 2 ++ linguistic/inc/spelldta.hxx | 2 ++ linguistic/inc/thesdta.hxx | 2 ++ linguistic/source/convdic.hxx | 2 ++ linguistic/source/convdiclist.hxx | 2 ++ linguistic/source/convdicxml.hxx | 2 ++ linguistic/source/defs.hxx | 2 ++ linguistic/source/dicimp.hxx | 2 ++ linguistic/source/dlistimp.hxx | 2 ++ linguistic/source/gciterator.hxx | 2 ++ linguistic/source/grammarchecker.hxx | 2 ++ linguistic/source/hhconvdic.hxx | 2 ++ linguistic/source/hyphdsp.hxx | 2 ++ linguistic/source/lngopt.hxx | 2 ++ linguistic/source/lngsvcmgr.hxx | 2 ++ linguistic/source/spelldsp.hxx | 2 ++ linguistic/source/thesdsp.hxx | 2 ++ linguistic/workben/sprophelp.hxx | 2 ++ linguistic/workben/sspellimp.hxx | 2 ++ 24 files changed, 48 insertions(+) (limited to 'linguistic') diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/hyphdta.hxx index 167c11dcc65d..76806a740fee 100644 --- a/linguistic/inc/hyphdta.hxx +++ b/linguistic/inc/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. @@ -144,3 +145,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 842747a723cb..06241d4cd2d6 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. @@ -129,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/lngprophelp.hxx index 18d125af560e..45dd77a7f876 100644 --- a/linguistic/inc/lngprophelp.hxx +++ b/linguistic/inc/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. @@ -286,3 +287,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx index 68f599d50a8c..2b611d530ef8 100644 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/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/misc.hxx b/linguistic/inc/misc.hxx index f40a0ae55803..87a8dd06173a 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/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. @@ -267,3 +268,4 @@ public: #endif +/* 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/spelldta.hxx b/linguistic/inc/spelldta.hxx index f4d0f5c660ce..f91675fb0824 100644 --- a/linguistic/inc/spelldta.hxx +++ b/linguistic/inc/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. @@ -132,3 +133,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 1b262ab73da7..ea4d7cc89991 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. @@ -82,3 +83,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index c0a22da8a1f1..487c66898de9 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.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. @@ -177,3 +178,4 @@ inline ::rtl::OUString ConvDic::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index d1c0740d991f..3e9d282bad34 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.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. @@ -120,3 +121,4 @@ inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index eca7e9e48ce6..4d95d3dc4207 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.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. @@ -132,3 +133,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index b888d86f8720..a84af59df42a 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.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/source/dicimp.hxx b/linguistic/source/dicimp.hxx index eca18c2166d3..a4dcfc8772b8 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.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. @@ -236,3 +237,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index c93cd6b907c6..90bf1e6077ce 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.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. @@ -149,3 +150,4 @@ inline ::rtl::OUString DicList::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 95105c7d29c9..4707088a7cfb 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.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. @@ -207,3 +208,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx index 8eee8f4c93f9..e3f8ae352554 100644 --- a/linguistic/source/grammarchecker.hxx +++ b/linguistic/source/grammarchecker.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. @@ -106,3 +107,4 @@ inline ::rtl::OUString GrammarChecker::getImplementationName_Static() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 9bdecf0903fc..8df55f635bbb 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.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. @@ -76,3 +77,4 @@ inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index a722e9046c3c..490291874b19 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.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. @@ -170,3 +171,4 @@ inline ::com::sun::star::uno::Reference< #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index e800aa374086..abb7a5a6ea19 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.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. @@ -183,3 +184,4 @@ inline ::rtl::OUString LinguProps::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index ff3060172e84..186fc3eb4f9e 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.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. @@ -195,3 +196,4 @@ inline ::rtl::OUString LngSvcMgr::getImplementationName_Static() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 28807ac7a800..25643d0f9567 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.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. @@ -161,3 +162,4 @@ inline ::com::sun::star::uno::Reference< #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index f79ad08e0caa..48a8e0e65c60 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.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. @@ -127,3 +128,4 @@ inline ::com::sun::star::uno::Reference< #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index 92e25e88f221..fc8798bff215 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.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. @@ -170,3 +171,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index df37c403572f..ad3a2d0708db 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.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. @@ -175,3 +176,4 @@ inline OUString SpellChecker::getImplementationName_Static() throw() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From e62fba7934dc5ae51c61940a157c485649378597 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Nov 2010 11:23:45 +0000 Subject: RTL_CONSTASCII_USTRINGPARAM used with nonarray --- linguistic/source/lngopt.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 179c61d6e934..4e102bf1aaa6 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -300,16 +300,10 @@ OUString LinguOptions::GetName( INT32 nWID ) OUString aRes; INT32 nLen = SAL_N_ELEMENTS( aWID_Name ); - if (0 <= nWID && nWID < nLen - && aWID_Name[ nWID ].nWID == nWID) - { - aRes = OUString( RTL_CONSTASCII_USTRINGPARAM( - aWID_Name[ nWID ].pPropertyName ) ); - } + if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID) + aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName); else - { - DBG_ASSERT( 0,"lng : unknown WID"); - } + OSL_ENSURE(false, "lng : unknown WID"); return aRes; } -- cgit From 2e2cc395380398f4bd2de52eac08259b34884c85 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Fri, 19 Nov 2010 20:00:25 +0100 Subject: TL_CONSTASCII_USTRINGPARAM in libs core 22 --- linguistic/source/convdic.cxx | 2 +- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/gciterator.cxx | 2 +- linguistic/source/grammarchecker.cxx | 6 +++--- linguistic/source/lngsvcmgr.cxx | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index c96a7484f38a..434ed1b368c8 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -305,7 +305,7 @@ void ConvDic::Save() { xSaxWriter = uno::Reference< io::XActiveDataSource >( xServiceFactory->createInstance( - OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ), UNO_QUERY ); } catch (uno::Exception &) { diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 62c7426ba6eb..3f17d8f43da5 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -320,7 +320,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) { ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 2519aa0cea89..d1627898637c 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -792,7 +792,7 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); if ( xMSF.is() ) xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ), uno::UNO_QUERY ); } sal_Int32 nTextLen = rText.getLength(); sal_Int32 nEndPosition = nTextLen; diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 3085ee54e0bc..bf782c0579fd 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -163,10 +163,10 @@ uno::Sequence< linguistic2::SingleGrammarError > GrammarChecker::GrammarChecking Error_t aError; uno::Sequence< OUString > aSuggestion(1); OUString *pSeggestion = aSuggestion.getArray(); - pSeggestion[0] = OUString::createFromAscii("Modified"); + pSeggestion[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Modified")); - aError[OUString::createFromAscii("GrammarError")] = aSuggestion; - aError[OUString::createFromAscii("Grammar Error")] = aSuggestion; + aError[OUString(RTL_CONSTASCII_USTRINGPARAM("GrammarError"))] = aSuggestion; + aError[OUString(RTL_CONSTASCII_USTRINGPARAM("Grammar Error"))] = aSuggestion; typedef std::vector< linguistic2::SingleGrammarError> ErrorVector_t; ErrorVector_t aErrorVector; diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 3d665b819f41..136d85d6bf27 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1795,7 +1795,7 @@ uno::Sequence< OUString > SAL_CALL OUString *pNames = aNames.getArray(); if ( 0 == rServiceName.compareToAscii( SN_SPELLCHECKER ) ) { - OUString aNode( OUString::createFromAscii( "ServiceManager/SpellCheckerList" )); + OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/SpellCheckerList")); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1810,7 +1810,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ) ) { - OUString aNode( OUString::createFromAscii( "ServiceManager/GrammarCheckerList" )); + OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/GrammarCheckerList")); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1825,7 +1825,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_HYPHENATOR ) ) { - OUString aNode( OUString::createFromAscii( "ServiceManager/HyphenatorList" )); + OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/HyphenatorList")); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1840,7 +1840,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_THESAURUS ) ) { - OUString aNode( OUString::createFromAscii( "ServiceManager/ThesaurusList" )); + OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/ThesaurusList")); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { -- cgit From 0b30cb7e66e0cef4f6f75013eb182c2d58615ca1 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 4 Dec 2010 13:16:21 +0900 Subject: Replace all occured, occurance etc. --- linguistic/inc/misc.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 87a8dd06173a..676046c799e1 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -166,7 +166,7 @@ String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim = TRUE 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 ); -- cgit From 9adaeb8d7a49d36ae2bb691225a1ae3213b06dab Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Dec 2010 12:21:32 +0000 Subject: cppcheck: can remove this code and these variables --- linguistic/source/lngsvcmgr.cxx | 30 ++++-------------------------- linguistic/source/lngsvcmgr.hxx | 4 ---- 2 files changed, 4 insertions(+), 30 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 136d85d6bf27..47010171da93 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -579,10 +579,6 @@ LngSvcMgr::LngSvcMgr() : utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ), aEvtListeners ( GetLinguMutex() ) { - bHasAvailSpellLocales = - bHasAvailGrammarLocales = - bHasAvailHyphLocales = - bHasAvailThesLocales = bDisposing = FALSE; pSpellDsp = 0; @@ -1470,39 +1466,21 @@ uno::Sequence< lang::Locale > SAL_CALL uno::Sequence< lang::Locale > aRes; uno::Sequence< lang::Locale > *pAvailLocales = NULL; - BOOL *pHasAvailLocales = NULL; if (0 == rServiceName.compareToAscii( SN_SPELLCHECKER )) - { pAvailLocales = &aAvailSpellLocales; - pHasAvailLocales = &bHasAvailSpellLocales; - } else if (0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER )) - { pAvailLocales = &aAvailGrammarLocales; - pHasAvailLocales = &bHasAvailGrammarLocales; - } else if (0 == rServiceName.compareToAscii( SN_HYPHENATOR )) - { pAvailLocales = &aAvailHyphLocales; - pHasAvailLocales = &bHasAvailHyphLocales; - } else if (0 == rServiceName.compareToAscii( SN_THESAURUS )) - { pAvailLocales = &aAvailThesLocales; - pHasAvailLocales = &bHasAvailThesLocales; - } - // about pHasAvailLocales: nowadays (with OOo lingu in SO) we want to know immediately about + // Nowadays (with OOo lingu in SO) we want to know immediately about // new downloaded dictionaries and have them ready right away if the Tools/Options... // is used to activate them. Thus we can not rely anymore on buffered data. - if (pAvailLocales /*&& pHasAvailLocales */) - { -// if (!*pHasAvailLocales) -// { - *pAvailLocales = GetAvailLocales( - getAvailableServices( rServiceName, lang::Locale() ) ); -// *pHasAvailLocales = TRUE; -// } + if (pAvailLocales) + { + *pAvailLocales = GetAvailLocales(getAvailableServices(rServiceName, lang::Locale())); aRes = *pAvailLocales; } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 186fc3eb4f9e..a7057daf079f 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -112,10 +112,6 @@ class LngSvcMgr : SvcInfoArray * pAvailThesSvcs; BOOL bDisposing; - BOOL bHasAvailSpellLocales; - BOOL bHasAvailGrammarLocales; - BOOL bHasAvailHyphLocales; - BOOL bHasAvailThesLocales; // disallow copy-constructor and assignment-operator for now LngSvcMgr(const LngSvcMgr &); -- cgit From d9b52710a9b8f2e66afbb7fb35de044b16afd7ab Mon Sep 17 00:00:00 2001 From: serval Date: Wed, 22 Dec 2010 16:19:29 +0000 Subject: RTL_CONSTASCII_USTRINGPARAM --- linguistic/source/defs.hxx | 2 -- linguistic/workben/sprophelp.cxx | 4 ++-- linguistic/workben/sspellimp.hxx | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index a84af59df42a..a7af9e7ba6a1 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -41,8 +41,6 @@ class SvStream; /////////////////////////////////////////////////////////////////////////// -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) - typedef boost::shared_ptr< SvStream > SvStreamPtr; namespace css = ::com::sun::star; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 4bf29bf1e0b0..26480de208d8 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -53,7 +53,7 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) +#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) /////////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ PropertyChgHelper::PropertyChgHelper( OUString *pName = aPropNames.getArray(); for (INT32 i = 0; i < nPropCount; ++i) { - pName[i] = A2OU( pPropNames[i] ); + pName[i] = ::rtl::OUString::createFromAscii( pPropNames[i] ); } } diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index ad3a2d0708db..ebded3b83905 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -52,9 +52,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; - -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) - /////////////////////////////////////////////////////////////////////////// @@ -168,7 +165,7 @@ public: inline OUString SpellChecker::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu.examples.SpellChecker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" )); } -- cgit From 52b91b63035eb7c45e6fce2803541f552326863a Mon Sep 17 00:00:00 2001 From: serval Date: Wed, 22 Dec 2010 21:33:57 +0000 Subject: RTL_CONSTASCII_USTRINGPARAM --- linguistic/inc/misc.hxx | 2 +- linguistic/source/iprcache.cxx | 4 ++-- linguistic/source/lngprophelp.cxx | 5 +++-- linguistic/source/lngsvcmgr.cxx | 2 +- linguistic/source/misc.cxx | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'linguistic') diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 676046c799e1..9cdc8dffbc14 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -77,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 diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 08d57c3ab784..f689534d1290 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -100,7 +100,7 @@ static void lcl_AddAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->addPropertyChangeListener( - A2OU(aFlushProperties[i].pPropName), xListener ); + ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } @@ -115,7 +115,7 @@ static void lcl_RemoveAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->removePropertyChangeListener( - A2OU(aFlushProperties[i].pPropName), xListener ); + ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index cb9ff6b6ceb5..5f45aa595c1a 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -82,7 +82,7 @@ PropertyChgHelper::PropertyChgHelper( OUString *pName = aPropNames.getArray(); for (INT32 i = 0; i < nCHCount; ++i) { - pName[i] = A2OU( aCH[i] ); + pName[i] = ::rtl::OUString::createFromAscii( aCH[i] ); } SetDefaultValues(); @@ -119,7 +119,8 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount ) OUString *pName = GetPropNames().getArray(); for (INT32 i = 0; i < nCount; ++i) { - pName[ nLen + i ] = A2OU( pNewNames[ i ] ); + pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] ); + } } } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 47010171da93..9811263648fc 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1653,7 +1653,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName ) { DBG_ASSERT( 0, "node name missing" ); } - OUString aNodeName( A2OU(pNodeName) ); + OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) ); for (INT32 i = 0; i < nLen; ++i) { diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 7a2d69a72a67..5a8084eb2f6a 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -892,7 +892,7 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName ) { try { - xRef = xMgr->createInstance( A2OU( pServiceName ) ); + xRef = xMgr->createInstance( ::rtl::OUString::createFromAscii( pServiceName ) ); } catch (uno::Exception &) { -- cgit From f5334930664b89fb3c68dd0b5f7d49d51dcce055 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 17 Jan 2011 10:42:03 +0000 Subject: equalsAsciiL faster than equalsAscii --- linguistic/source/convdic.cxx | 2 +- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/convdicxml.cxx | 16 ++++++++-------- linguistic/source/hhconvdic.cxx | 4 ++-- linguistic/source/lngprophelp.cxx | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 434ed1b368c8..f0988a04b2ad 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -718,7 +718,7 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName ) { MutexGuard aGuard( GetLinguMutex() ); sal_Bool bRes = sal_False; - if (rServiceName.equalsAscii( SN_CONV_DICTIONARY )) + if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY))) bRes = sal_True; return bRes; } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 3f17d8f43da5..4b97711cb24d 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -661,7 +661,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return rServiceName.equalsAscii( SN_CONV_DICTIONARY_LIST ); + return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY_LIST)); } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index c0fb8f4d876b..dc16529d806e 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -224,7 +224,7 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "text-conversion-dictionary" )) + if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) pContext = new ConvDicXMLDictionaryContext_Impl( GetConvDicImport(), nPrefix, rLocalName ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -245,9 +245,9 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "lang" )) + if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lang"))) nLanguage = MsLangId::convertIsoStringToLanguage( aValue ); - else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "conversion-type" )) + else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("conversion-type"))) nConversionType = GetConversionTypeFromText( aValue ); } GetConvDicImport().SetLanguage( nLanguage ); @@ -264,7 +264,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "entry" )) + if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("entry"))) pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -278,7 +278,7 @@ SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "right-text" )) + if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("right-text"))) pContext = new ConvDicXMLRightTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -297,9 +297,9 @@ void ConvDicXMLEntryTextContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "left-text" )) + if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("left-text"))) aLeftText = aValue; - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "property-type" )) + if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("property-type"))) nPropertyType = (sal_Int16) aValue.toInt32(); } } @@ -443,7 +443,7 @@ SvXMLImportContext * ConvDicXMLImport::CreateContext( const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "text-conversion-dictionary" )) + if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) pContext = new ConvDicXMLDictionaryContext_Impl( *this, nPrefix, rLocalName ); else pContext = new SvXMLImportContext( *this, nPrefix, rLocalName ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 43e4a0261e97..4954cae3a811 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -140,8 +140,8 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName ) { MutexGuard aGuard( GetLinguMutex() ); sal_Bool bRes = sal_False; - if (rServiceName.equalsAscii( SN_CONV_DICTIONARY )|| - rServiceName.equalsAscii( SN_HH_CONV_DICTIONARY )) + if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)) || + rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_HH_CONV_DICTIONARY))) bRes = sal_True; return bRes; } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 5f45aa595c1a..5f93135dc818 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -537,7 +537,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) const PropertyValue *pVal = rPropVals.getConstArray(); for (INT32 i = 0; i < nLen; ++i) { - if (pVal[i].Name.equalsAscii( UPN_MAX_NUMBER_OF_SUGGESTIONS )) + if (pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UPN_MAX_NUMBER_OF_SUGGESTIONS))) { pVal[i].Value >>= nResMaxNumberOfSuggestions; } -- cgit From 8c8478ff36a79e58c29ebdb092ba36ebe5535fbb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Jan 2011 10:21:18 +0000 Subject: WaE: gcc 4.6.0 various warnings --- linguistic/source/convdic.cxx | 8 -------- 1 file changed, 8 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index f0988a04b2ad..5285dc41ad37 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -111,8 +111,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xIn ) ); - ULONG nError = sal::static_int_cast< ULONG >(-1); - // prepare ParserInputSource xml::sax::InputSource aParserInput; aParserInput.aInputStream = xIn; @@ -145,18 +143,12 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) try { xParser->parseStream( aParserInput ); // implicitly calls ConvDicXMLImport::CreateContext - if (rImport.GetSuccess()) - nError = 0; } catch( xml::sax::SAXParseException& ) { -// if( bEncrypted ) -// nError = ERRCODE_SFX_WRONGPASSWORD; } catch( xml::sax::SAXException& ) { -// if( bEncrypted ) -// nError = ERRCODE_SFX_WRONGPASSWORD; } catch( io::IOException& ) { -- cgit From e13627acb1e7b60e56110cf9a471bf1ddf141607 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 31 Jan 2011 09:47:31 +0100 Subject: Remove unused DBG_STATISTIC, IPR_CACHE_MAX and IPR_CACHE_MAXINPUT --- linguistic/source/iprcache.cxx | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index f689534d1290..9ad7001fe676 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -37,27 +37,7 @@ #include #include #include - -//#define IPR_DEF_CACHE_SIZE 503 -#define IPR_DEF_CACHE_MAX 375 -#define IPR_DEF_CACHE_MAXINPUT 200 - -#ifdef DBG_STATISTIC -#include - -//#define IPR_CACHE_SIZE nTblSize -#define IPR_CACHE_MAX nMax -#define IPR_CACHE_MAXINPUT nMaxInput - -#else - -//#define IPR_CACHE_SIZE IPR_DEF_CACHE_SIZE -#define IPR_CACHE_MAX IPR_DEF_CACHE_MAX -#define IPR_CACHE_MAXINPUT IPR_DEF_CACHE_MAXINPUT - -#endif #include - #include using namespace utl; -- cgit From 98df445a7d1a24e3c01381a5debea1ce58bb5cf4 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:48:50 +0100 Subject: Clean up makefiles --- linguistic/source/makefile.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 47c8ef334b88..da6277db15d8 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -78,7 +78,6 @@ SHL1STDLIBS= \ SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEPN= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -#SHL1VERSIONMAP= $(TARGET).map SHL1IMPLIB= ilng # build DEF file @@ -86,7 +85,6 @@ DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt DEFLIB1NAME =$(TARGET) DEF1DES =Linguistic main DLL -#DEF1EXPORTFILE= exports.dxp .IF "$(GUI)"=="WNT" @@ -97,7 +95,6 @@ DEF1EXPORT3 = component_getImplementationEnvironment # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk -- cgit From bb564bec137f76dfa099a1cdda3cf39367a6fe50 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sat, 5 Feb 2011 13:18:52 +0100 Subject: migrate to use boost unordered containers --- linguistic/source/convdic.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 487c66898de9..d3ef70feb386 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include "misc.hxx" @@ -73,12 +73,12 @@ struct StrEQ } }; -typedef std::hash_multimap< const rtl::OUString, rtl::OUString, +typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString, const rtl::OUStringHash, StrEQ > ConvMap; typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; -typedef std::hash_multimap< const rtl::OUString, sal_Int16, +typedef boost::unordered_multimap< const rtl::OUString, sal_Int16, rtl::OUStringHash, StrEQ > PropTypeMap; /////////////////////////////////////////////////////////////////////////// -- cgit From 06fc1ee4c4ee8de3a4d758cbca761a5e80a0873f Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 7 Feb 2011 23:31:30 +0100 Subject: Remove dead code. Mostly unused namespaces --- linguistic/source/convdiclist.cxx | 3 --- linguistic/source/dlistimp.cxx | 2 -- linguistic/source/hyphdta.cxx | 2 -- linguistic/source/lngprophelp.cxx | 2 -- linguistic/source/thesdta.cxx | 1 - linguistic/workben/sprophelp.cxx | 1 - 6 files changed, 11 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 4b97711cb24d..cf1364ddf3dc 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -55,7 +55,6 @@ #include "misc.hxx" #include "defs.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; @@ -544,8 +543,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( { MutexGuard aGuard( GetLinguMutex() ); - /*INT16 nLang = LocaleToLanguage( rLocale );*/ - INT32 nCount = 0; uno::Sequence< OUString > aRes( 20 ); OUString *pRes = aRes.getArray(); diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 0cb5ea091bf8..b4a51de2dc25 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -60,7 +60,6 @@ #include "dicimp.hxx" #include "lngopt.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; @@ -184,7 +183,6 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( || xDicEntry.is(), "lng : missing dictionary entry" ); - /*BOOL bActiveDicsModified = FALSE;*/ // // evaluate DictionaryEvents and update data for next DictionaryListEvent // diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 09860fe6dbf1..364ccad150f5 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -40,11 +40,9 @@ #include #include -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; -//using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 5f93135dc818..4613faa3f16a 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -43,8 +43,6 @@ #include - -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index 1a1846a856dc..46880f41862b 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -35,7 +35,6 @@ #include "thesdta.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 26480de208d8..9a81205def23 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -42,7 +42,6 @@ #include #include -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; -- cgit From 123ada6af7bd336aa07260646ee0adca33c8cbbc Mon Sep 17 00:00:00 2001 From: Rob Snelders Date: Tue, 8 Feb 2011 20:59:20 +0100 Subject: translated comments --- linguistic/source/dicimp.cxx | 12 ++++++------ linguistic/source/dlistimp.cxx | 2 +- linguistic/source/grammarchecker.cxx | 2 +- linguistic/source/lngopt.cxx | 2 +- linguistic/source/lngprophelp.cxx | 4 ++-- linguistic/source/lngsvcmgr.cxx | 2 +- linguistic/workben/sprophelp.cxx | 2 +- linguistic/workben/sspellimp.cxx | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index f7f34694bfe9..9a44092bd86d 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -298,7 +298,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL) ULONG nErr = sal::static_int_cast< ULONG >(-1); - // Header einlesen + // read header BOOL bNegativ; USHORT nLang; nDicVersion = ReadDicVersion(pStream, nLang, bNegativ); @@ -321,7 +321,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL) USHORT nLen = 0; sal_Char aWordBuf[ BUFSIZE ]; - // Das erste Wort einlesen + // Read the first word if (!pStream->IsEof()) { *pStream >> nLen; @@ -338,8 +338,8 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL) while(!pStream->IsEof()) { - // Aus dem File einlesen - // Einfuegen ins Woerterbuch ohne Konvertierung + // Read from file + // Paste in dictionary without converting if(*aWordBuf) { ByteString aDummy( aWordBuf ); @@ -350,7 +350,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL) } *pStream >> nLen; - if (pStream->IsEof()) // #75082# GPF in online-spelling + if (pStream->IsEof()) break; if (0 != (nErr = pStream->GetError())) return nErr; @@ -493,7 +493,7 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL) pVerStr = pVerStr6; else pVerStr = eDicType == DictionaryType_POSITIVE ? pVerStr2 : pVerStr5; - strcpy( aWordBuf, pVerStr ); // #100211# - checked + strcpy( aWordBuf, pVerStr ); USHORT nLen = sal::static_int_cast< USHORT >(strlen( aWordBuf )); *pStream << nLen; if (0 != (nErr = pStream->GetError())) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index b4a51de2dc25..85325e7105cd 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -790,7 +790,7 @@ uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw( { osl::MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< rtl::OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + uno::Sequence< rtl::OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( SN_DICTIONARY_LIST ); return aSNS; } diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index bf782c0579fd..3837ceaa32e7 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -260,7 +260,7 @@ uno::Sequence< OUString > GrammarChecker::getSupportedServiceNames_Static( ) th { //osl::Guard< osl::Mutex > aGuard(GetMutex()); - uno::Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( "com.sun.star.linguistic2.GrammarChecker" );//SN_LINGU_SERVCICE_MANAGER return aSNS; } diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 4e102bf1aaa6..2056e4d1b4d6 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -656,7 +656,7 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static() { MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( SN_LINGU_PROPERTIES ); return aSNS; } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 4613faa3f16a..b432bf1e5fa2 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -528,7 +528,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) nResMaxNumberOfSuggestions = GetDefaultNumberOfSuggestions(); bResIsSpellWithDigits = bIsSpellWithDigits; bResIsSpellCapitalization = bIsSpellCapitalization; - // + INT32 nLen = rPropVals.getLength(); if (nLen) { @@ -690,7 +690,7 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals ) nResHyphMinLeading = nHyphMinLeading; nResHyphMinTrailing = nHyphMinTrailing; nResHyphMinWordLength = nHyphMinWordLength; - // + INT32 nLen = rPropVals.getLength(); if (nLen) { diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 9811263648fc..8bdfd2d3dada 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1955,7 +1955,7 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static() { osl::MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( SN_LINGU_SERVCICE_MANAGER ); return aSNS; } diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 9a81205def23..8d01ec4fa0bf 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -344,7 +344,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) bResIsSpellUpperCase = bIsSpellUpperCase; bResIsSpellWithDigits = bIsSpellWithDigits; bResIsSpellCapitalization = bIsSpellCapitalization; - // + INT32 nLen = rPropVals.getLength(); if (nLen) { diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index c8c80de16d8e..244930d70c25 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -457,7 +457,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() { MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich + Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER ); return aSNS; } -- cgit From 31b0769d2c6d58bbd2e067ee88fd5f45f518182f Mon Sep 17 00:00:00 2001 From: Rob Snelders Date: Thu, 10 Feb 2011 09:59:21 +0000 Subject: translate comments --- linguistic/source/dlistimp.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 85325e7105cd..2485153f3f98 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -345,7 +345,7 @@ void DicList::SearchForDictionaries( if(!::IsVers2OrNewer( aURL, nLang, bNeg )) { - // Wenn kein + // When not xub_StrLen nPos = aURL.Search('.'); String aExt(aURL.Copy(nPos + 1)); aExt.ToLowerAscii(); @@ -358,9 +358,8 @@ void DicList::SearchForDictionaries( continue; // andere Files } - // Aufnehmen in die Liste der Dictionaries - // Wenn existent nicht aufnehmen - // + // Record in the list of Dictoinaries + // When it already exists don't record INT16 nSystemLanguage = MsLangId::getSystemLanguage(); String aTmp1 = ToLower( aURL, nSystemLanguage ); xub_StrLen nPos = aTmp1.SearchBackward( '/' ); -- cgit From d5303f2b25bf849fce2eda37f3f5082a18afe15c Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 15 Feb 2011 00:56:25 +0100 Subject: Remove TL_OUTDATED --- linguistic/inc/misc.hxx | 8 ------ linguistic/source/misc2.cxx | 63 --------------------------------------------- 2 files changed, 71 deletions(-) (limited to 'linguistic') diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 9cdc8dffbc14..3a369e574217 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -147,14 +147,6 @@ BOOL IsReadOnly( const String &rURL, BOOL *pbExist = 0 ); // checks if a file with the given URL exists 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, BOOL bAddAccessDelim = TRUE ); -#endif - /////////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDictionaryWriteablePath(); diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 82d77181ba83..d6b83a9ceca2 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -72,69 +72,6 @@ BOOL FileExists( const String &rMainURL ) return bExists; } - -#ifdef TL_OUTDATED - -String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName ) -{ - String aURL; - if (rFileName.Len()) - { - INetURLObject aURLObj; - aURLObj.SetSmartProtocol( INET_PROT_FILE ); - aURLObj.SetSmartURL( GetModulePath(ePath) ); - aURLObj.Append( rFileName ); - if (aURLObj.HasError()) - { - DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); - } - aURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); - } - return aURL; -} - - -String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim ) -{ - String aRes; - - SvtPathOptions aPathOpt; - switch (ePath) - { - case SvtPathOptions::PATH_MODULE : - aRes = aPathOpt.GetModulePath(); - break; - case SvtPathOptions::PATH_LINGUISTIC : - { - String aTmp( aPathOpt.GetLinguisticPath() ); - utl::LocalFileHelper::ConvertURLToPhysicalName( aTmp, aRes ); - break; - } -/* - case SvtPathOptions::PATH_USERDICTIONARY : - { - String aTmp( aPathOpt.GetUserDictionaryPath() ); - utl::LocalFileHelper::ConvertURLToPhysicalName( aTmp, aRes ); - break; - } -*/ - default: - DBG_ASSERT( 0, "unexpected argument (path)" ); - } - if (bAddAccessDelim && aRes.Len()) - { -#ifdef WNT - aRes += '\\'; -#else - aRes += '/'; -#endif - } - - return aRes; -} - -#endif - /////////////////////////////////////////////////////////////////////////// rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) -- cgit From f2554b7867ca50f513aee6190ef3e3552d0880ff Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 26 Feb 2011 15:54:59 +0100 Subject: Remove "using namespace ::rtl" --- linguistic/source/convdic.cxx | 3 ++- linguistic/source/convdiclist.cxx | 3 ++- linguistic/source/convdicxml.cxx | 3 ++- linguistic/source/dicimp.cxx | 3 ++- linguistic/source/dlistimp.cxx | 3 ++- linguistic/source/hhconvdic.cxx | 3 ++- linguistic/source/hyphdsp.cxx | 4 +++- linguistic/source/hyphdta.cxx | 3 ++- linguistic/source/iprcache.cxx | 2 +- linguistic/source/lngopt.cxx | 3 ++- linguistic/source/lngprophelp.cxx | 3 ++- linguistic/source/misc.cxx | 3 ++- linguistic/source/spelldsp.cxx | 3 ++- linguistic/source/spelldta.cxx | 3 ++- linguistic/source/thesdsp.cxx | 3 ++- linguistic/source/thesdta.cxx | 2 +- linguistic/workben/sprophelp.cxx | 2 +- linguistic/workben/sspellimp.cxx | 2 +- 18 files changed, 33 insertions(+), 18 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 5285dc41ad37..bcdf835364c0 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -73,13 +73,14 @@ using namespace std; using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + #define SN_CONV_DICTIONARY "com.sun.star.linguistic2.ConversionDictionary" #define SN_HCD_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index cf1364ddf3dc..5fb856f01aca 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -56,7 +56,6 @@ #include "defs.hxx" using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; @@ -64,6 +63,8 @@ using namespace com::sun::star::container; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + #define SN_CONV_DICTIONARY_LIST "com.sun.star.linguistic2.ConversionDictionaryList" diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index dc16529d806e..b1ee8479f233 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -63,13 +63,14 @@ using namespace std; using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + #define XML_NAMESPACE_TCD_STRING "http://openoffice.org/2003/text-conversion-dictionary" #define CONV_TYPE_HANGUL_HANJA "Hangul / Hanja" #define CONV_TYPE_SCHINESE_TCHINESE "Chinese simplified / Chinese traditional" diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 9a44092bd86d..0c2d3e4071cc 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -55,13 +55,14 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + /////////////////////////////////////////////////////////////////////////// #define BUFSIZE 4096 diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 2485153f3f98..a0c533516d0e 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -61,13 +61,14 @@ #include "lngopt.hxx" using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + /////////////////////////////////////////////////////////////////////////// static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 4954cae3a811..a3b770d74b67 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -52,13 +52,14 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + #define SN_HH_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" /////////////////////////////////////////////////////////////////////////// diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index ed647d3818bd..6015335fe4c8 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -50,7 +50,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -58,6 +57,9 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + /////////////////////////////////////////////////////////////////////////// HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 364ccad150f5..a6d9b5ee5dd6 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -41,12 +41,13 @@ #include using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; +using ::rtl::OUString; + namespace linguistic { /////////////////////////////////////////////////////////////////////////// diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 9ad7001fe676..c6bd020a10ad 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -42,13 +42,13 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; +using ::rtl::OUString; namespace linguistic { diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 2056e4d1b4d6..f29a940f2153 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -50,7 +50,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::container; using namespace com::sun::star::beans; @@ -61,6 +60,8 @@ using namespace linguistic; using namespace com::sun::star::registry; +using ::rtl::OUString; + /////////////////////////////////////////////////////////////////////////// diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index b432bf1e5fa2..bdee5286bdf7 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -44,7 +44,6 @@ #include using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -52,6 +51,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + namespace linguistic { diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 5a8084eb2f6a..d73d9a034ada 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -63,7 +63,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -71,6 +70,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; using namespace com::sun::star::linguistic2; +using ::rtl::OUString; + namespace linguistic { diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 6decf22ad198..8e13434d0d2f 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -51,7 +51,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -59,6 +58,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + /////////////////////////////////////////////////////////////////////////// // ProposalList: list of proposals for misspelled words // The order of strings in the array should be left unchanged because the diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index b40c7ab8b14f..c89426b8d3d3 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -44,13 +44,14 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; +using ::rtl::OUString; + namespace linguistic { diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 85b16efd4256..0ffc4cae15b2 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -43,7 +43,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -51,6 +50,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; + /////////////////////////////////////////////////////////////////////////// static BOOL SvcListHasLanguage( diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index 46880f41862b..a90afac17841 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -36,7 +36,6 @@ #include "thesdta.hxx" using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -44,6 +43,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; namespace linguistic { diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 8d01ec4fa0bf..bd42ed27bbe2 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -43,7 +43,6 @@ #include using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -51,6 +50,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; #define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 244930d70c25..addeb6c0976d 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -45,7 +45,6 @@ using namespace utl; using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -53,6 +52,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; +using ::rtl::OUString; /////////////////////////////////////////////////////////////////////////// -- cgit From 65c053ca1a5a8c7318ab1e42cdde2d540a283673 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Mar 2011 19:07:44 +0100 Subject: Move DBG_ERROR to OSL_FAIL --- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/gciterator.cxx | 2 +- linguistic/workben/sprophelp.cxx | 4 ++-- linguistic/workben/sspellimp.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 5fb856f01aca..7fdc001134b1 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -178,7 +178,7 @@ void ConvDicNameContainer::FlushDics() const } catch(Exception &) { - DBG_ERROR( "flushing of conversion dictionary failed" ); + OSL_FAIL( "flushing of conversion dictionary failed" ); } } } diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index d1627898637c..33c94d902d6d 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -426,7 +426,7 @@ void GrammarCheckingIterator::ProcessResult( } catch (lang::IllegalArgumentException &) { - DBG_ERROR( "commitMultiTextMarkup: IllegalArgumentException exception caught" ); + OSL_FAIL( "commitMultiTextMarkup: IllegalArgumentException exception caught" ); } } diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index bd42ed27bbe2..43ee38080b7a 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -316,7 +316,7 @@ void SAL_CALL break; } default: - DBG_ERROR( "unknown property" ); + OSL_FAIL( "unknown property" ); } if (pbVal) rEvt.NewValue >>= *pbVal; @@ -361,7 +361,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) case UPH_IS_SPELL_WITH_DIGITS : pbResVal = &bResIsSpellWithDigits; break; case UPH_IS_SPELL_CAPITALIZATION : pbResVal = &bResIsSpellCapitalization; break; default: - DBG_ERROR( "unknown property" ); + OSL_FAIL( "unknown property" ); } if (pbResVal) pVal[i].Value >>= *pbResVal; diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index addeb6c0976d..f452cd0bfe5f 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -376,7 +376,7 @@ void SAL_CALL pPropHelper->AddAsPropListener(); //! after a reference is established } else - DBG_ERROR( "wrong number of arguments in sequence" ); + OSL_FAIL( "wrong number of arguments in sequence" ); } } -- cgit From 4b5c8f4826173578d6d088eab01b9816546785d3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 10 Mar 2011 16:30:33 +0000 Subject: Fix leak, we own these pointers, so release them. --- linguistic/source/lngsvcmgr.cxx | 10 +++++----- linguistic/source/lngsvcmgr.hxx | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 8bdfd2d3dada..487f29ad3005 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -254,7 +254,7 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, size_t nAvailSvcs = rAvailSvcs.size(); for (size_t m = 0; m < nAvailSvcs; ++m) { - const SvcInfo &rSvcInfo = *rAvailSvcs[m]; + const SvcInfo &rSvcInfo = rAvailSvcs[m]; if (rSvcInfo.aSvcImplName == pImplNames[k] && rSvcInfo.HasLanguage( nLang )) { @@ -1437,13 +1437,13 @@ uno::Sequence< OUString > SAL_CALL USHORT nCnt = 0; LanguageType nLanguage = LocaleToLanguage( rLocale ); - for (size_t i = 0; i < nMaxCnt; ++i) + for (size_t i = 0; i < nMaxCnt; ++i) { - const SvcInfo *pInfo = (*pInfoArray)[i]; + const SvcInfo &rInfo = (*pInfoArray)[i]; if (LANGUAGE_NONE == nLanguage - || (pInfo && pInfo->HasLanguage( nLanguage ))) + || rInfo.HasLanguage( nLanguage )) { - pImplName[ nCnt++ ] = pInfo->aSvcImplName; + pImplName[ nCnt++ ] = rInfo.aSvcImplName; } } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index a7057daf079f..9140a0f5ca8d 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -41,6 +41,8 @@ #include #include +#include + #include "misc.hxx" #include "defs.hxx" @@ -105,7 +107,7 @@ class LngSvcMgr : LngSvcMgrListenerHelper * pListenerHelper; - typedef std::vector< SvcInfo * > SvcInfoArray; + typedef boost::ptr_vector< SvcInfo > SvcInfoArray; SvcInfoArray * pAvailSpellSvcs; SvcInfoArray * pAvailGrammarSvcs; SvcInfoArray * pAvailHyphSvcs; -- cgit From 1848de2f4cce84862cf0843e15f38ce5d1f26108 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 12 Mar 2011 14:27:45 +0100 Subject: Move OSL_ENSURE(false,...) to OSL_FAIL(...) --- linguistic/source/lngopt.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index f29a940f2153..a96f211cd99e 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -304,7 +304,7 @@ OUString LinguOptions::GetName( INT32 nWID ) if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID) aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName); else - OSL_ENSURE(false, "lng : unknown WID"); + OSL_FAIL("lng : unknown WID"); return aRes; } -- cgit From b04d9bd0161790528f3fbd752b89cd1e1ed52770 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Mar 2011 17:07:03 +0100 Subject: fd#35693: disable hangin subsequenttests (complex and unoapi tests) - chart2/qa/unoapi - configmgr/qa/unoapi - dbaccess/qa/unoapi - forms/qa/complex/forms - linguistic/qa/unoapi - qadevOOo/qa/unoapi - sd/qa/unoapi - starmath/qa/unoapi - ucb/qa/complex/ucb - ucb/qa/unoapi - unotools/qa/complex/tempfile --- linguistic/prj/build.lst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index 107a42fcedab..515a201ed6dc 100755 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -4,7 +4,8 @@ lg linguistic\prj get - all lg_prj NULL lg linguistic\inc nmake - all lg_inc NULL lg linguistic\source nmake - all lg_src lg_inc NULL -lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL +# fd#35693 disabled because it hangs on exit +#lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL # could be we need a Japanese office version # lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL -- cgit From a6b3913029370900a2719aa30c570e082a894923 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 28 Mar 2011 00:14:27 +0200 Subject: migrate linguistic subsequenttests to gbuild --- linguistic/JunitTest_linguistic_unoapi.mk | 49 +++++++++++++++++++++++++++++ linguistic/Makefile | 38 +++++++++++++++++++++++ linguistic/Module_linguistic.mk | 34 +++++++++++++++++++++ linguistic/prj/build.lst | 3 -- linguistic/qa/unoapi/Test.java | 51 ------------------------------- linguistic/qa/unoapi/makefile.mk | 48 ----------------------------- 6 files changed, 121 insertions(+), 102 deletions(-) create mode 100644 linguistic/JunitTest_linguistic_unoapi.mk create mode 100644 linguistic/Makefile create mode 100644 linguistic/Module_linguistic.mk delete mode 100755 linguistic/qa/unoapi/Test.java delete mode 100755 linguistic/qa/unoapi/makefile.mk (limited to 'linguistic') diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk new file mode 100644 index 000000000000..2036fef787fd --- /dev/null +++ b/linguistic/JunitTest_linguistic_unoapi.mk @@ -0,0 +1,49 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Bjoern Michaelsen, Canonical Ltd. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/configmgr/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_classes,configmgr_unoapi,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/linguistic/Makefile b/linguistic/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/linguistic/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/linguistic/Module_linguistic.mk b/linguistic/Module_linguistic.mk new file mode 100644 index 000000000000..4ed03eed4331 --- /dev/null +++ b/linguistic/Module_linguistic.mk @@ -0,0 +1,34 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Bjoern Michaelsen, Canonical Ltd. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,linguistic)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,linguistic,\ + JunitTest_linguistic_unoapi \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index 515a201ed6dc..7ee07a2f6f27 100755 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -4,8 +4,5 @@ lg linguistic\prj get - all lg_prj NULL lg linguistic\inc nmake - all lg_inc NULL lg linguistic\source nmake - all lg_src lg_inc NULL -# fd#35693 disabled because it hangs on exit -#lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL - # could be we need a Japanese office version # lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL diff --git a/linguistic/qa/unoapi/Test.java b/linguistic/qa/unoapi/Test.java deleted file mode 100755 index 4a96418255ff..000000000000 --- a/linguistic/qa/unoapi/Test.java +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -************************************************************************/ - -package org.openoffice.linguistic.qa.unoapi; - -import org.openoffice.Runner; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -public final class Test { - @org.junit.Before public void setUp() throws Exception { - connection.setUp(); - } - - @org.junit.After public void tearDown() - throws InterruptedException, com.sun.star.uno.Exception - { - connection.tearDown(); - } - - @org.junit.Test public void test() { - assertTrue( - Runner.run( - "-sce", "lng.sce", "-xcl", "knownissues.xcl", "-cs", - connection.getDescription())); - } - - private final OfficeConnection connection = new OfficeConnection(); -} diff --git a/linguistic/qa/unoapi/makefile.mk b/linguistic/qa/unoapi/makefile.mk deleted file mode 100755 index bd330c6fbaca..000000000000 --- a/linguistic/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = linguistic -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/linguistic/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END -- cgit From e60d365c86b164a4a6940a39377b0b580c9e918d Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:38:39 +0100 Subject: drop bogus executable flag from [ch]xx/bas/asm files --- linguistic/inc/iprcache.hxx | 0 linguistic/inc/linguistic/hyphdta.hxx | 0 linguistic/inc/linguistic/lngprophelp.hxx | 0 linguistic/inc/linguistic/lngprops.hxx | 0 linguistic/inc/linguistic/misc.hxx | 0 linguistic/inc/linguistic/spelldta.hxx | 0 linguistic/inc/pch/precompiled_linguistic.cxx | 0 linguistic/inc/pch/precompiled_linguistic.hxx | 0 linguistic/inc/thesdta.hxx | 0 linguistic/source/convdic.cxx | 0 linguistic/source/convdic.hxx | 0 linguistic/source/convdiclist.cxx | 0 linguistic/source/convdiclist.hxx | 0 linguistic/source/convdicxml.cxx | 0 linguistic/source/convdicxml.hxx | 0 linguistic/source/defs.hxx | 0 linguistic/source/dicimp.cxx | 0 linguistic/source/dicimp.hxx | 0 linguistic/source/dlistimp.cxx | 0 linguistic/source/dlistimp.hxx | 0 linguistic/source/gciterator.cxx | 0 linguistic/source/gciterator.hxx | 0 linguistic/source/grammarchecker.cxx | 0 linguistic/source/grammarchecker.hxx | 0 linguistic/source/hhconvdic.cxx | 0 linguistic/source/hhconvdic.hxx | 0 linguistic/source/hyphdsp.cxx | 0 linguistic/source/hyphdsp.hxx | 0 linguistic/source/hyphdta.cxx | 0 linguistic/source/iprcache.cxx | 0 linguistic/source/lngopt.cxx | 0 linguistic/source/lngopt.hxx | 0 linguistic/source/lngprophelp.cxx | 0 linguistic/source/lngreg.cxx | 0 linguistic/source/lngsvcmgr.cxx | 0 linguistic/source/lngsvcmgr.hxx | 0 linguistic/source/misc.cxx | 0 linguistic/source/misc2.cxx | 0 linguistic/source/spelldsp.cxx | 0 linguistic/source/spelldsp.hxx | 0 linguistic/source/spelldta.cxx | 0 linguistic/source/thesdsp.cxx | 0 linguistic/source/thesdsp.hxx | 0 linguistic/source/thesdta.cxx | 0 linguistic/workben/sprophelp.cxx | 0 linguistic/workben/sprophelp.hxx | 0 linguistic/workben/sreg.cxx | 0 linguistic/workben/sspellimp.cxx | 0 linguistic/workben/sspellimp.hxx | 0 49 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 linguistic/inc/iprcache.hxx mode change 100755 => 100644 linguistic/inc/linguistic/hyphdta.hxx mode change 100755 => 100644 linguistic/inc/linguistic/lngprophelp.hxx mode change 100755 => 100644 linguistic/inc/linguistic/lngprops.hxx mode change 100755 => 100644 linguistic/inc/linguistic/misc.hxx mode change 100755 => 100644 linguistic/inc/linguistic/spelldta.hxx mode change 100755 => 100644 linguistic/inc/pch/precompiled_linguistic.cxx mode change 100755 => 100644 linguistic/inc/pch/precompiled_linguistic.hxx mode change 100755 => 100644 linguistic/inc/thesdta.hxx mode change 100755 => 100644 linguistic/source/convdic.cxx mode change 100755 => 100644 linguistic/source/convdic.hxx mode change 100755 => 100644 linguistic/source/convdiclist.cxx mode change 100755 => 100644 linguistic/source/convdiclist.hxx mode change 100755 => 100644 linguistic/source/convdicxml.cxx mode change 100755 => 100644 linguistic/source/convdicxml.hxx mode change 100755 => 100644 linguistic/source/defs.hxx mode change 100755 => 100644 linguistic/source/dicimp.cxx mode change 100755 => 100644 linguistic/source/dicimp.hxx mode change 100755 => 100644 linguistic/source/dlistimp.cxx mode change 100755 => 100644 linguistic/source/dlistimp.hxx mode change 100755 => 100644 linguistic/source/gciterator.cxx mode change 100755 => 100644 linguistic/source/gciterator.hxx mode change 100755 => 100644 linguistic/source/grammarchecker.cxx mode change 100755 => 100644 linguistic/source/grammarchecker.hxx mode change 100755 => 100644 linguistic/source/hhconvdic.cxx mode change 100755 => 100644 linguistic/source/hhconvdic.hxx mode change 100755 => 100644 linguistic/source/hyphdsp.cxx mode change 100755 => 100644 linguistic/source/hyphdsp.hxx mode change 100755 => 100644 linguistic/source/hyphdta.cxx mode change 100755 => 100644 linguistic/source/iprcache.cxx mode change 100755 => 100644 linguistic/source/lngopt.cxx mode change 100755 => 100644 linguistic/source/lngopt.hxx mode change 100755 => 100644 linguistic/source/lngprophelp.cxx mode change 100755 => 100644 linguistic/source/lngreg.cxx mode change 100755 => 100644 linguistic/source/lngsvcmgr.cxx mode change 100755 => 100644 linguistic/source/lngsvcmgr.hxx mode change 100755 => 100644 linguistic/source/misc.cxx mode change 100755 => 100644 linguistic/source/misc2.cxx mode change 100755 => 100644 linguistic/source/spelldsp.cxx mode change 100755 => 100644 linguistic/source/spelldsp.hxx mode change 100755 => 100644 linguistic/source/spelldta.cxx mode change 100755 => 100644 linguistic/source/thesdsp.cxx mode change 100755 => 100644 linguistic/source/thesdsp.hxx mode change 100755 => 100644 linguistic/source/thesdta.cxx mode change 100755 => 100644 linguistic/workben/sprophelp.cxx mode change 100755 => 100644 linguistic/workben/sprophelp.hxx mode change 100755 => 100644 linguistic/workben/sreg.cxx mode change 100755 => 100644 linguistic/workben/sspellimp.cxx mode change 100755 => 100644 linguistic/workben/sspellimp.hxx (limited to 'linguistic') diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/linguistic/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx old mode 100755 new mode 100644 diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx old mode 100755 new mode 100644 diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx old mode 100755 new mode 100644 diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx old mode 100755 new mode 100644 diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx old mode 100755 new mode 100644 diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx old mode 100755 new mode 100644 -- cgit From 545a54482562c20a5cc1fd978e6f40ac5e9182e5 Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:43:58 +0100 Subject: drop bogus executable flag from odf files --- .../qa/complex/linguistic/testdocuments/hangulhanja.sxc | Bin 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc (limited to 'linguistic') diff --git a/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc b/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc old mode 100755 new mode 100644 -- cgit From df965c99f376635361721f8970499611f1732edc Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:47:37 +0100 Subject: drop bogus executable flag from idl/build/src and config files --- linguistic/prj/build.lst | 0 linguistic/prj/d.lst | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 linguistic/prj/build.lst mode change 100755 => 100644 linguistic/prj/d.lst (limited to 'linguistic') diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst old mode 100755 new mode 100644 diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst old mode 100755 new mode 100644 -- cgit From fe44fe403e57155cb479cd8e9cfbb77e1ba4fb01 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 4 Apr 2011 15:13:25 +0200 Subject: Remove commented code in libs-core/linguistic --- linguistic/inc/iprcache.hxx | 4 - linguistic/inc/linguistic/hyphdta.hxx | 8 -- linguistic/inc/linguistic/lngprophelp.hxx | 9 -- linguistic/inc/linguistic/misc.hxx | 22 +---- linguistic/inc/thesdta.hxx | 2 - linguistic/source/convdic.cxx | 5 - linguistic/source/convdic.hxx | 6 -- linguistic/source/convdiclist.cxx | 9 -- linguistic/source/convdiclist.hxx | 2 - linguistic/source/convdicxml.cxx | 15 --- linguistic/source/convdicxml.hxx | 5 - linguistic/source/defs.hxx | 4 - linguistic/source/dicimp.cxx | 4 - linguistic/source/dicimp.hxx | 7 -- linguistic/source/dlistimp.cxx | 12 --- linguistic/source/dlistimp.hxx | 2 - linguistic/source/gciterator.cxx | 153 ------------------------------ linguistic/source/gciterator.hxx | 10 -- linguistic/source/grammarchecker.cxx | 2 - linguistic/source/grammarchecker.hxx | 1 - linguistic/source/hhconvdic.cxx | 3 - linguistic/source/hhconvdic.hxx | 2 - linguistic/source/hyphdsp.cxx | 16 ---- linguistic/source/hyphdsp.hxx | 2 - linguistic/source/hyphdta.cxx | 3 - linguistic/source/iprcache.cxx | 3 - linguistic/source/lngopt.cxx | 9 -- linguistic/source/lngopt.hxx | 5 - linguistic/source/lngprophelp.cxx | 9 +- linguistic/source/lngreg.cxx | 18 +--- linguistic/source/lngsvcmgr.cxx | 45 +-------- linguistic/source/lngsvcmgr.hxx | 2 - linguistic/source/misc.cxx | 14 --- linguistic/source/misc2.cxx | 3 - linguistic/source/spelldsp.cxx | 19 ---- linguistic/source/spelldsp.hxx | 2 - linguistic/source/spelldta.cxx | 4 - linguistic/source/thesdsp.cxx | 3 - linguistic/source/thesdsp.hxx | 2 - linguistic/source/thesdta.cxx | 2 - linguistic/workben/sprophelp.cxx | 3 - linguistic/workben/sprophelp.hxx | 3 - linguistic/workben/sreg.cxx | 5 - linguistic/workben/sspellimp.cxx | 6 -- linguistic/workben/sspellimp.hxx | 4 - 45 files changed, 5 insertions(+), 464 deletions(-) (limited to 'linguistic') diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 06241d4cd2d6..be48fac9bd46 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -49,7 +49,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class Flushable { @@ -57,7 +56,6 @@ public: virtual void Flush() = 0; }; -/////////////////////////////////////////////////////////////////////////// class FlushListener : public cppu::WeakImplHelper2 @@ -95,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 @@ -124,7 +121,6 @@ public: bool CheckWord( const ::rtl::OUString& rWord, LanguageType nLang ); }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index e88a0c6615a5..e8c4c41b4d2e 100644 --- a/linguistic/inc/linguistic/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx @@ -42,8 +42,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// - class HyphenatedWord : public cppu::WeakImplHelper1 < @@ -95,8 +93,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PossibleHyphens : public cppu::WeakImplHelper1 < @@ -137,10 +133,6 @@ public: void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; } void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; } }; - - -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx index 543429758b82..c32c70437de2 100644 --- a/linguistic/inc/linguistic/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx @@ -51,7 +51,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { namespace linguistic { -/////////////////////////////////////////////////////////////////////////// // PropertyChgHelper // Base class for all XPropertyChangeListener members of the // various lingu services. @@ -60,7 +59,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 < @@ -161,8 +159,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// - class PropertyHelper_Thes : public PropertyChgHelper { @@ -184,8 +180,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - class PropertyHelper_Spell : public PropertyChgHelper { @@ -235,7 +229,6 @@ public: sal_Bool IsSpellCapitalization() const { return bResIsSpellCapitalization; } }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Hyphen : public PropertyChgHelper @@ -281,8 +274,6 @@ public: sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; } }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 3b6f1fa653c7..055016e60f75 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -60,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" @@ -94,14 +94,11 @@ namespace linguistic #define DIC_ERR_UNKNOWN 3 #define DIC_ERR_NOT_EXISTS 4 -/////////////////////////////////////////////////////////////////////////// ::osl::Mutex & GetLinguMutex(); LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ); -/////////////////////////////////////////////////////////////////////////// - rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ); inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc) @@ -116,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 ); @@ -138,8 +131,6 @@ 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 ); @@ -147,7 +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 ); -/////////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDictionaryWriteablePath(); ::com::sun::star::uno::Sequence< ::rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL ); @@ -162,8 +152,6 @@ String GetWritableDictionaryURL( const String &rDicName ); String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rPaths ); -/////////////////////////////////////////////////////////////////////////// - sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ); ::com::sun::star::uno::Reference< @@ -172,7 +160,6 @@ sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ) ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); @@ -188,7 +175,6 @@ sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage ); sal_Bool HasDigits( const ::rtl::OUString &rText ); sal_Bool IsNumeric( const String &rText ); -/////////////////////////////////////////////////////////////////////////// ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetOneInstanceService( const char *pServiceName ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetLinguProperties(); @@ -196,7 +182,6 @@ sal_Bool IsNumeric( const String &rText ); ::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< @@ -221,12 +206,9 @@ sal_uInt8 AddEntryToDic( 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 @@ -254,8 +236,6 @@ public: virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); }; -/////////////////////////////////////////////////////////////////////////// - } // namespace linguistic #endif diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 8cfe95ac4789..f6922dacc4fa 100644 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.hxx @@ -39,7 +39,6 @@ namespace linguistic { -/////////////////////////////////////////////////////////////////////////// class ThesaurusMeaning : @@ -77,7 +76,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 1093b363314d..c1b59ed974be 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -85,7 +85,6 @@ using ::rtl::OUString; #define SN_HCD_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" -/////////////////////////////////////////////////////////////////////////// void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { if (rMainURL.Len() == 0) @@ -130,8 +129,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) if (!xParser.is()) return; - // get filter - //ConvDicXMLImport *pImport = new ConvDicXMLImport( this, rMainURL ); //!! keep a reference until everything is done to //!! ensure the proper lifetime of the object uno::Reference < xml::sax::XDocumentHandler > xFilter( @@ -195,7 +192,6 @@ sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvTy } -/////////////////////////////////////////////////////////////////////////// ConvDic::ConvDic( const String &rName, @@ -733,7 +729,6 @@ uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static() return aSNS; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index ad7bb42be498..f33ad751f91b 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -51,12 +51,8 @@ class SvStream; -/////////////////////////////////////////////////////////////////////////// - sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType ); -/////////////////////////////////////////////////////////////////////////// - struct StrLT { bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const @@ -81,7 +77,6 @@ typedef std::set< rtl::OUString, StrLT > ConvMapKeySet; typedef boost::unordered_multimap< const rtl::OUString, sal_Int16, rtl::OUStringHash, StrEQ > PropTypeMap; -/////////////////////////////////////////////////////////////////////////// class ConvDic : public ::cppu::WeakImplHelper4 @@ -174,7 +169,6 @@ inline ::rtl::OUString ConvDic::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.ConvDic" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index d4878227824d..b240d13e03a6 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -68,7 +68,6 @@ using ::rtl::OUString; #define SN_CONV_DICTIONARY_LIST "com.sun.star.linguistic2.ConversionDictionaryList" -/////////////////////////////////////////////////////////////////////////// bool operator == ( const Locale &r1, const Locale &r2 ) { @@ -77,7 +76,6 @@ bool operator == ( const Locale &r1, const Locale &r2 ) r1.Variant == r2.Variant; } -/////////////////////////////////////////////////////////////////////////// String GetConvDicMainURL( const String &rDicName, const String &rDirectoryURL ) { @@ -97,7 +95,6 @@ String GetConvDicMainURL( const String &rDicName, const String &rDirectoryURL ) return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } -/////////////////////////////////////////////////////////////////////////// class ConvDicNameContainer : public cppu::WeakImplHelper1 @@ -393,7 +390,6 @@ void ConvDicNameContainer::AddConvDics( } } -/////////////////////////////////////////////////////////////////////////// namespace { @@ -426,9 +422,6 @@ ConvDicList::ConvDicList() : ConvDicList::~ConvDicList() { - // NameContainer will deleted when the reference xNameContainer - // is destroyed. - // delete pNameContainer; if (!bDisposing && pNameContainer) pNameContainer->FlushDics(); @@ -680,7 +673,6 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() } -/////////////////////////////////////////////////////////////////////////// uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) @@ -709,6 +701,5 @@ void * SAL_CALL ConvDicList_getFactory( return pRet; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index cd6f1b75b834..f5f4c74360d8 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -43,7 +43,6 @@ class ConvDicNameContainer; -/////////////////////////////////////////////////////////////////////////// class ConvDicList : public cppu::WeakImplHelper3 @@ -117,7 +116,6 @@ inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.ConvDicList" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 017f930a39cb..56ddd94f4487 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -75,7 +75,6 @@ using ::rtl::OUString; #define CONV_TYPE_HANGUL_HANJA "Hangul / Hanja" #define CONV_TYPE_SCHINESE_TCHINESE "Chinese simplified / Chinese traditional" -/////////////////////////////////////////////////////////////////////////// static const OUString ConversionTypeToText( sal_Int16 nConversionType ) { @@ -97,7 +96,6 @@ static sal_Int16 GetConversionTypeFromText( const String &rText ) return nRes; } -/////////////////////////////////////////////////////////////////////////// class ConvDicXMLImportContext : public SvXMLImportContext @@ -204,7 +202,6 @@ public: ConvDic * GetDic() { return GetConvDicImport().GetDic(); } }; -/////////////////////////////////////////////////////////////////////////// void ConvDicXMLImportContext::Characters(const OUString & /*rChars*/) { @@ -216,8 +213,6 @@ void ConvDicXMLImportContext::Characters(const OUString & /*rChars*/) */ //collapsing not done yet! - // warning-free code: since the result is not used there is no need for trimming... - //const OUString &rChars2 = rChars.trim(); } SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( @@ -232,7 +227,6 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( return pContext; } -//////////////////////////////////////// void ConvDicXMLDictionaryContext_Impl::StartElement( const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) @@ -254,10 +248,6 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( GetConvDicImport().SetLanguage( nLanguage ); GetConvDicImport().SetConversionType( nConversionType ); - //!! hack to stop the parser from reading the rest of the file !! - //!! when only the header (language, conversion type) is needed !! -// if (GetConvDicImport().GetDic() == 0) -// throw uno::RuntimeException(); } SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( @@ -272,7 +262,6 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( return pContext; } -//////////////////////////////////////// SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -305,7 +294,6 @@ void ConvDicXMLEntryTextContext_Impl::StartElement( } } -//////////////////////////////////////// SvXMLImportContext * ConvDicXMLRightTextContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -329,7 +317,6 @@ void ConvDicXMLRightTextContext_Impl::EndElement() } -/////////////////////////////////////////////////////////////////////////// sal_Bool ConvDicXMLExport::Export() { @@ -421,7 +408,6 @@ void ConvDicXMLExport::_ExportContent() return A2OU( "com.sun.star.lingu2.ConvDicXMLExport" ); } -/////////////////////////////////////////////////////////////////////////// void SAL_CALL ConvDicXMLImport::startDocument(void) throw( xml::sax::SAXException, uno::RuntimeException ) @@ -458,6 +444,5 @@ OUString SAL_CALL ConvDicXMLImport::getImplementationName() return A2OU( "com.sun.star.lingu2.ConvDicXMLImport" ); } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index b9b280ccaf0f..c93965d65dcf 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -45,16 +45,12 @@ class ConvDic; -/////////////////////////////////////////////////////////////////////////// class ConvDicXMLExport : public SvXMLExport { ConvDic &rDic; sal_Bool bSuccess; -protected: - //void ExportNodes(const SmNode *pIn, int nLevel); - public: ConvDicXMLExport( ConvDic &rConvDic, const rtl::OUString &rFileName, @@ -129,7 +125,6 @@ public: void SetConversionType( sal_Int16 nType ) { nConversionType = nType; } }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index a7af9e7ba6a1..14c0ce2f2853 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -39,13 +39,11 @@ class SvStream; -/////////////////////////////////////////////////////////////////////////// typedef boost::shared_ptr< SvStream > SvStreamPtr; namespace css = ::com::sun::star; -/////////////////////////////////////////////////////////////////////////// struct LangSvcEntries { @@ -116,7 +114,6 @@ struct LangSvcEntries_Thes : public LangSvcEntries LangSvcEntries_Thes( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {} }; -/////////////////////////////////////////////////////////////////////////// // virtual base class for the different dispatchers class LinguDispatcher @@ -129,7 +126,6 @@ public: virtual DspType GetDspType() const = 0; }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index a00e52113b47..9339136b9faa 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -63,7 +63,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// #define BUFSIZE 4096 #define VERS2_NOLANGUAGE 1024 @@ -203,7 +202,6 @@ const String GetDicExtension() return String::CreateFromAscii( pDicExt ); } -/////////////////////////////////////////////////////////////////////////// DictionaryNeo::DictionaryNeo() : aDicEvtListeners( GetLinguMutex() ), @@ -1078,7 +1076,6 @@ void SAL_CALL DictionaryNeo::storeToURL( } } -/////////////////////////////////////////////////////////////////////////// DicEntry::DicEntry() { @@ -1152,6 +1149,5 @@ OUString SAL_CALL DicEntry::getReplacementText( ) } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 288682e481ec..8f5e232b724d 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -43,16 +43,11 @@ #include "defs.hxx" #include "linguistic/misc.hxx" - -/////////////////////////////////////////////////////////////////////////// - #define DIC_MAX_ENTRIES 30000 sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg ); const String GetDicExtension(); -/////////////////////////////////////////////////////////////////////////// - class DictionaryNeo : public ::cppu::WeakImplHelper2 < @@ -196,7 +191,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// class DicEntry : public cppu::WeakImplHelper1 @@ -233,7 +227,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 14255d99d349..a652b55d1721 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -69,7 +69,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg ); @@ -77,7 +76,6 @@ static void AddInternal( const uno::Reference< XDictionary > &rDic, const rtl::OUString& rNew ); static void AddUserData( const uno::Reference< XDictionary > &rDic ); -/////////////////////////////////////////////////////////////////////////// class DicEvtListenerHelper : public cppu::WeakImplHelper1 @@ -184,9 +182,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( || xDicEntry.is(), "lng : missing dictionary entry" ); - // // evaluate DictionaryEvents and update data for next DictionaryListEvent - // DictionaryType eDicType = xDic->getDictionaryType(); DBG_ASSERT(eDicType != DictionaryType_MIXED, "lng : unexpected dictionary type"); @@ -296,7 +292,6 @@ sal_Int16 DicEvtListenerHelper::FlushEvents() } -/////////////////////////////////////////////////////////////////////////// void DicList::MyAppExitListener::AtExit() @@ -695,12 +690,10 @@ void DicList::_CreateDicList() // evaluate list of dictionaries to be activated from configuration - // //! to suppress overwriting the list of active dictionaries in the //! configuration with incorrect arguments during the following //! activation of the dictionaries pDicEvtLstnrHelper->BeginCollectEvents(); - // const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() ); const rtl::OUString *pActiveDic = aActiveDics.getConstArray(); sal_Int32 nLen = aActiveDics.getLength(); @@ -753,9 +746,7 @@ void DicList::SaveDics() } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// rtl::OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) { @@ -814,7 +805,6 @@ void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, return pRet; } -/////////////////////////////////////////////////////////////////////////// xub_StrLen lcl_GetToken( String &rToken, const String &rText, xub_StrLen nPos, const String &rDelim ) @@ -890,7 +880,6 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic ) } } -/////////////////////////////////////////////////////////////////////////// #if defined _MSC_VER #pragma optimize("g",off) @@ -939,6 +928,5 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo return sal_False; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index d81a2cbffc7f..ca8df5a3b2c4 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -47,7 +47,6 @@ class DicEvtListenerHelper; -/////////////////////////////////////////////////////////////////////////// class DicList : public cppu::WeakImplHelper3 @@ -146,7 +145,6 @@ inline ::rtl::OUString DicList::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.DicList" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index a5ca694c678e..0f7b7cb2f920 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -84,7 +84,6 @@ static ::rtl::OUString GrammarCheckingIterator_getImplementationName() throw(); static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw(); -////////////////////////////////////////////////////////////////////// // white space list: obtained from the fonts.config.txt of a Linux system. static sal_Unicode aWhiteSpaces[] = @@ -229,7 +228,6 @@ static sal_Int32 lcl_BacktraceWhiteSpaces( const OUString &rText, sal_Int32 nSta return nRes; } -////////////////////////////////////////////////////////////////////// extern "C" void workerfunc (void * gci) { @@ -244,37 +242,6 @@ static lang::Locale lcl_GetPrimaryLanguageOfSentence( return xFlatPara->getLanguageOfText( nStartIndex, 1 ); } -////////////////////////////////////////////////////////////////////// -/* -class MyThread : punlic osl::Thread -{ - void run () - { - DequeueAndCheck(); - } - - void own_terminate () - { - m_bEnd = true; - wait (3000); - terminate (); - } -} - -MyThread m_aQueue; - -vois startGrammarChecking() -{ - if (!m_aQueue.isRunning ()) - m_aQueue.create (); -} - -void stopGrammarChecking () -{ - if (m_aQueue.isRunning ()) - m_aQueue.own_terminate (); -} -*/ GrammarCheckingIterator::GrammarCheckingIterator( const uno::Reference< lang::XMultiServiceFactory > & rxMgr ) : m_xMSF( rxMgr ), @@ -373,9 +340,7 @@ void GrammarCheckingIterator::ProcessResult( } else // paragraph is still unchanged... { - // // mark found errors... - // sal_Int32 nTextLen = rRes.aText.getLength(); bool bBoundariesOk = 0 <= rRes.nStartOfSentencePosition && rRes.nStartOfSentencePosition <= nTextLen && @@ -470,9 +435,7 @@ uno::Reference< linguistic2::XProofreader > GrammarCheckingIterator::GetGrammarC // check supported locales for each grammarchecker if not already done if (!m_bGCServicesChecked) { - //GetAvailableGCSvcs_Impl(); GetConfiguredGCSvcs_Impl(); - //GetMatchingGCSvcs_Impl(); m_bGCServicesChecked = sal_True; } @@ -912,7 +875,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aNotifyListeners.addInterface( xListener ); } return sal_True; @@ -925,7 +887,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aNotifyListeners.removeInterface( xListener ); } return sal_True; @@ -938,9 +899,7 @@ throw (uno::RuntimeException) lang::EventObject aEvt( (linguistic2::XProofreadingIterator *) this ); m_aEventListeners.disposeAndClear( aEvt ); - // // now end the thread... - // m_aRequestEndThread.reset(); // ---- THREAD SAFE START ---- { @@ -981,7 +940,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aEventListeners.addInterface( xListener ); } } @@ -993,7 +951,6 @@ throw (uno::RuntimeException) { if (xListener.is()) { -// ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); m_aEventListeners.removeInterface( xListener ); } } @@ -1104,116 +1061,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() } } -/* -void GrammarCheckingIterator::GetMatchingGCSvcs_Impl() -{ - GCImplNames_t aTmpGCImplNamesByLang; - try - { - // get node names (locale iso strings) for configured grammar checkers - uno::Reference< container::XNameAccess > xNA( GetUpdateAccess(), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName( A2OU("GrammarCheckers") ), uno::UNO_QUERY_THROW ); - const uno::Sequence< OUString > aGCImplNames( xNA->getElementNames() ); - const OUString *pGCImplNames = aGCImplNames.getConstArray(); - - sal_Int32 nLen = aGCImplNames.getLength(); - for (sal_Int32 i = 0; i < nLen; ++i) - { - uno::Reference< container::XNameAccess > xTmpNA( xNA->getByName( pGCImplNames[i] ), uno::UNO_QUERY_THROW ); - uno::Any aTmp( xTmpNA->getByName( A2OU("Locales") ) ); - uno::Sequence< OUString > aIsoLocaleNames; - if (aTmp >>= aIsoLocaleNames) - { - const OUString *pIsoLocaleNames = aIsoLocaleNames.getConstArray(); - for (sal_Int32 k = 0; k < aIsoLocaleNames.getLength(); ++k) - { - // if there are more grammar checkers for one language, for the time being, - // the last one found here will win... - const LanguageType nLang = MsLangId::convertIsoStringToLanguage( pIsoLocaleNames[k] ); - aTmpGCImplNamesByLang[ nLang ] = pGCImplNames[i]; - } - } - else - { - DBG_ASSERT( 0, "failed to get aImplNames. Wrong type?" ); - } - } - } - catch (uno::Exception &) - { - DBG_ASSERT( 0, "exception caught. Failed to get matching grammar checker services" ); - } - - { - // ---- THREAD SAFE START ---- - ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); - m_aGCImplNamesByLang = aTmpGCImplNamesByLang; - // ---- THREAD SAFE END ---- - } -} -*/ - -/* -void GrammarCheckingIterator::GetAvailableGCSvcs_Impl() -{ - // internal method; will always be called with locked mutex - if (m_xMSF.is()) - { - uno::Reference< container::XContentEnumerationAccess > xEnumAccess( m_xMSF, uno::UNO_QUERY ); - uno::Reference< container::XEnumeration > xEnum; - if (xEnumAccess.is()) - xEnum = xEnumAccess->createContentEnumeration( A2OU( SN_GRAMMARCHECKER ) ); - - if (xEnum.is()) - { - while (xEnum->hasMoreElements()) - { - uno::Any aCurrent = xEnum->nextElement(); - uno::Reference< lang::XSingleComponentFactory > xCompFactory; - uno::Reference< lang::XSingleServiceFactory > xFactory; - - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xProps( m_xMSF, uno::UNO_QUERY ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - - if ( xContext.is() && - (cppu::extractInterface( xCompFactory, aCurrent ) || - cppu::extractInterface( xFactory, aCurrent )) ) - { - try - { - uno::Reference< linguistic2::XProofreader > xSvc( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); - if (xSvc.is()) - { - OUString aImplName; - uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY ); - if (xInfo.is()) - aImplName = xInfo->getImplementationName(); - DBG_ASSERT( aImplName.getLength(), "empty implementation name" ); - uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xSvc, uno::UNO_QUERY ); - DBG_ASSERT( xSuppLoc.is(), "interfaces not supported" ); - if (xSuppLoc.is() && aImplName.getLength() > 0) - { - uno::Sequence< lang::Locale > aLocaleSequence( xSuppLoc->getLocales() ); - // ---- THREAD SAFE START ---- - ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); - m_aGCLocalesByService[ aImplName ] = aLocaleSequence; - m_aGCReferencesByService[ aImplName ] = xSvc; - // ---- THREAD SAFE END ---- - } - } - } - catch (uno::Exception &) - { - DBG_ASSERT( 0, "instantiating grammar checker failed" ); - } - } - } - } - } -} -*/ sal_Bool SAL_CALL GrammarCheckingIterator::supportsService( @@ -1290,7 +1138,6 @@ LinguDispatcher::DspType GrammarCheckingIterator::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// static OUString GrammarCheckingIterator_getImplementationName() throw() diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 4707088a7cfb..aab04dd6f0ae 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -50,7 +50,6 @@ #include "defs.hxx" -////////////////////////////////////////////////////////////////////// struct FPEntry @@ -79,7 +78,6 @@ struct FPEntry }; -/////////////////////////////////////////////////////////////////////////// class GrammarCheckingIterator: @@ -110,10 +108,6 @@ class GrammarCheckingIterator: typedef std::map< XComponent *, ::rtl::OUString > DocMap_t; DocMap_t m_aDocIdMap; - // parameter ::rtl::OUString --> implementation name - // parameter ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > --> list of locales supported by service -// typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > > GCLocales_t; -// GCLocales_t m_aGCLocalesByService; // language -> implname mapping typedef std::map< LanguageType, ::rtl::OUString > GCImplNames_t; @@ -132,7 +126,6 @@ class GrammarCheckingIterator: //! beware of initilization order ! struct MyMutex : public rtl::Static< osl::Mutex, MyMutex > {}; - // cppu::OInterfaceContainerHelper m_aEventListeners; cppu::OInterfaceContainerHelper m_aNotifyListeners; @@ -154,8 +147,6 @@ class GrammarCheckingIterator: sal_Int32 GetSuggestedEndOfSentence( const ::rtl::OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale ); void GetConfiguredGCSvcs_Impl(); -// void GetMatchingGCSvcs_Impl(); -// void GetAvailableGCSvcs_Impl(); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > GetGrammarChecker( const ::com::sun::star::lang::Locale & rLocale ); ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > GetUpdateAccess() const; @@ -204,7 +195,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 961df73e5a89..a5c1fa11b564 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -59,7 +59,6 @@ using namespace ::utl; using namespace ::rtl; using namespace ::com::sun::star; -//////////////////////////////////////////////////////////// GrammarChecker::GrammarChecker( /*uno::Reference< uno::XComponentContext > const & context*/ ) /*m_xContext(context)*/ @@ -258,7 +257,6 @@ sal_Bool SAL_CALL GrammarChecker::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > GrammarChecker::getSupportedServiceNames_Static( ) throw() { - //osl::Guard< osl::Mutex > aGuard(GetMutex()); uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible aSNS.getArray()[0] = A2OU( "com.sun.star.linguistic2.GrammarChecker" );//SN_LINGU_SERVCICE_MANAGER diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx index e3f8ae352554..d7443530ab0d 100644 --- a/linguistic/source/grammarchecker.hxx +++ b/linguistic/source/grammarchecker.hxx @@ -50,7 +50,6 @@ class GrammarChecker: ::com::sun::star::lang::XServiceInfo > { -// com::sun::star::uno::Reference< uno::XComponentContext > m_xContext; // disallow use of copy c-tor and assignment operator GrammarChecker( const GrammarChecker & ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index bebe9b8259e7..706005a68c62 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -62,7 +62,6 @@ using ::rtl::OUString; #define SN_HH_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary" -/////////////////////////////////////////////////////////////////////////// #include #include @@ -100,7 +99,6 @@ sal_Bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) } -/////////////////////////////////////////////////////////////////////////// HHConvDic::HHConvDic( const String &rName, const String &rMainURL ) : ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, sal_True, rMainURL ) @@ -165,6 +163,5 @@ uno::Sequence< OUString > HHConvDic::getSupportedServiceNames_Static() return aSNS; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 5ed6d554fdad..1419e0d78608 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -40,7 +40,6 @@ #include "defs.hxx" #include "convdic.hxx" -/////////////////////////////////////////////////////////////////////////// class HHConvDic : public ConvDic @@ -73,7 +72,6 @@ inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.HHConvDic" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 65bdadfc5f59..d745b10f4d4e 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -60,7 +60,6 @@ using namespace linguistic; using ::rtl::OUString; using ::rtl::OUStringBuffer; -/////////////////////////////////////////////////////////////////////////// HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) @@ -341,7 +340,6 @@ Reference< XHyphenatedWord > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -350,9 +348,6 @@ Reference< XHyphenatedWord > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -480,7 +475,6 @@ Reference< XHyphenatedWord > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -489,9 +483,6 @@ Reference< XHyphenatedWord > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -614,7 +605,6 @@ Reference< XPossibleHyphens > SAL_CALL else if (pEntry->nLastTriedSvcIndex < nLen - 1) // instantiate services and try it { -// const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray(); Reference< XHyphenator > *pRef = pEntry->aSvcRefs.getArray(); Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); @@ -623,9 +613,6 @@ Reference< XPossibleHyphens > SAL_CALL // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); // create specific service via it's implementation name try @@ -687,8 +674,6 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale, { // modify/add entry LangSvcEntries_Hyph *pEntry = aSvcMap[ nLanguage ].get(); - // only one hypenator can be in use for a language... - //const OUString &rSvcImplName = rSvcImplNames.getConstArray()[0]; if (pEntry) { pEntry->Clear(); @@ -735,6 +720,5 @@ LinguDispatcher::DspType HyphenatorDispatcher::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 75c1976a26eb..520365d0edcf 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -51,7 +51,6 @@ class LngSvcMgr; -/////////////////////////////////////////////////////////////////////////// class HyphenatorDispatcher : public cppu::WeakImplHelper1 @@ -166,7 +165,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index ed6b4e169b7b..d03636db7dad 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -50,7 +50,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHPos, @@ -133,7 +132,6 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling() } -/////////////////////////////////////////////////////////////////////////// PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang, @@ -183,7 +181,6 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() return aOrigHyphenPos; } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 6b4e28c96607..60fead4a3374 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -53,7 +53,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// #define NUM_FLUSH_PROPS 6 @@ -214,7 +213,6 @@ void SAL_CALL FlushListener::propertyChange( } -/////////////////////////////////////////////////////////////////////////// SpellCache::SpellCache() { @@ -259,7 +257,6 @@ void SpellCache::AddWord( const OUString& rWord, LanguageType nLang ) rList.clear(); rList.insert( rWord ); } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 8fa1ff68a42a..b7b2f1546015 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -62,7 +62,6 @@ using namespace com::sun::star::registry; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// // static member intialization @@ -193,8 +192,6 @@ sal_Bool LinguOptions::SetValue( Any &rOld, const Any &rVal, sal_Int32 nWID ) } } -// if (bRes) -// pData->SetModified(); return bRes; } @@ -310,7 +307,6 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) } -/////////////////////////////////////////////////////////////////////////// //! map must be sorted by first entry in alphabetical increasing order. const SfxItemPropertyMapEntry* lcl_GetLinguProps() @@ -498,7 +494,6 @@ void SAL_CALL LinguProps::addVetoableChangeListener( const Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { -// MutexGuard aGuard( GetLinguMutex() ); } void SAL_CALL LinguProps::removeVetoableChangeListener( @@ -506,7 +501,6 @@ void SAL_CALL LinguProps::removeVetoableChangeListener( const Reference< XVetoableChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { -// MutexGuard aGuard( GetLinguMutex() ); } @@ -617,9 +611,7 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// // XServiceInfo OUString SAL_CALL LinguProps::getImplementationName() @@ -681,6 +673,5 @@ void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, return pRet; } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 295483a8914d..d0e8ae556496 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -60,10 +60,8 @@ namespace com { namespace sun { namespace star { -/////////////////////////////////////////////////////////////////////////// // LinguOptions // This class represents all Linguistik relevant options. -// class LinguOptions { @@ -95,7 +93,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// // uses templates from @@ -113,7 +110,6 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar std::equal_to< sal_Int32 > > OPropertyListenerContainerHelper; -/////////////////////////////////////////////////////////////////////////// class LinguProps : @@ -180,7 +176,6 @@ inline ::rtl::OUString LinguProps::getImplementationName_Static() throw() return A2OU( "com.sun.star.lingu2.LinguProps" ); } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index e9a27ac81bac..8a5c17c27827 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -56,7 +56,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// static const char *aCH[] = { @@ -170,7 +169,7 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals ) // temporary value bResIsIgnoreControlCharacters = bIsIgnoreControlCharacters; bResIsUseDictionaryList = bIsUseDictionaryList; - // + sal_Int32 nLen = rPropVals.getLength(); if (nLen) { @@ -186,7 +185,6 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals ) pbResVal = &bResIsUseDictionaryList; break; default: ; - //DBG_ASSERT( 0, "unknown property" ); } if (pbResVal) pVal[i].Value >>= *pbResVal; @@ -224,7 +222,6 @@ sal_Bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt default: { bRes = sal_False; - //DBG_ASSERT( 0, "unknown property" ); } } if (pbVal) @@ -346,7 +343,6 @@ sal_Bool SAL_CALL return bRes; } -/////////////////////////////////////////////////////////////////////////// PropertyHelper_Thes::PropertyHelper_Thes( @@ -373,7 +369,6 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // list of properties from the property set to be used // and listened to @@ -563,7 +558,6 @@ sal_Int16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const return 16; } -/////////////////////////////////////////////////////////////////////////// static const char *aHP[] = { @@ -713,7 +707,6 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals ) } } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 24c60b87cc7f..46cdbd132d7f 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -74,16 +74,8 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory void * ); -//extern void * SAL_CALL GrammarChecker_getFactory -//( -// const sal_Char * pImplName, -// XMultiServiceFactory * pServiceManager, -// void * -//); - -//////////////////////////////////////// + // definition of the two functions that are used to provide the services -// extern "C" { @@ -126,17 +118,9 @@ void * SAL_CALL component_getFactory( pImplName, reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), pRegistryKey ); -/* - if(!pRet) - pRet = GrammarChecker_getFactory( - pImplName, - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - pRegistryKey ); -*/ return pRet; } } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 00c0d96eba86..311ee0133d46 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -63,7 +63,6 @@ using ::rtl::OUString; uno::Sequence< OUString > static GetLangSvcList( const uno::Any &rVal ); uno::Sequence< OUString > static GetLangSvc( const uno::Any &rVal ); -/////////////////////////////////////////////////////////////////////////// static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText ) { @@ -82,7 +81,6 @@ static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const O return bRes; } -/////////////////////////////////////////////////////////////////////////// static uno::Sequence< lang::Locale > GetAvailLocales( const uno::Sequence< OUString > &rSvcImplNames ) @@ -153,7 +151,6 @@ static uno::Sequence< lang::Locale > GetAvailLocales( return aRes; } -/////////////////////////////////////////////////////////////////////////// struct SvcInfo { @@ -186,7 +183,6 @@ sal_Bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const } -/////////////////////////////////////////////////////////////////////////// void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, @@ -275,7 +271,6 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher, } -/////////////////////////////////////////////////////////////////////////// class LngSvcMgrListenerHelper : @@ -286,9 +281,7 @@ class LngSvcMgrListenerHelper : > { LngSvcMgr &rMyManager; -// Timer aLaunchTimer; - //cppu::OMultiTypeInterfaceContainerHelper aListeners; ::cppu::OInterfaceContainerHelper aLngSvcMgrListeners; ::cppu::OInterfaceContainerHelper aLngSvcEvtBroadcasters; uno::Reference< linguistic2::XDictionaryList > xDicList; @@ -302,7 +295,6 @@ class LngSvcMgrListenerHelper : void LaunchEvent( sal_Int16 nLngSvcEvtFlags ); -// DECL_LINK( TimeOut, Timer* ); long Timeout(); public: @@ -356,14 +348,6 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( (linguistic2::XDictionaryListEventListener *) this, sal_False ); } - //! The timer is used to 'sum up' different events in order to reduce the - //! number of events forwarded. - //! (This may happen already if a property was changed that has several - //! listeners, and each of them is launching an event of it's own!) - //! Thus this behaviour is necessary to avoid unecessary actions of - //! this objects listeners! -// aLaunchTimer.SetTimeout( 2000 ); -// aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); nCombinedLngSvcEvt = 0; } @@ -389,7 +373,6 @@ long LngSvcMgrListenerHelper::Timeout() { osl::MutexGuard aGuard( GetLinguMutex() ); -// if (&aLaunchTimer == pTimer) { // change event source to LinguServiceManager since the listeners // probably do not know (and need not to know) about the specific @@ -416,7 +399,6 @@ long LngSvcMgrListenerHelper::Timeout() void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt ) { nCombinedLngSvcEvt |= nLngSvcEvt; -// aLaunchTimer.Start(); Timeout(); } @@ -453,11 +435,8 @@ void SAL_CALL xRef->processDictionaryListEvent( rDicListEvent ); } - // // "translate" DictionaryList event into linguistic2::LinguServiceEvent - // sal_Int16 nLngSvcEvt = 0; - // sal_Int16 nSpellCorrectFlags = linguistic2::DictionaryListEventFlags::ADD_NEG_ENTRY | linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY | @@ -465,7 +444,7 @@ void SAL_CALL linguistic2::DictionaryListEventFlags::DEACTIVATE_POS_DIC; if (0 != (nDlEvt & nSpellCorrectFlags)) nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN; - // + sal_Int16 nSpellWrongFlags = linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY | linguistic2::DictionaryListEventFlags::DEL_NEG_ENTRY | @@ -473,7 +452,7 @@ void SAL_CALL linguistic2::DictionaryListEventFlags::DEACTIVATE_NEG_DIC; if (0 != (nDlEvt & nSpellWrongFlags)) nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN; - // + sal_Int16 nHyphenateFlags = linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY | linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY | @@ -572,7 +551,6 @@ sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( } -/////////////////////////////////////////////////////////////////////////// LngSvcMgr::LngSvcMgr() : @@ -1135,10 +1113,6 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp ) uno::Sequence< OUString > aSvcImplNames; if (pValues[i] >>= aSvcImplNames) { -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1182,10 +1156,6 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp ) if (aSvcImplNames.getLength() > 1) aSvcImplNames.realloc(1); -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1229,10 +1199,6 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp ) if (aSvcImplNames.getLength() > 1) aSvcImplNames.realloc(1); -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1272,10 +1238,6 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) uno::Sequence< OUString > aSvcImplNames; if (pValues[i] >>= aSvcImplNames) { -#if OSL_DEBUG_LEVEL > 1 -// sal_Int32 nSvcs = aSvcImplNames.getLength(); -// const OUString *pSvcImplNames = aSvcImplNames.getConstArray(); -#endif String aLocaleStr( pNames[i] ); xub_StrLen nSeperatorPos = aLocaleStr.SearchBackward( sal_Unicode( '/' ) ); aLocaleStr = aLocaleStr.Copy( nSeperatorPos + 1 ); @@ -1521,7 +1483,6 @@ void SAL_CALL osl::MutexGuard aGuard( GetLinguMutex() ); #if OSL_DEBUG_LEVEL > 1 -// const OUString *pImplNames = rServiceImplNames.getConstArray(); #endif LanguageType nLanguage = LocaleToLanguage( rLocale ); @@ -1753,7 +1714,6 @@ static uno::Sequence< OUString > GetLangSvc( const uno::Any &rVal ) } -/////////////////////////////////////////////////////////////////////////// uno::Sequence< OUString > SAL_CALL LngSvcMgr::getConfiguredServices( @@ -1992,6 +1952,5 @@ void * SAL_CALL LngSvcMgr_getFactory( } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 2ca73df51749..7054cf1b4455 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -62,7 +62,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class XThesaurus; } } } } -/////////////////////////////////////////////////////////////////////////// class LngSvcMgr : @@ -190,7 +189,6 @@ inline ::rtl::OUString LngSvcMgr::getImplementationName_Static() } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 73a19fe6d466..2f2df5e2f4a4 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -75,7 +75,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// //!! multi-thread safe mutex for all platforms !! struct LinguMutex : public rtl::Static< osl::Mutex, LinguMutex > @@ -87,7 +86,6 @@ osl::Mutex & GetLinguMutex() return LinguMutex::get(); } -/////////////////////////////////////////////////////////////////////////// LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) { @@ -104,7 +102,6 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) return aLclDtaWrp; } -/////////////////////////////////////////////////////////////////////////// /** returns text-encoding used for ByteString unicode String conversion @@ -176,7 +173,6 @@ rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ) return nEncoding; } -/////////////////////////////////////////////////////////////////////////// static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) { @@ -184,7 +180,6 @@ static inline sal_Int32 Minimum( sal_Int32 n1, sal_Int32 n2, sal_Int32 n3 ) return nMin < n3 ? nMin : n3; } -/////////////////////////////////////////////////////////////////////////// class IntArray2D { @@ -266,7 +261,6 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ) return nDist; } -/////////////////////////////////////////////////////////////////////////// sal_Bool IsUseDicList( const PropertyValues &rProperties, const uno::Reference< XPropertySet > &rxProp ) @@ -459,7 +453,6 @@ sal_uInt8 AddEntryToDic( } -/////////////////////////////////////////////////////////////////////////// LanguageType LocaleToLanguage( const Locale& rLocale ) { @@ -519,7 +512,6 @@ uno::Sequence< sal_Int16 > return aLangs; } -/////////////////////////////////////////////////////////////////////////// sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) { @@ -551,7 +543,6 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) return bRes; } -/////////////////////////////////////////////////////////////////////////// static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUString &rRplc, @@ -707,7 +698,6 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars( } -/////////////////////////////////////////////////////////////////////////// static CharClass & lcl_GetCharClass() @@ -880,7 +870,6 @@ sal_Bool IsNumeric( const String &rText ) } -/////////////////////////////////////////////////////////////////////////// uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName ) { @@ -932,7 +921,6 @@ uno::Reference< XDictionary > GetIgnoreAllList() return xRes; } -/////////////////////////////////////////////////////////////////////////// AppExitListener::AppExitListener() { @@ -990,7 +978,6 @@ void SAL_CALL AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ ) throw(frame::TerminationVetoException, RuntimeException) { - //MutexGuard aGuard( GetLinguMutex() ); } @@ -1006,7 +993,6 @@ void SAL_CALL } } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index b8c0e1727b09..6895eae9bff8 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// sal_Bool FileExists( const String &rMainURL ) { @@ -72,7 +71,6 @@ sal_Bool FileExists( const String &rMainURL ) return bExists; } -/////////////////////////////////////////////////////////////////////////// rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) { @@ -87,7 +85,6 @@ rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) return aRes; } -/////////////////////////////////////////////////////////////////////////// static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( const rtl::OUString &rPathPrefix, diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 3ab2eeb3a0bd..97f96ce227b4 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -60,7 +60,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// // ProposalList: list of proposals for misspelled words // The order of strings in the array should be left unchanged because the // spellchecker should have put the more likely suggestions at the top. @@ -68,7 +67,6 @@ using ::rtl::OUString; // Removing entries is done by assigning the empty string. // The sequence is constructed from all non empty strings in the original // while maintaining the order. -// class ProposalList { std::vector< OUString > aVec; @@ -82,7 +80,6 @@ class ProposalList public: ProposalList() {} - //size_t Size() const { return aVec.size(); } size_t Count() const; void Prepend( const OUString &rText ); void Append( const OUString &rNew ); @@ -185,9 +182,6 @@ void ProposalList::Remove( const OUString &rText ) } } - -/////////////////////////////////////////////////////////////////////////// - sal_Bool SvcListHasLanguage( const LangSvcEntries_Spell &rEntry, LanguageType nLanguage ) @@ -210,9 +204,6 @@ sal_Bool SvcListHasLanguage( return bHasLanguage; } -/////////////////////////////////////////////////////////////////////////// - - SpellCheckerDispatcher::SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) { @@ -408,9 +399,6 @@ sal_Bool SpellCheckerDispatcher::isValid_Impl( // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); while (i < nLen && (!bTmpResValid || sal_False == bTmpRes)) { @@ -594,9 +582,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( // build service initialization argument Sequence< Any > aArgs(2); aArgs.getArray()[0] <<= GetPropSet(); - //! The dispatcher searches the dictionary-list - //! thus the service needs not to now about it - //aArgs.getArray()[1] <<= GetDicList(); sal_Int32 nNumSugestions = -1; while (i < nLen && (!bTmpResValid || xTmpRes.is())) @@ -681,12 +666,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( // list of proposals found (to be checked against entries of // neagtive dictionaries) ProposalList aProposalList; -// Sequence< OUString > aProposals; sal_Int16 eFailureType = -1; // no failure if (xRes.is()) { aProposalList.Append( xRes->getAlternatives() ); -// aProposals = xRes->getAlternatives(); eFailureType = xRes->getFailureType(); } Reference< XDictionaryList > xDList; @@ -869,6 +852,4 @@ void SpellCheckerDispatcher::FlushSpellCache() pCache->Flush(); } -/////////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 5b50b5d621d7..9ae9cd45456b 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -53,7 +53,6 @@ class LngSvcMgr; -/////////////////////////////////////////////////////////////////////////// class SpellCheckerDispatcher : public cppu::WeakImplHelper2 @@ -158,7 +157,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index fce7a4fea03f..3bc4ce100451 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -55,7 +55,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// #define MAX_PROPOSALS 40 @@ -236,14 +235,12 @@ Sequence< OUString > MergeProposalSeqs( pMerged[ nIndex++ ] = pAlt[ i ]; } } - //DBG_ASSERT(nIndex == nCountNew, "wrong number of proposals"); aMerged.realloc( nIndex ); } return aMerged; } -/////////////////////////////////////////////////////////////////////////// SpellAlternatives::SpellAlternatives() @@ -362,7 +359,6 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt ) } -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 9cd6f0854cc9..7e4f72308597 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -52,7 +52,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// static sal_Bool SvcListHasLanguage( const Sequence< Reference< XThesaurus > > &rRefs, @@ -71,7 +70,6 @@ static sal_Bool SvcListHasLanguage( return bHasLanguage; } -/////////////////////////////////////////////////////////////////////////// ThesaurusDispatcher::ThesaurusDispatcher() @@ -280,6 +278,5 @@ LinguDispatcher::DspType ThesaurusDispatcher::GetDspType() const } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 48a8e0e65c60..dabd278a8926 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -54,7 +54,6 @@ #include "lngopt.hxx" -/////////////////////////////////////////////////////////////////////////// class ThesaurusDispatcher : public cppu::WeakImplHelper1 @@ -124,7 +123,6 @@ inline ::com::sun::star::uno::Reference< } -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index bed6421fb0a7..218e5ce2af89 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -48,7 +48,6 @@ using ::rtl::OUString; namespace linguistic { -/////////////////////////////////////////////////////////////////////////// ThesaurusMeaning::ThesaurusMeaning(const OUString &rText, @@ -77,7 +76,6 @@ uno::Sequence< OUString > SAL_CALL ThesaurusMeaning::querySynonyms() } */ -/////////////////////////////////////////////////////////////////////////// } // namespace linguistic diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index f9b3441889d2..62f4b215ecba 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -54,7 +54,6 @@ using ::rtl::OUString; #define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) -/////////////////////////////////////////////////////////////////////////// PropertyChgHelper::PropertyChgHelper( @@ -177,7 +176,6 @@ sal_Bool SAL_CALL return bRes; } -/////////////////////////////////////////////////////////////////////////// static const char *aSP[] = { @@ -369,6 +367,5 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals ) } } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index fc8798bff215..b5cf94f84a48 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.hxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; -/////////////////////////////////////////////////////////////////////////// // PropertyChgHelper // virtual base class for all XPropertyChangeListener members of the // various lingu services. @@ -117,7 +116,6 @@ public: }; -/////////////////////////////////////////////////////////////////////////// class PropertyHelper_Spell : @@ -167,7 +165,6 @@ public: BOOL IsSpellCapitalization() const { return bResIsSpellCapitalization; } }; -/////////////////////////////////////////////////////////////////////////// #endif diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index 1fb80047fa11..873ed8fbdb0a 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.cxx @@ -38,9 +38,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -//////////////////////////////////////// // declaration of external RegEntry-functions defined by the service objects -// extern sal_Bool SAL_CALL SpellChecker_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); @@ -50,9 +48,7 @@ extern void * SAL_CALL SpellChecker_getFactory( XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ); -//////////////////////////////////////// // definition of the two functions that are used to provide the services -// extern "C" { @@ -82,6 +78,5 @@ void * SAL_CALL component_getFactory( } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 992e545b12a0..bed18d9df855 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -54,7 +54,6 @@ using namespace linguistic; using ::rtl::OUString; -/////////////////////////////////////////////////////////////////////////// BOOL operator == ( const Locale &rL1, const Locale &rL2 ) { @@ -63,7 +62,6 @@ BOOL operator == ( const Locale &rL1, const Locale &rL2 ) rL1.Variant == rL2.Variant; } -/////////////////////////////////////////////////////////////////////////// SpellChecker::SpellChecker() : @@ -365,7 +363,6 @@ void SAL_CALL { Reference< XPropertySet > xPropSet; rArguments.getConstArray()[0] >>= xPropSet; - //rArguments.getConstArray()[1] >>= xDicList; //! Pointer allows for access of the non-UNO functions. //! And the reference to the UNO-functions while increasing @@ -418,9 +415,7 @@ void SAL_CALL } -/////////////////////////////////////////////////////////////////////////// // Service specific part -// OUString SAL_CALL SpellChecker::getImplementationName() throw(RuntimeException) @@ -507,6 +502,5 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, } -/////////////////////////////////////////////////////////////////////////// /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index d15a57d34c08..bc85186a07d0 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; -/////////////////////////////////////////////////////////////////////////// class SpellChecker : @@ -141,9 +140,7 @@ public: removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); - //////////////////////////////////////////////////////////// // Service specific part - // // XServiceInfo virtual OUString SAL_CALL @@ -169,7 +166,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw() } -/////////////////////////////////////////////////////////////////////////// #endif -- cgit From 561192cfc9f10adab404e6dfed51fd4d78d11210 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 21 Apr 2011 00:27:41 +0200 Subject: Easyhack: Add visibility markup to all component_get* functions --- linguistic/source/lngreg.cxx | 4 ++-- linguistic/workben/sreg.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 46cdbd132d7f..3ddf8f1ee046 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -80,13 +80,13 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index 873ed8fbdb0a..85e218da1ef5 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.cxx @@ -59,13 +59,13 @@ sal_Bool SAL_CALL component_writeInfo( return SpellChecker_writeInfo( pServiceManager, pRegistryKey ); } -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = SpellChecker_getFactory( -- cgit From 2f326b70007afca8bd76e3440df09e891b8caaae Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 16 May 2011 23:25:46 +0200 Subject: WaE (picky) - noeol --- linguistic/source/gciterator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linguistic') diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 0f7b7cb2f920..26cbb9f1a521 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1183,4 +1183,4 @@ void * SAL_CALL GrammarCheckingIterator_getFactory( return pRet; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 5fc588dc56beb4e3c5622e9b2929adaf4ca48ef9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 May 2011 13:41:39 +0100 Subject: CreateFromAscii -> RTL_CONSTASCII_USTRINGPARAM --- linguistic/source/lngsvcmgr.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 311ee0133d46..52bc9de5dd34 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -553,9 +553,9 @@ sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( -LngSvcMgr::LngSvcMgr() : - utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ), - aEvtListeners ( GetLinguMutex() ) +LngSvcMgr::LngSvcMgr() + : utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Linguistic"))) + , aEvtListeners(GetLinguMutex()) { bDisposing = sal_False; -- cgit From bb2f9df7277ac925a973650a40fffd20d976ece7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 10 May 2011 16:04:31 +0100 Subject: config leak: break cyclic dependency --- linguistic/source/lngsvcmgr.cxx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 52bc9de5dd34..14216f8f8174 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -285,7 +285,6 @@ class LngSvcMgrListenerHelper : ::cppu::OInterfaceContainerHelper aLngSvcMgrListeners; ::cppu::OInterfaceContainerHelper aLngSvcEvtBroadcasters; uno::Reference< linguistic2::XDictionaryList > xDicList; - uno::Reference< uno::XInterface > xMyEvtObj; sal_Int16 nCombinedLngSvcEvt; @@ -299,8 +298,7 @@ class LngSvcMgrListenerHelper : public: LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, - const uno::Reference< uno::XInterface > &rxSource, - const uno::Reference< linguistic2::XDictionaryList > &rxDicList ); + const uno::Reference< linguistic2::XDictionaryList > &rxDicList ); // lang::XEventListener virtual void SAL_CALL @@ -334,13 +332,11 @@ public: LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, - const uno::Reference< uno::XInterface > &rxSource, const uno::Reference< linguistic2::XDictionaryList > &rxDicList ) : rMyManager ( rLngSvcMgr ), aLngSvcMgrListeners ( GetLinguMutex() ), aLngSvcEvtBroadcasters ( GetLinguMutex() ), - xDicList ( rxDicList ), - xMyEvtObj ( rxSource ) + xDicList ( rxDicList ) { if (xDicList.is()) { @@ -377,7 +373,8 @@ long LngSvcMgrListenerHelper::Timeout() // change event source to LinguServiceManager since the listeners // probably do not know (and need not to know) about the specific // SpellChecker's or Hyphenator's. - linguistic2::LinguServiceEvent aEvtObj( xMyEvtObj, nCombinedLngSvcEvt ); + linguistic2::LinguServiceEvent aEvtObj( + static_cast(&rMyManager), nCombinedLngSvcEvt ); nCombinedLngSvcEvt = 0; if (rMyManager.pSpellDsp) @@ -470,7 +467,8 @@ void SAL_CALL void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16 nLngSvcEvtFlags ) { - linguistic2::LinguServiceEvent aEvt( xMyEvtObj, nLngSvcEvtFlags ); + linguistic2::LinguServiceEvent aEvt( + static_cast(&rMyManager), nLngSvcEvtFlags ); // pass event on to linguistic2::XLinguServiceEventListener's cppu::OInterfaceIteratorHelper aIt( aLngSvcMgrListeners ); @@ -747,8 +745,7 @@ void LngSvcMgr::GetListenerHelper_Impl() { if (!pListenerHelper) { - pListenerHelper = new LngSvcMgrListenerHelper( *this, - (XLinguServiceManager *) this, linguistic::GetDictionaryList() ); + pListenerHelper = new LngSvcMgrListenerHelper( *this, linguistic::GetDictionaryList() ); xListenerHelper = (linguistic2::XLinguServiceEventListener *) pListenerHelper; } } @@ -1811,7 +1808,7 @@ void SAL_CALL bDisposing = sal_True; // require listeners to release this object - lang::EventObject aEvtObj( (XLinguServiceManager *) this ); + lang::EventObject aEvtObj( static_cast(this) ); aEvtListeners.disposeAndClear( aEvtObj ); if (pListenerHelper) -- cgit From cd012c149bab935986be21e66566bd3ff72b5cd7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 16 May 2011 16:38:15 +0100 Subject: break circular dependency in dispose --- linguistic/source/dlistimp.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'linguistic') diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index a652b55d1721..319cd9d56be8 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -638,6 +638,7 @@ void SAL_CALL xDic->removeDictionaryEventListener( xDicEvtLstnrHelper ); } } + xDicEvtLstnrHelper.clear(); } } -- cgit From 4912a5e54fe31fd132de5d3a7ddef8de01bb75ba Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:27:08 +0300 Subject: Drop %_EXT% which was always empty --- linguistic/prj/d.lst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'linguistic') diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 03237f925764..ed24c0a840ca 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -1,13 +1,13 @@ -..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng* -..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng* -..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\liblng*.so %_DEST%\lib%_EXT%\liblng*.so +..\%__SRC%\bin\lng* %_DEST%\bin\lng* +..\%__SRC%\lib\ilng* %_DEST%\lib\ilng* +..\%__SRC%\lib\liblng.a %_DEST%\lib\liblng.a +..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib +..\%__SRC%\lib\liblng*.so %_DEST%\lib\liblng*.so -..\xml\*.xml %_DEST%\xml%_EXT%\*.xml +..\xml\*.xml %_DEST%\xml\*.xml -mkdir: %_DEST%\inc%_EXT%\linguistic -..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx +mkdir: %_DEST%\inc\linguistic +..\inc\linguistic\*.hxx %_DEST%\inc\linguistic\*.hxx -..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component +..\%__SRC%\misc\lng.component %_DEST%\xml\lng.component -- cgit