From 55343abdef77793ea1559408fb565a6241f1dadd Mon Sep 17 00:00:00 2001 From: Philipp Weissenbacher Date: Mon, 17 Jun 2013 19:44:25 +0200 Subject: Translate German comments, correct some WS Change-Id: Ia0ecca3dbaa1d44a7175ef6c454cd13c98bab030 Reviewed-on: https://gerrit.libreoffice.org/4320 Reviewed-by: Noel Power Tested-by: Noel Power --- svl/source/numbers/numhead.cxx | 19 +++-- svl/source/numbers/numhead.hxx | 2 +- svl/source/numbers/numuno.cxx | 15 +--- svl/source/numbers/supservs.cxx | 15 ---- svl/source/numbers/supservs.hxx | 16 ++-- svl/source/numbers/zforscan.hxx | 157 +++++++++++++++++----------------------- 6 files changed, 89 insertions(+), 135 deletions(-) (limited to 'svl/source') diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 04964e9d3606..2d318461cc79 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -21,12 +21,12 @@ #include "numhead.hxx" -// ID's fuer Dateien: +// ID's for files: #define SV_NUMID_SIZES 0x4200 //#pragma SEG_FUNCDEF(numhead_06) -//! mit Skip() synchron +//! Synchronous with Skip() ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : rStream( rNewStream ) { @@ -40,7 +40,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : rStream >> nID; if (nID != SV_NUMID_SIZES) { - OSL_FAIL("SV_NUMID_SIZES nicht gefunden"); + OSL_FAIL("SV_NUMID_SIZES not found"); } sal_uInt32 nSizeTableLen; rStream >> nSizeTableLen; @@ -57,7 +57,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader() { DBG_ASSERT( pMemStream->Tell() == pMemStream->GetEndOfData(), - "Sizes nicht vollstaendig gelesen" ); + "Sizes not completely read" ); delete pMemStream; delete [] pBuf; @@ -69,9 +69,9 @@ ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader() void ImpSvNumMultipleReadHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" ); + DBG_ASSERT( nPos <= nEntryEnd, "Read too much" ); if ( nPos != nEntryEnd ) - rStream.Seek( nEntryEnd ); // Rest ueberspringen + rStream.Seek( nEntryEnd ); // Skip the rest } //#pragma SEG_FUNCDEF(numhead_0d) @@ -93,11 +93,10 @@ sal_uLong ImpSvNumMultipleReadHeader::BytesLeft() const if (nReadEnd <= nEntryEnd) return nEntryEnd-nReadEnd; - OSL_FAIL("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft"); + OSL_FAIL("Error in ImpSvNumMultipleReadHeader::BytesLeft"); return 0; } -// ----------------------------------------------------------------------- //#pragma SEG_FUNCDEF(numhead_0a) @@ -123,12 +122,12 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() rStream << static_cast(aMemStream.Tell()); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); - if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? + if ( nDataEnd - nDataPos != nDataSize ) // Hit Default? { nDataSize = nDataEnd - nDataPos; sal_uLong nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // Groesse am Anfang eintragen + rStream << nDataSize; // Add size at the start rStream.Seek(nPos); } } diff --git a/svl/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx index 9e7bd2ab6bc1..2beab9a015e3 100644 --- a/svl/source/numbers/numhead.hxx +++ b/svl/source/numbers/numhead.hxx @@ -22,7 +22,7 @@ #include - // Header mit Groessenangaben fuer mehrere Objekte +// This header contains size measures for various objects class ImpSvNumMultipleReadHeader { diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index 8e5b4a164e38..b2436c252808 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ class SvNumFmtSuppl_Impl { @@ -38,9 +37,8 @@ public: pFormatter(p) {} }; -//------------------------------------------------------------------------ -// Default-ctor fuer getReflection +// Default ctor for getReflection SvNumberFormatsSupplierObj::SvNumberFormatsSupplierObj() { pImpl = new SvNumFmtSuppl_Impl(NULL); @@ -68,18 +66,18 @@ SvNumberFormatter* SvNumberFormatsSupplierObj::GetNumberFormatter() const void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew) { - // der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen! + // The old Numberformatter has been retired, do not access it anymore! pImpl->pFormatter = pNew; } void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32) { - // Basis-Implementierung tut nix... + // Base implementation; does nothing } void SvNumberFormatsSupplierObj::SettingsChanged() { - // Basis-Implementierung tut nix... + // Base implementation; does nothing } // XNumberFormatsSupplier @@ -136,9 +134,4 @@ SvNumberFormatsSupplierObj* SvNumberFormatsSupplierObj::getImplementation( return pRet; } - -//------------------------------------------------------------------------ - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 8b4bb41a413a..198c5f67c2b4 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -36,20 +36,17 @@ using namespace ::utl; #define PERSISTENT_SERVICE_NAME OUString("com.sun.star.util.NumberFormatsSupplier"); -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) { return static_cast< ::cppu::OWeakObject* >(new SvNumberFormatsSupplierServiceObject( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) :m_pOwnFormatter(NULL) ,m_xORB(_rxORB) { } -//------------------------------------------------------------------------- SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject() { if (m_pOwnFormatter) @@ -59,7 +56,6 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject() } } -//------------------------------------------------------------------------- Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException) { Any aReturn = ::cppu::queryInterface(_rType, @@ -74,7 +70,6 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& return aReturn; } -//------------------------------------------------------------------------- void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -116,13 +111,11 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< SetNumberFormatter(m_pOwnFormatter); } -//------------------------------------------------------------------------- OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) { return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); } -//------------------------------------------------------------------------- sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { Sequence< OUString > aServices = getSupportedServiceNames(); @@ -134,7 +127,6 @@ sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const O return sal_False; } -//------------------------------------------------------------------------- Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -142,13 +134,11 @@ Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupported return aSupported; } -//------------------------------------------------------------------------- OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException) { return PERSISTENT_SERVICE_NAME; } -//------------------------------------------------------------------------- void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -161,7 +151,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObj m_pOwnFormatter->Save(aSvOutputSteam); } -//------------------------------------------------------------------------- void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -173,7 +162,6 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObje m_pOwnFormatter->Load(aSvInputSteam); } -//------------------------------------------------------------------------- Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -181,7 +169,6 @@ Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumb return SvNumberFormatsSupplierObj::getNumberFormatSettings(); } -//------------------------------------------------------------------------- Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -189,7 +176,6 @@ Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNu return SvNumberFormatsSupplierObj::getNumberFormats(); } -//------------------------------------------------------------------------- sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException) { sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier ); @@ -199,7 +185,6 @@ sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Seq return nReturn; } -//------------------------------------------------------------------------- void SvNumberFormatsSupplierServiceObject::implEnsureFormatter() { if (!m_pOwnFormatter) diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index a3c3b389f2e9..64f0d96e082b 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -26,14 +26,14 @@ #include #include -//========================================================================= -//= SvNumberFormatsSupplierServiceObject - a number formats supplier which -//= - can be instantiated as an service -//= - supports the ::com::sun::star::io::XPersistObject interface -//= - works with it's own SvNumberFormatter instance -//= - can be initialized (::com::sun::star::lang::XInitialization) -//= with a specific language (i.e. ::com::sun::star::lang::Locale) -//========================================================================= +/** + * SvNumberFormatsSupplierServiceObject - a number formats supplier which + * - can be instantiated as an service + * - supports the ::com::sun::star::io::XPersistObject interface + * - works with it's own SvNumberFormatter instance + * - can be initialized (::com::sun::star::lang::XInitialization) + * with a specific language (i.e. ::com::sun::star::lang::Locale) + */ class SvNumberFormatsSupplierServiceObject :protected SvNumberFormatsSupplierObj ,public ::com::sun::star::lang::XInitialization diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index 7872b07e9dfa..bd6337657892 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -42,17 +42,16 @@ public: ImpSvNumberformatScan( SvNumberFormatter* pFormatter ); ~ImpSvNumberformatScan(); - void ChangeIntl(); // tauscht Keywords aus + void ChangeIntl(); // Replaces Keywords - void ChangeNullDate(sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear); - // tauscht Referenzdatum aus - void ChangeStandardPrec(sal_uInt16 nPrec); // tauscht Standardprecision aus + void ChangeNullDate(sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear); // Replaces reference date + void ChangeStandardPrec(sal_uInt16 nPrec); // Replaces standard precision - sal_Int32 ScanFormat( OUString& rString ); // Aufruf der Scan-Analyse + sal_Int32 ScanFormat( OUString& rString ); // Call scan analysis void CopyInfo(ImpSvNumberformatInfo* pInfo, - sal_uInt16 nAnz); // Kopiert die FormatInfo - sal_uInt16 GetAnzResStrings() const { return nAnzResStrings; } + sal_uInt16 nAnz); // Copies the FormatInfo + sal_uInt16 GetAnzResStrings() const { return nAnzResStrings; } const CharClass& GetChrCls() const { return *pFormatter->GetCharClass(); } const LocaleDataWrapper& GetLoc() const { return *pFormatter->GetLocaleData(); } @@ -93,8 +92,7 @@ public: } sal_uInt16 GetStandardPrec() const { return nStandardPrec; } const Color& GetRedColor() const { return StandardColor[4]; } - Color* GetColor(OUString& sStr); // Setzt Hauptfarben oder - // definierte Farben + Color* GetColor(OUString& sStr); // Set main colors or defines colors // the compatibility currency symbol for old automatic currency formats const OUString& GetCurSymbol() const @@ -134,109 +132,88 @@ public: eTmpLnge = eTmpLge; bConvertSystemToSystem = bSystemToSystem; } + // Only changes the bool variable, in order to temporarily pause the convert mode void SetConvertMode(bool bMode) { bConvertMode = bMode; } - // Veraendert nur die Bool-Variable - // (zum temporaeren Unterbrechen des - // Convert-Modus) bool GetConvertMode() const { return bConvertMode; } - LanguageType GetNewLnge() const { return eNewLnge; } - // Lesezugriff auf ConvertMode - // und Konvertierungsland/Spr. - LanguageType GetTmpLnge() const { return eTmpLnge; } - // Lesezugriff auf - // und Ausgangsland/Spr. + LanguageType GetNewLnge() const { return eNewLnge; } // Read access on ConvertMode and convert country/language + LanguageType GetTmpLnge() const { return eTmpLnge; } // Read access on StartCountry/Language /// get Thai T speciality sal_uInt8 GetNatNumModifier() const { return nNatNumModifier; } /// set Thai T speciality void SetNatNumModifier( sal_uInt8 n ) { nNatNumModifier = n; } - SvNumberFormatter* GetNumberformatter() { return pFormatter; } - // Zugriff auf Formatierer - // (fuer zformat.cxx) + SvNumberFormatter* GetNumberformatter() { return pFormatter; } // Access to formatter (for zformat.cxx) - -private: // ---- privater Teil - NfKeywordTable sKeyword; // Schluesselworte der Syntax - Color StandardColor[NF_MAX_DEFAULT_COLORS]; - // Array der Standardfarben +private: // Private section + NfKeywordTable sKeyword; // Syntax keywords + Color StandardColor[NF_MAX_DEFAULT_COLORS]; // Standard color array Date* pNullDate; // 30Dec1899 OUString sNameStandardFormat; // "Standard" - sal_uInt16 nStandardPrec; // default Precision for Standardformat - SvNumberFormatter* pFormatter; // Pointer auf die Formatliste + sal_uInt16 nStandardPrec; // Default Precision for Standardformat + SvNumberFormatter* pFormatter; // Pointer to the FormatList - OUString sStrArray[NF_MAX_FORMAT_SYMBOLS]; // Array der Symbole - short nTypeArray[NF_MAX_FORMAT_SYMBOLS]; // Array der Infos - // externe Infos: - sal_uInt16 nAnzResStrings; // Anzahl der Ergebnissymbole + OUString sStrArray[NF_MAX_FORMAT_SYMBOLS]; // Array of symbols + short nTypeArray[NF_MAX_FORMAT_SYMBOLS]; // Array of infos + // External Infos: + sal_uInt16 nAnzResStrings; // Result symbol count #if !(defined SOLARIS && defined X86) - short eScannedType; // Typ gemaess Scan + short eScannedType; // Type according to scan #else - int eScannedType; // wg. Optimierung + int eScannedType; // Due to optimisation #endif - bool bThousand; // Mit Tausenderpunkt - sal_uInt16 nThousand; // Zaehlt ....-Folgen - sal_uInt16 nCntPre; // Zaehlt Vorkommastellen - sal_uInt16 nCntPost; // Zaehlt Nachkommastellen - sal_uInt16 nCntExp; // Zaehlt Exp.Stellen, AM/PM - // interne Infos: - sal_uInt16 nAnzStrings; // Anzahl der Symbole - sal_uInt16 nRepPos; // Position eines '*' - sal_uInt16 nExpPos; // interne Position des E - sal_uInt16 nBlankPos; // interne Position des Blank - short nDecPos; // interne Pos. des , - bool bExp; // wird bei Lesen des E gesetzt - bool bFrac; // wird bei Lesen des / gesetzt - bool bBlank; // wird bei ' '(Fraction) ges. - bool bDecSep; // Wird beim ersten , gesetzt + bool bThousand; // With thousands marker + sal_uInt16 nThousand; // Counts .... series + sal_uInt16 nCntPre; // Counts digits of integral part + sal_uInt16 nCntPost; // Counts digits of fractional part + sal_uInt16 nCntExp; // Counts exponent digits AM/PM + // Internal info: + sal_uInt16 nAnzStrings; // Symbol count + sal_uInt16 nRepPos; // Position of a '*' + sal_uInt16 nExpPos; // Internal position of E + sal_uInt16 nBlankPos; // Internal position of the Blank + short nDecPos; // Internal position of the , + bool bExp; // Set when reading E + bool bFrac; // Set when reading / + bool bBlank; // Set when reading ' ' (Fraction) + bool bDecSep; // Set on first , mutable bool bKeywordsNeedInit; // Locale dependent keywords need to be initialized mutable bool bCompatCurNeedInit; // Locale dependent compatibility currency need to be initialized OUString sCurSymbol; // Currency symbol for compatibility format codes OUString sCurString; // Currency symbol in upper case OUString sCurAbbrev; // Currency abbreviation - OUString sErrStr; // String fuer Fehlerausgaben - - bool bConvertMode; // Wird im Convert-Mode gesetzt - // Land/Sprache, in die der - LanguageType eNewLnge; // gescannte String konvertiert - // wird (fuer Excel Filter) - // Land/Sprache, aus der der - LanguageType eTmpLnge; // gescannte String konvertiert - // wird (fuer Excel Filter) - bool bConvertSystemToSystem; // Whether the conversion is - // from one system locale to - // another system locale (in - // this case the automatic - // currency symbol is converted - // too). - - sal_Int32 nCurrPos; // Position des Waehrungssymbols - - sal_uInt8 nNatNumModifier; // Thai T speciality + OUString sErrStr; // String for error output + + bool bConvertMode; // Set in the convert mode + // Language/country which the scanned string is converted to (for Excel filter) + // Language/country which the scanned string is converted from (for Excel filter) + LanguageType eTmpLnge; + + bool bConvertSystemToSystem; // Whether the conversion is from one system locale to another system locale + // (in this case the automatic currency symbol is converted too). + + sal_Int32 nCurrPos; // Position of currency symbol + + sal_uInt8 nNatNumModifier; // Thai T speciality void InitKeywords() const; void InitSpecialKeyword( NfKeywordIndex eIdx ) const; void InitCompatCur() const; void SetDependentKeywords(); - // Setzt die Sprachabh. Keyw. - void SkipStrings(sal_uInt16& i, sal_Int32& nPos);// Ueberspringt StringSymbole - sal_uInt16 PreviousKeyword(sal_uInt16 i); // Gibt Index des vorangeh. - // Schluesselworts oder 0 - sal_uInt16 NextKeyword(sal_uInt16 i); // Gibt Index des naechsten - // Schluesselworts oder 0 - sal_Unicode PreviousChar(sal_uInt16 i); // Gibt letzten Buchstaben - // vor der Position, - // skipt EMPTY, STRING, STAR, BLANK - sal_Unicode NextChar(sal_uInt16 i); // Gibt ersten Buchst. danach - short PreviousType( sal_uInt16 i ); // Gibt Typ vor Position, - // skipt EMPTY - bool IsLastBlankBeforeFrac(sal_uInt16 i); // True <=> es kommt kein ' ' - // mehr bis zum '/' - void Reset(); // Reset aller Variablen - // vor Analysestart - short GetKeyWord( const OUString& sSymbol, // determine keyword at nPos - sal_Int32 nPos ); // return 0 <=> not found + // Sets the language dependent keywords + void SkipStrings(sal_uInt16& i, sal_Int32& nPos);// Skips StringSymbols + sal_uInt16 PreviousKeyword(sal_uInt16 i); // Returns index of the preceding one + // Keyword or 0 + sal_uInt16 NextKeyword(sal_uInt16 i); // Returns index of the next one + // Keyword or 0 + sal_Unicode PreviousChar(sal_uInt16 i); // Returns last char before index skips EMPTY, STRING, STAR, BLANK + sal_Unicode NextChar(sal_uInt16 i); // Returns first following char + short PreviousType( sal_uInt16 i ); // Returns type before position skips EMPTY + bool IsLastBlankBeforeFrac(sal_uInt16 i); // True <=> there won't be a ' ' until the '/' + void Reset(); // Reset all variables before starting the analysis + short GetKeyWord( const OUString& sSymbol, // Determine keyword at nPos + sal_Int32 nPos ); // Return 0 <=> not found inline bool IsAmbiguousE( short nKey ) // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC { @@ -249,10 +226,10 @@ private: // ---- privater Teil short Next_Symbol(const OUString& rStr, sal_Int32& nPos, - OUString& sSymbol); // Naechstes Symbol - sal_Int32 Symbol_Division(const OUString& rString);// lexikalische Voranalyse - sal_Int32 ScanType(); // Analyse des Formattyps - sal_Int32 FinalScan( OUString& rString ); // Endanalyse mit Vorgabe des Typs + OUString& sSymbol); // Next Symbol + sal_Int32 Symbol_Division(const OUString& rString);// Initial lexical scan + sal_Int32 ScanType(); // Analysis of the Format type + sal_Int32 FinalScan( OUString& rString ); // Final analysis with supplied type // -1:= error, return nPos in FinalScan; 0:= no calendar, 1:= calendar found int FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i, sal_uInt16& nAnzResStrings ); -- cgit