From a120f1da67083a5d95b304833996b06c1a737f13 Mon Sep 17 00:00:00 2001 From: Philipp Weissenbacher Date: Fri, 25 Jul 2014 15:41:58 +0200 Subject: fdo#39468 Make svl/ German comment clean I went through all files manually and checked with the tool. Change-Id: I2eba5e61a0814dd88d7c2c001cd85db8032f1b9f Reviewed-on: https://gerrit.libreoffice.org/10545 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- svl/source/filepicker/pickerhistory.cxx | 2 +- svl/source/filerec/filerec.cxx | 25 +++++++++----------- svl/source/fsstor/fsfactory.cxx | 13 +++++----- svl/source/inc/poolio.hxx | 22 ++++++++--------- svl/source/misc/inettype.cxx | 2 +- svl/source/misc/ownlist.cxx | 42 ++++++++++++++------------------- svl/source/notify/isethint.cxx | 10 +++----- svl/source/notify/lstner.cxx | 2 +- svl/source/numbers/numfmuno.hxx | 27 +++++++++++---------- svl/source/numbers/zforlist.cxx | 10 ++++---- svl/source/svdde/ddedata.cxx | 7 +++--- svl/source/svdde/ddesvr.cxx | 33 ++++++++++---------------- svl/source/undo/undo.cxx | 38 +++++++++++++---------------- 13 files changed, 103 insertions(+), 130 deletions(-) (limited to 'svl') diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 84e6da9968e6..84cf46326ef4 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.cxx @@ -62,7 +62,7 @@ namespace svt if ( xCurrent.is() ) { if ( aCleanedHistory.empty() ) - // make some room, assume that all interfaces (from here on) are valie + // make some room, assume that all interfaces (from here on) are valid aCleanedHistory.reserve( _rHistory.size() - ( aLoop - _rHistory.begin() ) ); aCleanedHistory.push_back( InterfaceAdapter( xCurrent ) ); } diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 739a466ef5d9..eb5b8b104945 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -333,11 +333,10 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter(sal_uInt8 nRecordType, pStream->SeekRel( + SFX_REC_HEADERSIZE_MULTI ); } - +/** + * @see SfxMiniRecordWriter + */ sal_uInt32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) - -// see - { // Header not written yet? if ( !_bHeaderOk ) @@ -430,11 +429,10 @@ void SfxMultiVarRecordWriter::FlushContent_Impl() SFX_REC_CONTENT_HEADER(_nContentVer,_nStartPos,_nContentStartPos)); } - +/** + * @see SfxMultiFixRecordWriter + */ void SfxMultiVarRecordWriter::NewContent() - -// see - { // written Content already? if ( _nContentCount ) @@ -445,11 +443,10 @@ void SfxMultiVarRecordWriter::NewContent() ++_nContentCount; } - +/** + * @see SfxMiniRecordWriter + */ sal_uInt32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) - -// see - { // Header not written yet? if ( !_bHeaderOk ) @@ -609,7 +606,7 @@ bool SfxMultiRecordReader::GetContent() // if ( nNewPos > _pStream->Tell() ) _pStream->Seek( nNewPos ); - // ggf. Content-Header lesen + // Read Content Header if available if ( _nRecordType == SFX_REC_TYPE_MIXTAGS || _nRecordType == SFX_REC_TYPE_MIXTAGS_RELOC ) { @@ -618,7 +615,7 @@ bool SfxMultiRecordReader::GetContent() _pStream->ReadUInt16( _nContentTag ); } - // ContentNo weiterz"ahlen + // Increment ContentNo ++_nContentNo; return true; } diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 6d820fdfa1f8..44d9842cfadf 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -79,18 +79,17 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() uno::UNO_QUERY ); } +/** + * The request for storage can be done with up to three arguments. + * The first argument specifies a source for the storage it must be URL. + * The second value is a mode the storage should be open in. + * The third value is a media descriptor. + */ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, uno::RuntimeException, std::exception ) { - // The request for storage can be done with up to three arguments - - // The first argument specifies a source for the storage - // it must be URL. - // The second value is a mode the storage should be open in. - // And the third value is a media descriptor. - sal_Int32 nArgNum = aArguments.getLength(); OSL_ENSURE( nArgNum < 4, "Wrong parameter number" ); diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index eca801cf4038..bdca925f3645 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -91,7 +91,7 @@ struct SfxItemPool_Impl SfxBroadcaster aBC; std::vector maPoolItems; std::vector maSfxItemPoolUsers; /// ObjectUser section - OUString aName; + OUString aName; SfxPoolItem** ppPoolDefaults; SfxPoolItem** ppStaticDefaults; SfxItemPool* mpMaster; @@ -101,15 +101,15 @@ struct SfxItemPool_Impl sal_uInt16 mnStart; sal_uInt16 mnEnd; sal_uInt16 mnFileFormatVersion; - sal_uInt16 nVersion; - sal_uInt16 nLoadingVersion; - sal_uInt16 nInitRefCount; // 1, beim Laden ggf. 2 - sal_uInt16 nVerStart, nVerEnd; // WhichRange in Versions - sal_uInt16 nStoringStart, nStoringEnd; // zu speichernder Range - sal_uInt8 nMajorVer, nMinorVer; // Pool selbst + sal_uInt16 nVersion; + sal_uInt16 nLoadingVersion; + sal_uInt16 nInitRefCount; // 1, during load, may be 2 + sal_uInt16 nVerStart, nVerEnd; // WhichRange in versions + sal_uInt16 nStoringStart, nStoringEnd; // Range to be saved + sal_uInt8 nMajorVer, nMinorVer; // The Pool itself SfxMapUnit eDefMetric; bool bInSetItem; - bool bStreaming; // in Load() bzw. Store() + bool bStreaming; // in Load() or Store() bool mbPersistentRefCounts; SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) @@ -174,7 +174,7 @@ struct SfxItemPool_Impl if ( nTag != nFileTag ) \ { \ OSL_FAIL( #nTag ); /*! s.u. */ \ - /*! error-code setzen und auswerten! */ \ + /*! Set error code and evaluate! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = false; \ return rStream; \ @@ -187,7 +187,7 @@ struct SfxItemPool_Impl if ( nTag != nFileTag ) \ { \ OSL_FAIL( #nTag ); /*! s.u. */ \ - /*! error-code setzen und auswerten! */ \ + /*! Set error code and evaluate! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = false; \ delete pPointer; \ @@ -201,7 +201,7 @@ struct SfxItemPool_Impl if ( nTag1 != nFileTag && nTag2 != nFileTag ) \ { \ OSL_FAIL( #nTag1 ); /*! s.u. */ \ - /*! error-code setzen und auswerten! */ \ + /*! Set error code and evaluate! */ \ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \ pImp->bStreaming = false; \ return rStream; \ diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 074889c05cd2..58d054c9634d 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -244,7 +244,7 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1] STR_SVT_MIMETYPE_APP_PDF, // CONTENT_TYPE_APP_PDF STR_SVT_MIMETYPE_APP_RTF, // CONTENT_TYPE_APP_RTF STR_SVT_MIMETYPE_APP_MSWORD, // CONTENT_TYPE_APP_MSWORD - STR_SVT_MIMETYPE_APP_MSWORD, // CONTENT_TYPE_APP_MSWORD_TEMPL //@todo new presentation string? + STR_SVT_MIMETYPE_APP_MSWORD, // CONTENT_TYPE_APP_MSWORD_TEMPL //TODO: new presentation string? STR_SVT_MIMETYPE_APP_STARCALC, // CONTENT_TYPE_APP_STARCALC STR_SVT_MIMETYPE_APP_STARCHART, // CONTENT_TYPE_APP_STARCHART STR_SVT_MIMETYPE_APP_STARDRAW, // CONTENT_TYPE_APP_STARDRAW diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 2fae35cda205..16d63a5fe010 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -61,22 +61,19 @@ static void eatSpace(const OUString & rCmd, sal_Int32 * pIndex) (*pIndex) ++; } - +/** + * Text is parsed and the single commands are added to the list. + * + * @returns bool true + * The text was correctly parsed + false + The text was not parsed correctly +*/ bool SvCommandList::AppendCommands ( - const OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ - sal_Int32 * pEaten /* Anzahl der Zeichen, die gelesen wurden */ + const OUString & rCmd, /* This text is translated to commands */ + sal_Int32 * pEaten /* Count of chars that have been read */ ) -/* [Beschreibung] - - Es wird eine Text geparsed und die einzelnen Kommandos werden an - die Liste angeh"angt. - - [R"uckgabewert] - - bool true, der Text wurde korrekt geparsed. - false, der Text wurde nicht korrekt geparsed. -*/ { sal_Int32 index = 0; while(index < rCmd.getLength()) @@ -103,20 +100,17 @@ bool SvCommandList::AppendCommands return true; } +/** + * An object of the type SvCommand is created and the list is + * attached. + * + * @returns SvCommand & The created object +*/ SvCommand & SvCommandList::Append ( - const OUString & rCommand, /* das Kommando */ - const OUString & rArg /* dasArgument des Kommandos */ + const OUString & rCommand, /* The command */ + const OUString & rArg /* The command's argument */ ) -/* [Beschreibung] - - Es wird eine Objekt vom Typ SvCommand erzeugt und an die Liste - angeh"angt. - - [R"uckgabewert] - - SvCommand & Das erteugte Objekt wird zur"uckgegeben. -*/ { aCommandList.push_back( SvCommand( rCommand, rArg ) ); return aCommandList.back(); diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx index e8deae99b195..3c2dd49eb2aa 100644 --- a/svl/source/notify/isethint.cxx +++ b/svl/source/notify/isethint.cxx @@ -24,14 +24,10 @@ TYPEINIT1(SfxItemSetHint, SfxHint); - +/** + * Copies the SfxItemSet passed as a parameter. + */ SfxItemSetHint::SfxItemSetHint( const SfxItemSet &rItemSet ) - -/* [Beschreibung] - - Dieser Ctor kopiert das als Parameter "ubergeben . -*/ - : _pItemSet( rItemSet.Clone() ) { } diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 46025d591ee5..f3daa2427c93 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -99,7 +99,7 @@ void SfxListener::EndListening( SfxBroadcaster& rBroadcaster, bool bAllDups ) void SfxListener::EndListeningAll() { - // MI: bei Optimierung beachten: Seiteneffekte von RemoveListener beachten! + // Attention: when optimizing this: Respect sideffects of RemoveListener! while ( !aBCs.empty() ) { SfxBroadcaster *pBC = aBCs.front(); diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index 196551cd6b46..9d9252a753df 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -35,8 +35,9 @@ class SvNumberFormatsSupplierObj; -// SvNumberFormatterServiceObj wird global als Service angemeldet - +/** + * SvNumberFormatterServiceObj is registered globally as a Service + */ class SvNumberFormatterServiceObj : public cppu::WeakImplHelper2< com::sun::star::util::XNumberFormatter2, com::sun::star::lang::XServiceInfo> @@ -49,7 +50,7 @@ public: SvNumberFormatterServiceObj(); virtual ~SvNumberFormatterServiceObj(); - // XNumberFormatter + // XNumberFormatter virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) @@ -77,7 +78,7 @@ public: virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XNumberFormatPreviewer + // XNumberFormatPreviewer virtual OUString SAL_CALL convertNumberToPreviewString( const OUString& aFormat, double fValue, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish ) @@ -90,7 +91,7 @@ public: throw(::com::sun::star::util::MalformedNumberFormatException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceInfo + // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -114,7 +115,7 @@ public: virtual ~SvNumberFormatsObj(); - // XNumberFormats + // XNumberFormats virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType, @@ -138,7 +139,7 @@ public: sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XNumberFormatTypes + // XNumberFormatTypes virtual sal_Int32 SAL_CALL getStandardIndex( const ::com::sun::star::lang::Locale& nLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getStandardFormat( sal_Int16 nType, @@ -153,7 +154,7 @@ public: const ::com::sun::star::lang::Locale& nLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceInfo + // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -180,7 +181,7 @@ public: SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK, const ::comphelper::SharedMutex& _rMutex ); virtual ~SvNumberFormatObj(); - // XPropertySet + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -221,7 +222,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XPropertyAccess + // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< @@ -232,7 +233,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceInfo + // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -255,7 +256,7 @@ public: virtual ~SvNumberFormatSettingsObj(); - // XPropertySet + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -296,7 +297,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XServiceInfo + // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 4c0f6bd4ec95..0225b5ffce25 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -188,7 +188,7 @@ sal_uInt16 SvNumberFormatter::nSystemCurrencyPosition = 0; #define NF_BANKSYMBOL_FIX_POSITION 1 -/***********************Funktionen SvNumberFormatter**************************/ +/************* SvNumberFormatter functions **************************/ const sal_uInt16 SvNumberFormatter::UNLIMITED_PRECISION = ::std::numeric_limits::max(); const sal_uInt16 SvNumberFormatter::INPUTSTRING_PRECISION = ::std::numeric_limits::max()-1; @@ -1616,7 +1616,7 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, sal_uInt32 nKey = ImpIsEntry( aFormatStringUpper, nCLOffset, eLnge ); if ( nKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) { - // Zielformat vorhanden + // Target format present GetOutputString( fPreviewNumber, nKey, sOutString, ppColor ); return true; } @@ -1637,7 +1637,7 @@ bool SvNumberFormatter::GetPreviewStringGuess( const OUString& sFormatString, nKey = ImpIsEntry( aFormatStringUpper, nCLOffset, LANGUAGE_ENGLISH_US ); bool bEnglishFormat = (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND); - // try english --> other bzw. english nach other konvertieren + // Try English -> other or convert english to other LanguageType eFormatLang = LANGUAGE_ENGLISH_US; pFormatScanner->SetConvertMode( LANGUAGE_ENGLISH_US, eLnge ); sTmpString = sFormatString; @@ -2452,7 +2452,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + SetIndexTable( NF_DATE_SYS_DMMMYY, ZF_STANDARD_DATE+9 ), SV_NUMBERFORMATTER_VERSION_NEWSTANDARD ); - //! Unfortunally TLOT intended only 10 builtin formats per category, more + //! Unfortunately TLOT intended only 10 builtin formats per category, more //! would overwrite the next category (ZF_STANDARD_TIME) :-(( //! Therefore they are inserted with nNewExtended++ (which is also limited) @@ -3673,7 +3673,7 @@ bool SvNumberFormatter::IsLocaleInstalled( LanguageType eLang ) // static void SvNumberFormatter::ImpInitCurrencyTable() { - // racing condition possible: + // Race condition possible: // ::osl::MutexGuard aGuard( GetMutex() ); // while ( !bCurrencyTableInitialized ) // ImpInitCurrencyTable(); diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 4c9e465f572f..85c60ac99a1f 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -18,10 +18,9 @@ */ -// ACHTUNG: es wird angenommen, dass StarView-Clipboard-Foamatnummern -// und Windows-Formatnummern identisch sind! Ist dies einmal nicht der -// Fall, muessen die Routinen hier angepasst werden. Die Implementation -// verwendet die hier defineirten Konversionen. +// ATTENTION: We assume StarView Clipboard format numbers and Windows +// Format numbers to be the same! If that's not the case, we need to +// adapt the code here. The implementation uses the conversions here. #define UNICODE diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index ecce24a15644..2fb7bee1b382 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -222,7 +222,7 @@ found: case XTYP_REQUEST: case XTYP_ADVREQ: { - OUString aRes; // darf erst am Ende freigegeben werden!! + OUString aRes; // Must be free not until the end! if ( pTopic->IsSystemTopic() ) { if ( pTopic->aItem == reinterpret_cast(SZDDESYS_ITEM_TOPICS) ) @@ -285,10 +285,10 @@ found: case XTYP_ADVSTART: { - // wird das Item zum erstenmal ein HotLink ? + // Is the Item turning into a HotLink for the first time? if( !pItem->pImpData && pTopic->StartAdviseLoop() ) { - // dann wurde das Item ausgewechselt + // Then the Item has been exchanged std::vector::iterator it(std::find(pTopic->aItems.begin(), pTopic->aItems.end(), pItem)); @@ -302,7 +302,7 @@ found: { if( *(*iter)->pName == hText2 ) { - // es wurde tatsaechlich ausgewechselt + // It was exchanged indeed delete pItem; pItem = 0; break; @@ -310,7 +310,7 @@ found: } if( pItem ) - // es wurde doch nicht ausgewechselt, also wieder rein + // It was not exchange, so back in pTopic->aItems.push_back(pItem); else pItem = iter != pTopic->aItems.end() ? *iter : NULL; @@ -383,7 +383,7 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) DBG_ASSERT(pInst,"SVDDE:No instance data"); do - { // middle check loop + { // middle check loop for ( iter = rTopics.begin(); iter != rTopics.end(); ++iter ) { if ( *(*iter)->pName == hTopic ) @@ -394,11 +394,11 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) if( !bContinue ) break; - // dann befragen wir doch mal unsere Ableitung: + // Let's query our subclass TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); bContinue = rService.MakeTopic( reinterpret_cast(chBuf) ); - // dann muessen wir noch mal suchen + // We need to search again } while( bContinue ); @@ -416,8 +416,7 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem ) bool bContinue = false; do - { // middle check loop - + { // middle check loop for ( iter = rItems.begin(); iter != rItems.end(); ++iter ) { if ( *(*iter)->pName == hItem ) @@ -427,11 +426,11 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem ) if( !bContinue ) break; - // dann befragen wir doch mal unsere Ableitung: + // Let's query our subclass TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); bContinue = rTopic.MakeItem( reinterpret_cast(chBuf) ); - // dann muessen wir noch mal suchen + // We need to search again } while( bContinue ); @@ -494,12 +493,6 @@ DdeService::~DdeService() if ( pInst->pServicesSvr ) pInst->pServicesSvr->erase(std::remove(pInst->pServicesSvr->begin(), pInst->pServicesSvr->end(), this), pInst->pServicesSvr->end()); - // MT: Im Auftrage des Herrn (AM) auskommentiert... - // Grund: - // Bei Client/Server werden die Server nicht beendet, wenn mehr - // als einer gestartet. - // Weil keine System-Messagequeue ?! - delete pSysTopic; delete pName; @@ -553,8 +546,8 @@ void DdeService::RemoveTopic( const DdeTopic& rTopic ) if ( !DdeCmpStringHandles (*(*iter)->pName, *rTopic.pName ) ) { aTopics.erase(iter); - // JP 27.07.95: und alle Conversions loeschen !!! - // (sonst wird auf geloeschten Topics gearbeitet!!) + // Delete all conversions! + // Or else we work on deleted topics! for( size_t n = pConv->size(); n; ) { Conversation* pC = (*pConv)[ --n ]; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 4b3c13143247..7ac42cc95800 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -97,7 +97,7 @@ OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const void SfxUndoAction::Undo() { - // die sind nur konzeptuell pure virtual + // These are only conceptually pure virtual OSL_FAIL( "pure virtual function called: SfxUndoAction::Undo()" ); } @@ -111,7 +111,7 @@ void SfxUndoAction::UndoWithContext( SfxUndoContext& i_context ) void SfxUndoAction::Redo() { - // die sind nur konzeptuell pure virtual + // These are only conceptually pure virtual OSL_FAIL( "pure virtual function called: SfxUndoAction::Redo()" ); } @@ -125,7 +125,7 @@ void SfxUndoAction::RedoWithContext( SfxUndoContext& i_context ) void SfxUndoAction::Repeat(SfxRepeatTarget&) { - // die sind nur konzeptuell pure virtual + // These are only conceptually pure virtual OSL_FAIL( "pure virtual function called: SfxUndoAction::Repeat()" ); } @@ -931,15 +931,11 @@ void SfxUndoManager::RemoveUndoListener( SfxUndoListener& i_listener ) } } - +/** + * Inserts a ListUndoAction and sets its UndoArray as current. + */ void SfxUndoManager::EnterListAction( const OUString& rComment, const OUString &rRepeatComment, sal_uInt16 nId ) - -/* [Beschreibung] - - Fuegt eine ListUndoAction ein und setzt dessen UndoArray als aktuelles. -*/ - { UndoManagerGuard aGuard( *m_pData ); @@ -952,7 +948,7 @@ void SfxUndoManager::EnterListAction( const OUString& rComment, m_pData->pFatherUndoArray = m_pData->pActUndoArray; SfxListUndoAction* pAction = new SfxListUndoAction( rComment, rRepeatComment, nId, m_pData->pActUndoArray ); OSL_VERIFY( ImplAddUndoAction_NoNotify( pAction, false, false, aGuard ) ); - // expected to succeed: all conditions under which it could fail should have been checked already + // expected to succeed: all conditions under which it could fail should have been checked already m_pData->pActUndoArray = pAction; // notification @@ -1292,22 +1288,20 @@ bool SfxListUndoAction::Merge( SfxUndoAction *pNextAction ) return !aUndoActions.empty() && aUndoActions[aUndoActions.size()-1].pAction->Merge( pNextAction ); } - +/** + * Creates a LinkAction which points to another UndoManager. + * Gets that UndoManagers current Action and sets it as that UndoManager's + * associated Action. + */ SfxLinkUndoAction::SfxLinkUndoAction(::svl::IUndoManager *pManager) -/* [Beschreibung] - - Richtet eine LinkAction ein, die auf einen weiteren UndoManager zeigt. - Holt sich als zugehoerige Action des weiteren UndoManagers dessen - aktuelle Action. -*/ - { pUndoManager = pManager; SfxUndoManager* pUndoManagerImplementation = dynamic_cast< SfxUndoManager* >( pManager ); ENSURE_OR_THROW( pUndoManagerImplementation != NULL, "unsupported undo manager implementation!" ); - // yes, this cast is dirty. But reaching into the SfxUndoManager's implementation, - // directly accessing its internal stack, and tampering with an action on that stack - // is dirty, too. + + // yes, this cast is dirty. But reaching into the SfxUndoManager's implementation, + // directly accessing its internal stack, and tampering with an action on that stack + // is dirty, too. if ( pManager->GetMaxUndoActionCount() ) { size_t nPos = pManager->GetUndoActionCount()-1; -- cgit