Hi,
I have attached a patch in which the German comments are translated to
English where needed. Also removed some useless comments and empty lines.
It covers the linguistic-, vbahelper-, ucb-directories in the
lib-core-directory of the source.
This patch is submitted under LGPLv3+/MPL-Licence.
I have also send a patch earlier this day, which I also want to submit
under the LGPLv3+/MPL-Licence, but I forgot to mention that.
--
Greetings,
Rob Snelders
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 6cae50e..7599431 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -253,7 +253,7 @@ private:
Mutex m_aMutex;
Reference< XMultiServiceFactory > m_xSMgr;
- // Services merken
+ // Save Services
Reference< XIntrospection > m_xIntrospection;
Reference< XIdlReflection > m_xReflection;
Reference< XTypeConverter > m_xConverter;
@@ -374,11 +374,10 @@ void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments) th
}
//*************************************************************************
-//*** Private Hilfs-Methoden ***
+//*** Private Hilfs-Methods ***
Reference< XIntrospection > EventAttacherImpl::getIntrospection() throw( Exception )
{
Guard< Mutex > aGuard( m_aMutex );
- // Haben wir den Service schon? Sonst anlegen
if( !m_xIntrospection.is() )
{
Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) ) );
@@ -392,7 +391,6 @@ Reference< XIntrospection > EventAttacherImpl::getIntrospection() throw( Excepti
Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception )
{
Guard< Mutex > aGuard( m_aMutex );
- // Haben wir den Service schon? Sonst anlegen
if( !m_xReflection.is() )
{
Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ) );
@@ -402,11 +400,10 @@ Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception
}
//*************************************************************************
-//*** Private Hilfs-Methoden ***
+//*** Private Hilfs-Methods ***
Reference< XInvocationAdapterFactory > EventAttacherImpl::getInvocationAdapterService() throw( Exception )
{
Guard< Mutex > aGuard( m_aMutex );
- // Haben wir den Service schon? Sonst anlegen
if( !m_xInvocationAdapterFactory.is() )
{
Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ) );
@@ -417,11 +414,10 @@ Reference< XInvocationAdapterFactory > EventAttacherImpl::getInvocationAdapterSe
//*************************************************************************
-//*** Private Hilfs-Methoden ***
+//*** Private Hilfs-Methods ***
Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
{
Guard< Mutex > aGuard( m_aMutex );
- // Haben wir den Service schon? Sonst anlegen
if( !m_xConverter.is() )
{
Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ) );
@@ -433,8 +429,8 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
//------------------------------------------------------------------------
//------------------------------------------------------------------------
//------------------------------------------------------------------------
-// Implementation eines EventAttacher-bezogenen AllListeners, der
-// nur einzelne Events an einen allgemeinen AllListener weiterleitet
+// Implementation of a EventAttacher-related AllListeners, which brings
+// a few Events to a general AllListener
class FilterAllListenerImpl : public WeakImplHelper1< XAllListener >
{
public:
@@ -473,7 +469,6 @@ FilterAllListenerImpl::FilterAllListenerImpl( EventAttacherImpl * pEA_, const OU
void SAL_CALL FilterAllListenerImpl::firing(const AllEventObject& Event)
throw( RuntimeException )
{
- // Nur durchreichen, wenn es die richtige Methode ist
if( Event.MethodName == m_EventMethod && m_AllListener.is() )
m_AllListener->firing( Event );
}
@@ -529,7 +524,6 @@ Any SAL_CALL FilterAllListenerImpl::approveFiring( const AllEventObject& Event )
{
Any aRet;
- // Nur durchreichen, wenn es die richtige Methode ist
if( Event.MethodName == m_EventMethod && m_AllListener.is() )
aRet = m_AllListener->approveFiring( Event );
else
@@ -579,35 +573,30 @@ Reference< XEventListener > EventAttacherImpl::attachListener
Reference< XEventListener > xRet = NULL;
- // InvocationAdapterService holen
Reference< XInvocationAdapterFactory > xInvocationAdapterFactory = getInvocationAdapterService();
if( !xInvocationAdapterFactory.is() )
throw ServiceNotRegisteredException();
- // Listener-Klasse per Reflection besorgen
Reference< XIdlReflection > xReflection = getReflection();
if( !xReflection.is() )
throw ServiceNotRegisteredException();
- // Anmelden, dazu passende addListener-Methode aufrufen
- // Zunaechst ueber Introspection gehen, da die Methoden in der gleichen
- // Weise analysiert werden koennen. Fuer bessere Performance entweder
- // hier nochmal implementieren oder die Impl-Methode der Introspection
- // fuer diesen Zweck konfigurierbar machen.
-
- // Introspection-Service holen
+ // Sign in, Call the fitting addListener-Method
+ // First Introspection, as the Methods can be analyzed in the same way
+ // For better perfomance it is implemented here again or make the Impl-Method
+ // of the Introspection for this more configurable.
Reference< XIntrospection > xIntrospection = getIntrospection();
if( !xIntrospection.is() )
return xRet;
- // und unspecten
+ // Inspect Introspection
Any aObjAny( &xObject, ::getCppuType( (const Reference< XInterface > *)0) );
Reference< XIntrospectionAccess > xAccess = xIntrospection->inspect( aObjAny );
if( !xAccess.is() )
return xRet;
- // Name der addListener-Methode zusammenbasteln
+ // Construct the name of the addListener-Method.
OUString aAddListenerName;
OUString aListenerName( ListenerType );
sal_Int32 nIndex = aListenerName.lastIndexOf( '.' );
@@ -622,17 +611,16 @@ Reference< XEventListener > EventAttacherImpl::attachListener
aListenerName = aListenerName.copy( nIndex +1 );
aAddListenerName = OUString( RTL_CONSTASCII_USTRINGPARAM( "add" ) ) + aListenerName;
- // Methoden nach der passenden addListener-Methode durchsuchen
+ // Send Methods to the correct addListener-Method
Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( MethodConcept::LISTENER );
sal_uInt32 i, nLen = aMethodSeq.getLength();
const Reference< XIdlMethod >* pMethods = aMethodSeq.getConstArray();
for( i = 0 ; i < nLen ; i++ )
{
- // Methode ansprechen
const Reference< XIdlMethod >& rxMethod = pMethods[i];
- // Ist es die richtige Methode?
+ // Is it the correct method?
OUString aMethName = rxMethod->getName();
if( aAddListenerName == aMethName )
@@ -646,7 +634,7 @@ Reference< XEventListener > EventAttacherImpl::attachListener
else if( nParamCount == 2 )
xListenerType = params.getConstArray()[1];
- // Adapter zum eigentlichen Listener-Typ anfordern
+ // Send Adapter to its own Listener-Type
Reference< XInterface > xAdapter = createAllListenerAdapter
( xInvocationAdapterFactory, xListenerType, AllListener, Helper );
@@ -655,7 +643,7 @@ Reference< XEventListener > EventAttacherImpl::attachListener
xRet = Reference< XEventListener >( xAdapter, UNO_QUERY );
- // Nur der Listener als Parameter?
+ // Just the Listener as parameter?
if( nParamCount == 1 )
{
Sequence< Any > args( 1 );
@@ -669,23 +657,23 @@ Reference< XEventListener > EventAttacherImpl::attachListener
throw IntrospectionException();
}
}
- // Sonst den Zusatzparameter mit uebergeben
+ // Else, Give the other parameters now
else if( nParamCount == 2 )
{
Sequence< Any > args( 2 );
Any* pAnys = args.getArray();
- // Typ des 1. Parameters pruefen
+ // Search the type of the 1st parameter
Reference< XIdlClass > xParamClass = params.getConstArray()[0];
if( xParamClass->getTypeClass() == TypeClass_STRING )
{
pAnys[0] <<= AddListenerParam;
}
- // 2. Parameter == Listener? TODO: Pruefen!
+ // 2. Parameter == Listener? TODO: Test!
pAnys[1] <<= xAdapter;
- // TODO: Konvertierung String -> ?
+ // TODO: Convert String -> ?
// else
try
{
@@ -698,7 +686,7 @@ Reference< XEventListener > EventAttacherImpl::attachListener
}
break;
// else...
- // Alles andere wird nicht unterstuetzt
+ // Anything else will not be supported
}
}
@@ -717,7 +705,7 @@ Reference< XEventListener > EventAttacherImpl::attachSingleEventListener
)
throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException )
{
- // FilterListener anmelden
+ // Subscribe FilterListener
Reference< XAllListener > aFilterListener = (XAllListener*)
new FilterAllListenerImpl( this, EventMethod, AllListener );
return attachListener( xObject, aFilterListener, Helper, ListenerType, AddListenerParam);
@@ -736,29 +724,25 @@ void EventAttacherImpl::removeListener
if( !xObject.is() || !aToRemoveListener.is() )
throw IllegalArgumentException();
- // Listener-Klasse per Reflection besorgen
Reference< XIdlReflection > xReflection = getReflection();
if( !xReflection.is() )
throw IntrospectionException();
- // Abmelden, dazu passende removeListener-Methode aufrufen
- // Zunaechst ueber Introspection gehen, da die Methoden in der gleichen
- // Weise analysiert werden koennen. Fuer bessere Performance entweder
- // hier nochmal implementieren oder die Impl-Methode der Introspection
- // fuer diesen Zweck konfigurierbar machen.
-
- // Introspection-Service holen
+ // Sign in, Call the fitting removeListener-Method
+ // First Introspection, as the Methods can be analyzed in the same way
+ // For better perfomance it is implemented here again or make the Impl-Method
+ // of the Introspection for this more configurable.
Reference< XIntrospection > xIntrospection = getIntrospection();
if( !xIntrospection.is() )
throw IntrospectionException();
- // und inspecten
+ //Inspect Introspection
Any aObjAny( &xObject, ::getCppuType( (const Reference< XInterface > *)0) );
Reference< XIntrospectionAccess > xAccess = xIntrospection->inspect( aObjAny );
if( !xAccess.is() )
throw IntrospectionException();
- // Name der removeListener-Methode zusammenbasteln
+ // Create name of the removeListener-Method
OUString aRemoveListenerName;
OUString aListenerName( ListenerType );
sal_Int32 nIndex = aListenerName.lastIndexOf( '.' );
@@ -773,22 +757,22 @@ void EventAttacherImpl::removeListener
aListenerName = aListenerName.copy( nIndex +1 );
aRemoveListenerName = OUString( RTL_CONSTASCII_USTRINGPARAM("remove") ) + aListenerName;
- // Methoden nach der passenden addListener-Methode durchsuchen
+ // Send Methods to the correct removeListener-Method
Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods( MethodConcept::LISTENER );
sal_uInt32 i, nLen = aMethodSeq.getLength();
const Reference< XIdlMethod >* pMethods = aMethodSeq.getConstArray();
for( i = 0 ; i < nLen ; i++ )
{
- // Methode ansprechen
+ // Call Methode
const Reference< XIdlMethod >& rxMethod = pMethods[i];
- // Ist es die richtige Methode?
+ // Is it the correct method?
if( aRemoveListenerName == rxMethod->getName() )
{
Sequence< Reference< XIdlClass > > params = rxMethod->getParameterTypes();
sal_uInt32 nParamCount = params.getLength();
- // Nur der Listener als Parameter?
+ // Just the Listener as parameter?
if( nParamCount == 1 )
{
Sequence< Any > args( 1 );
@@ -802,21 +786,21 @@ void EventAttacherImpl::removeListener
throw IntrospectionException();
}
}
- // Sonst den Zusatzparameter mit uebergeben
+ // Else give the other parameters
else if( nParamCount == 2 )
{
Sequence< Any > args( 2 );
Any* pAnys = args.getArray();
- // Typ des 1. Parameters pruefen
+ // Search the type of the 1st parameter
Reference< XIdlClass > xParamClass = params.getConstArray()[0];
if( xParamClass->getTypeClass() == TypeClass_STRING )
pAnys[0] <<= AddListenerParam;
- // 2. Parameter == Listener? TODO: Pruefen!
+ // 2. Parameter == Listener? TODO: Test!
pAnys[1] <<= aToRemoveListener;
- // TODO: Konvertierung String -> ?
+ // TODO: Convert String -> ?
// else
try
{
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 2f42fd0..0adc35f 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 d5458a0..8baf815 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -792,7 +792,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 as 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 5a625df..ece1cd7 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 as 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 7a1cbb5..d2fd581 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 as 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 2619282..78a5658 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -530,7 +530,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
nResMaxNumberOfSuggestions = GetDefaultNumberOfSuggestions();
bResIsSpellWithDigits = bIsSpellWithDigits;
bResIsSpellCapitalization = bIsSpellCapitalization;
- //
+
INT32 nLen = rPropVals.getLength();
if (nLen)
{
@@ -692,7 +692,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 a46918c..a16e59c 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -453,11 +453,8 @@ void SAL_CALL
xRef->processDictionaryListEvent( rDicListEvent );
}
- //
// "translate" DictionaryList event into linguistic2::LinguServiceEvent
- //
INT16 nLngSvcEvt = 0;
- //
INT16 nSpellCorrectFlags =
linguistic2::DictionaryListEventFlags::ADD_NEG_ENTRY |
linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY |
@@ -465,7 +462,6 @@ void SAL_CALL
linguistic2::DictionaryListEventFlags::DEACTIVATE_POS_DIC;
if (0 != (nDlEvt & nSpellCorrectFlags))
nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
- //
INT16 nSpellWrongFlags =
linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY |
linguistic2::DictionaryListEventFlags::DEL_NEG_ENTRY |
@@ -473,7 +469,6 @@ void SAL_CALL
linguistic2::DictionaryListEventFlags::DEACTIVATE_NEG_DIC;
if (0 != (nDlEvt & nSpellWrongFlags))
nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN;
- //
INT16 nHyphenateFlags =
linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY |
linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY |
@@ -557,7 +552,6 @@ BOOL LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
return bRes;
}
-
BOOL LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
{
@@ -571,10 +565,8 @@ BOOL LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
return bRes;
}
-
///////////////////////////////////////////////////////////////////////////
-
LngSvcMgr::LngSvcMgr() :
utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ),
aEvtListeners ( GetLinguMutex() )
@@ -1955,7 +1947,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 as 1 service possible
aSNS.getArray()[0] = A2OU( SN_LINGU_SERVCICE_MANAGER );
return aSNS;
}
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 700d905..71efebd 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -184,7 +184,6 @@ void ProposalList::Remove( const OUString &rText )
}
}
-
///////////////////////////////////////////////////////////////////////////
BOOL SvcListHasLanguage(
@@ -211,21 +210,18 @@ BOOL SvcListHasLanguage(
///////////////////////////////////////////////////////////////////////////
-
SpellCheckerDispatcher::SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr ) :
rMgr (rLngSvcMgr)
{
pCache = NULL;
}
-
SpellCheckerDispatcher::~SpellCheckerDispatcher()
{
ClearSvcList();
delete pCache;
}
-
void SpellCheckerDispatcher::ClearSvcList()
{
// release memory for each table entry
@@ -233,7 +229,6 @@ void SpellCheckerDispatcher::ClearSvcList()
aSvcMap.swap( aTmp );
}
-
Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
throw(RuntimeException)
{
@@ -249,7 +244,6 @@ Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
return aLocales;
}
-
sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
throw(RuntimeException)
{
@@ -258,7 +252,6 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
return aIt != aSvcMap.end();
}
-
sal_Bool SAL_CALL
SpellCheckerDispatcher::isValid( const OUString& rWord, const Locale& rLocale,
const PropertyValues& rProperties )
@@ -268,7 +261,6 @@ sal_Bool SAL_CALL
return isValid_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
}
-
Reference< XSpellAlternatives > SAL_CALL
SpellCheckerDispatcher::spell( const OUString& rWord, const Locale& rLocale,
const PropertyValues& rProperties )
@@ -278,7 +270,6 @@ Reference< XSpellAlternatives > SAL_CALL
return spell_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
}
-
// returns the overall result of cross-checking with all user-dictionaries
// including the IgnoreAll list
static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
@@ -312,7 +303,6 @@ static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
return xRes;
}
-
BOOL SpellCheckerDispatcher::isValid_Impl(
const OUString& rWord,
LanguageType nLanguage,
@@ -480,7 +470,6 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
return bRes;
}
-
Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
const OUString& rWord,
LanguageType nLanguage,
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 32a763f..7146456 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -56,7 +56,6 @@ namespace linguistic
///////////////////////////////////////////////////////////////////////////
-
#define MAX_PROPOSALS 40
Reference< XSpellAlternatives > MergeProposals(
@@ -108,7 +107,6 @@ Reference< XSpellAlternatives > MergeProposals(
return xMerged;
}
-
BOOL SeqHasEntry(
const Sequence< OUString > &rSeq,
const OUString &rTxt)
@@ -124,7 +122,6 @@ BOOL SeqHasEntry(
return bRes;
}
-
void SearchSimilarText( const OUString &rText, INT16 nLanguage,
Reference< XDictionaryList > &xDicList,
std::vector< OUString > & rDicListProps )
@@ -171,7 +168,6 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
}
}
-
void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
Reference< XDictionaryList > &rxDicList,
INT16 nLanguage )
@@ -199,7 +195,6 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
}
}
-
Sequence< OUString > MergeProposalSeqs(
Sequence< OUString > &rAlt1,
Sequence< OUString > &rAlt2,
@@ -244,7 +239,6 @@ Sequence< OUString > MergeProposalSeqs(
///////////////////////////////////////////////////////////////////////////
-
SpellAlternatives::SpellAlternatives()
{
nLanguage = LANGUAGE_NONE;
@@ -266,7 +260,6 @@ SpellAlternatives::SpellAlternatives(
aAlt.realloc( 0 );
}
-
SpellAlternatives::SpellAlternatives(
const OUString &rWord, INT16 nLang, INT16 nFailureType,
const Sequence< OUString > &rAlternatives ) :
@@ -277,12 +270,10 @@ SpellAlternatives::SpellAlternatives(
{
}
-
SpellAlternatives::~SpellAlternatives()
{
}
-
OUString SAL_CALL SpellAlternatives::getWord()
throw(RuntimeException)
{
@@ -290,7 +281,6 @@ OUString SAL_CALL SpellAlternatives::getWord()
return aWord;
}
-
Locale SAL_CALL SpellAlternatives::getLocale()
throw(RuntimeException)
{
@@ -298,7 +288,6 @@ Locale SAL_CALL SpellAlternatives::getLocale()
return CreateLocale( nLanguage );
}
-
sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
throw(RuntimeException)
{
@@ -306,7 +295,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
return nType;
}
-
sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
throw(RuntimeException)
{
@@ -314,7 +302,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
return (INT16) aAlt.getLength();
}
-
Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
throw(RuntimeException)
{
@@ -322,7 +309,6 @@ Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
return aAlt;
}
-
void SAL_CALL SpellAlternatives::setAlternatives( const uno::Sequence< OUString >& rAlternatives )
throw (uno::RuntimeException)
{
@@ -330,7 +316,6 @@ throw (uno::RuntimeException)
aAlt = rAlternatives;
}
-
void SAL_CALL SpellAlternatives::setFailureType( sal_Int16 nFailureType )
throw (uno::RuntimeException)
{
@@ -338,7 +323,6 @@ throw (uno::RuntimeException)
nType = nFailureType;
}
-
void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -346,21 +330,18 @@ void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
nLanguage = nLang;
}
-
void SpellAlternatives::SetFailureType(INT16 nTypeP)
{
MutexGuard aGuard( GetLinguMutex() );
nType = nTypeP;
}
-
void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt )
{
MutexGuard aGuard( GetLinguMutex() );
aAlt = rAlt;
}
-
///////////////////////////////////////////////////////////////////////////
} // namespace linguistic
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index f91c5dc..f5e8213 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -72,18 +72,15 @@ static BOOL SvcListHasLanguage(
///////////////////////////////////////////////////////////////////////////
-
ThesaurusDispatcher::ThesaurusDispatcher()
{
}
-
ThesaurusDispatcher::~ThesaurusDispatcher()
{
ClearSvcList();
}
-
void ThesaurusDispatcher::ClearSvcList()
{
// release memory for each table entry
@@ -91,7 +88,6 @@ void ThesaurusDispatcher::ClearSvcList()
aSvcMap.swap( aTmp );
}
-
Sequence< Locale > SAL_CALL
ThesaurusDispatcher::getLocales()
throw(RuntimeException)
@@ -108,7 +104,6 @@ Sequence< Locale > SAL_CALL
return aLocales;
}
-
sal_Bool SAL_CALL
ThesaurusDispatcher::hasLocale( const Locale& rLocale )
throw(RuntimeException)
@@ -118,7 +113,6 @@ sal_Bool SAL_CALL
return aIt != aSvcMap.end();
}
-
Sequence< Reference< XMeaning > > SAL_CALL
ThesaurusDispatcher::queryMeanings(
const OUString& rTerm, const Locale& rLocale,
@@ -222,7 +216,6 @@ Sequence< Reference< XMeaning > > SAL_CALL
return aMeanings;
}
-
void ThesaurusDispatcher::SetServiceList( const Locale &rLocale,
const Sequence< OUString > &rSvcImplNames )
{
@@ -272,13 +265,11 @@ Sequence< OUString >
return aRes;
}
-
LinguDispatcher::DspType ThesaurusDispatcher::GetDspType() const
{
return DSP_THES;
}
-
///////////////////////////////////////////////////////////////////////////
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index 5e80c42..3e87e9c 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -45,13 +45,11 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-
namespace linguistic
{
///////////////////////////////////////////////////////////////////////////
-
ThesaurusMeaning::ThesaurusMeaning(const OUString &rText,
const OUString &rLookUpText, INT16 nLookUpLang ) :
aText (rText),
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index eba4624..c7483ff 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -345,7 +345,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 1339b30..d62758d 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 ); // also more as 1 Service possible
aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER );
return aSNS;
}
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index d3a666c..1b6ef77 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -320,8 +320,7 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
SortedResultSet *pCurSet = NULL;
- // mxNew und mxOld vertauschen und anschliessend die Tabellen von Old
- // nach New kopieren
+ // exchange mxNew and mxOld and immediately afterwards copy the tables from Old to New
if ( mbGotWelcome )
{
if ( mbUseOne )
@@ -474,9 +473,7 @@ void SortedDynamicResultSet::SendNotify()
}
//=========================================================================
-//
// SortedDynamicResultSetFactory
-//
//=========================================================================
SortedDynamicResultSetFactory::SortedDynamicResultSetFactory(
const Reference< XMultiServiceFactory > & rSMgr )
@@ -539,9 +536,7 @@ SortedDynamicResultSetFactory::createSortedDynamicResultSet(
}
//=========================================================================
-//
// EventList
-//
//=========================================================================
void EventList::Clear()
@@ -567,9 +562,7 @@ void EventList::AddEvent( long nType, long nPos, long nCount )
}
//=================================================================
-//
// SortedDynamicResultSetListener
-//
//=================================================================
SortedDynamicResultSetListener::SortedDynamicResultSetListener(
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 02f2d05..47c07da 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -53,7 +53,6 @@ using namespace cppu;
using namespace rtl;
//=========================================================================
-
// The mutex to synchronize access to containers.
static osl::Mutex& getContainerMutex()
{
@@ -72,7 +71,6 @@ static osl::Mutex& getContainerMutex()
}
//==========================================================================
-
struct SortInfo
{
sal_Bool mbUseOwnCompare;
@@ -85,7 +83,6 @@ struct SortInfo
};
//-----------------------------------------------------------------------------
-
struct SortListData
{
sal_Bool mbModified;
@@ -96,9 +93,7 @@ struct SortListData
};
//============================================================================
-//
// class SRSPropertySetInfo.
-//
//============================================================================
class SRSPropertySetInfo :
@@ -130,9 +125,7 @@ public:
};
//=========================================================================
-//
// PropertyChangeListenerContainer_Impl.
-//
//=========================================================================
struct equalStr_Impl
@@ -159,9 +152,7 @@ typedef OMultiTypeInterfaceContainerHelperVar
> PropertyChangeListenerContainer_Impl;
//=========================================================================
-//
// class PropertyChangeListeners_Impl
-//
//=========================================================================
class PropertyChangeListeners_Impl : public PropertyChangeListenerContainer_Impl
@@ -861,11 +852,9 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex )
return Reference< XRow >::query(mxOriginal)->getArray( columnIndex );
}
-
//--------------------------------------------------------------------------
// XCloseable methods.
//--------------------------------------------------------------------------
-
void SAL_CALL SortedResultSet::close()
throw( SQLException, RuntimeException )
{
@@ -876,7 +865,6 @@ void SAL_CALL SortedResultSet::close()
//--------------------------------------------------------------------------
// XResultSetMetaDataSupplier methods.
//--------------------------------------------------------------------------
-
Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
throw( SQLException, RuntimeException )
{
@@ -884,11 +872,9 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
return Reference< XResultSetMetaDataSupplier >::query(mxOriginal)->getMetaData();
}
-
//--------------------------------------------------------------------------
// XPropertySet methods.
//--------------------------------------------------------------------------
-
Reference< XPropertySetInfo > SAL_CALL
SortedResultSet::getPropertySetInfo() throw( RuntimeException )
{
@@ -1396,12 +1382,9 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt )
}
}
-//-------------------------------------------------------------------------
-
//--------------------------------------------------------------------------
// public methods
//--------------------------------------------------------------------------
-
void SortedResultSet::CopyData( SortedResultSet *pSource )
{
const SortedEntryList *pSrcS2O = pSource->GetS2OList();
@@ -1522,8 +1505,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
//-------------------------------------------------------------------------
void SortedResultSet::InsertNew( long nPos, long nCount )
{
- // in der maS2O Liste alle Einträge, die >= nPos sind, um nCount
- // erhöhen
+ // for all Entries in the msS20-list, who are >= nPos, increase nCount
SortListData *pData;
long i, nEnd;
@@ -1537,15 +1519,16 @@ void SortedResultSet::InsertNew( long nPos, long nCount )
}
}
- // und die neuen einträge hinten an die maS2O Liste anhängen bzw
- // an der Position nPos in der maO2S Liste einfügen
+ // and insert the new entries at the end of the maS20-list or insert at the
+ // Position nPos in the ma02S-list
+
for ( i=0; i<nCount; i++ )
{
nEnd += 1;
pData = new SortListData( nEnd );
- maS2O.Insert( pData, nEnd ); // Insert( Wert, Position )
- maO2S.Insert( (void*)nEnd, (sal_uInt32)(nPos+i) ); // Insert( Wert, Position )
+ maS2O.Insert( pData, nEnd ); // Insert( Value, Position )
+ maO2S.Insert( (void*)nEnd, (sal_uInt32)(nPos+i) ); // Insert( Value, Position )
}
mnCount += nCount;
@@ -1836,7 +1819,7 @@ void SortedResultSet::ResortNew( EventList* pList )
{
maS2O.Remove( (sal_uInt32) i );
maS2O.Insert( pData, nNewPos );
- // maO2S liste korigieren
+ // Correct maO2S-list
for ( j=1; j<(long)maO2S.Count(); j++ )
{
nVal = (long) maO2S.GetObject( (sal_uInt32)( j ) );
@@ -1853,9 +1836,7 @@ void SortedResultSet::ResortNew( EventList* pList )
}
//-------------------------------------------------------------------------
-//
// SortListData
-//
//-------------------------------------------------------------------------
SortListData::SortListData( long nPos, sal_Bool bModified )
{
@@ -1864,7 +1845,6 @@ SortListData::SortListData( long nPos, sal_Bool bModified )
mnOldPos = nPos;
};
-
//=========================================================================
void SortedEntryList::Clear()
{
@@ -1996,9 +1976,7 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos )
}
//-------------------------------------------------------------------------
-//
// class SRSPropertySetInfo.
-//
//-------------------------------------------------------------------------
SRSPropertySetInfo::SRSPropertySetInfo()
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 7943d8a..4dbec7d 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -76,7 +76,6 @@ using namespace webdav_ucp;
// -------------------------------------------------------------------
// RequestData
// -------------------------------------------------------------------
-
struct RequestData
{
// POST
@@ -92,7 +91,6 @@ struct RequestData
// -------------------------------------------------------------------
// RequestDataMap
// -------------------------------------------------------------------
-
struct equalPtr
{
bool operator()( const ne_request* p1, const ne_request* p2 ) const
@@ -174,9 +172,7 @@ struct NeonRequestContext
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-//
// Callback functions
-//
//--------------------------------------------------------------------
//--------------------------------------------------------------------
@@ -184,7 +180,6 @@ struct NeonRequestContext
// ResponseBlockReader
// A simple Neon response_block_reader for use with an XInputStream
// -------------------------------------------------------------------
-
#if NEON_VERSION >= 0x0250
extern "C" int NeonSession_ResponseBlockReader(void * inUserData,
#else
@@ -214,7 +209,6 @@ extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
// ResponseBlockWriter
// A simple Neon response_block_reader for use with an XOutputStream
// -------------------------------------------------------------------
-
#if NEON_VERSION >= 0x0250
extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
#else
@@ -681,8 +675,6 @@ void NeonSession::Init()
NeonUri::makeConnectionEndPointString(
m_aHostName, m_nPort ) );
- // #122205# - libxml2 needs to be initialized once if used by
- // multithreaded programs like OOo.
xmlInitParser();
#if 0
// for more debug flags see ne_utils.h; NE_DEBUGGING must be defined
@@ -710,9 +702,6 @@ void NeonSession::Init()
}
else
{
- // #112271# Check whether proxy settings are still valid (They may
- // change at any time). If not, create new Neon session.
-
const ucbhelper::InternetProxyServer & rProxyCfg = getProxySettings();
if ( ( rProxyCfg.aName != m_aProxyName )
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 403feb5..e2e2ffb 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -89,7 +89,7 @@ public:
Time aTimeNow;
Date aRefDate( 1,1,1900 );
long nDiffDays = (long)(aDateNow - aRefDate);
- nDiffDays += 2; // Anpassung VisualBasic: 1.Jan.1900 == 2
+ nDiffDays += 2;
long nDiffSeconds = aTimeNow.GetHour() * 3600 + aTimeNow.GetMin() * 60 + aTimeNow.GetSec();
return (double)nDiffDays + ((double)nDiffSeconds)/(double)(24*3600);
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
