diff options
author | Christina Rossmanith <Christina Rossmanith> | 2011-01-11 21:53:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-11 21:23:08 +0000 |
commit | 668360f1243f4c7d2a9f52b59ea84146f7932a1c (patch) | |
tree | 9f7f103fe3e12c751efb231ade2e6b913b83dc6a | |
parent | 1c5371bbd4b2465ee51c2c48e9ccca5b22515818 (diff) |
Translated comments from German to English / Removed unnecessary comments
-rw-r--r-- | sc/inc/drwlayer.hxx | 15 | ||||
-rw-r--r-- | sc/inc/editutil.hxx | 18 | ||||
-rw-r--r-- | sc/inc/fielduno.hxx | 6 | ||||
-rw-r--r-- | sc/inc/filter.hxx | 48 |
4 files changed, 38 insertions, 49 deletions
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 49053e96898c..a36c46e0148a 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -74,8 +74,8 @@ public: // ----------------------------------------------------------------------- // -// Das Anpassen der Detektiv-UserData muss zusammen mit den Draw-Undo's -// in der SdrUndoGroup liegen, darum von SdrUndoAction abgeleitet: +// Adjusting of detective UserData and draw undo's both have to be in SdrUndoGroup; +// therefore derived from SdrUndoAction class ScUndoObjData : public SdrUndoObj { @@ -133,17 +133,17 @@ public: void ScRemovePage( SCTAB nTab ); void ScRenamePage( SCTAB nTab, const String& rNewName ); void ScMovePage( USHORT nOldPos, USHORT nNewPos ); - // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt + // incl. content, bAlloc=FALSE -> only content void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); ScDocument* GetDocument() const { return pDoc; } - void UpdateBasic(); // DocShell-Basic in DrawPages setzen + void UpdateBasic(); // set DocShell Basic in DrawPages void UseHyphenator(); BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - // automatische Anpassungen + // automatic adjustments void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } @@ -188,11 +188,10 @@ public: String GetNewGraphicName( long* pnCounter = NULL ) const; void EnsureGraphicNames(); - // Verankerung setzen und ermitteln static void SetAnchor( SdrObject*, ScAnchorType ); static ScAnchorType GetAnchor( const SdrObject* ); - // Positionen fuer Detektivlinien + // positions for detektive lines static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE ); // The sheet information in ScDrawObjData isn't updated when sheets are inserted/deleted. @@ -215,7 +214,7 @@ public: static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE ); private: - static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel + static SfxObjectShell* pGlobalDrawPersist; // for AllocModel public: static void SetGlobalDrawPersist(SfxObjectShell* pPersist); protected: diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 848e652040bc..04b3ba14f9be 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -51,7 +51,7 @@ class ScEditUtil SCROW nRow; SCTAB nTab; Point aScrPos; - OutputDevice* pDev; // MapMode muss eingestellt sein + OutputDevice* pDev; // MapMode has to be set double nPPTX; double nPPTY; Fraction aZoomX; @@ -178,8 +178,6 @@ private: void Init(const ScPatternAttr& rPattern); public: ScTabEditEngine( ScDocument* pDoc ); // Default - // pEnginePool = ScDocument.GetEnginePool() - // pTextObjectPool = ScDocument.GetEditPool() ScTabEditEngine( const ScPatternAttr& rPattern, SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL ); @@ -188,9 +186,9 @@ public: struct ScHeaderFieldData { - String aTitle; // Titel oder Dateiname wenn kein Titel - String aLongDocName; // Pfad und Dateiname - String aShortDocName; // nur Dateiname + String aTitle; // title or file name (if no title) + String aLongDocName; // path and file name + String aShortDocName; // pure file name String aTabName; Date aDate; Time aTime; @@ -202,15 +200,13 @@ struct ScHeaderFieldData }; -// fuer Feldbefehle in der Tabelle +// for field commands (or just fields?) in a table class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter { private: BOOL bExecuteURL; public: - // pEnginePool = ScDocument.GetEnginePool() - // pTextObjectPool = ScDocument.GetEditPool() ScFieldEditEngine( SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL, BOOL bDeleteEnginePool = FALSE ); @@ -249,15 +245,13 @@ class ScNoteEditEngine : public ScEditEngineDefaulter { public: - // pEnginePool = ScDocument.GetEnginePool() - // pTextObjectPool = ScDocument.GetEditPool() ScNoteEditEngine( SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL, BOOL bDeleteEnginePool = FALSE ); }; -// SvxFieldData-Ableitungen sind nach Svx verschoben +// SvxFieldData derivations were moved to Svx (comment can be deleted?) #endif diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index ae4aec33979d..a4a1adedbaf4 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -142,7 +142,7 @@ private: SvxEditSource* pEditSource; ESelection aSelection; - String aUrl; // Inhalt, wenn noch nicht eingefuegt (nur dann!) + String aUrl; // content, only iff not already inserted String aRepresentation; String aTarget; @@ -154,7 +154,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // per getImplementation gerufen: + // called by getImplementation: void DeleteField(); BOOL IsInserted() const { return pEditSource != NULL; } SvxFieldItem CreateFieldItem(); @@ -349,7 +349,7 @@ public: USHORT nT, const ESelection& rSel); virtual ~ScHeaderFieldObj(); - // per getImplementation gerufen: + // called by getImplementation: void DeleteField(); BOOL IsInserted() const { return pEditSource != NULL; } SvxFieldItem CreateFieldItem(); diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 2f00b29e7651..466546b342a6 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -42,38 +42,34 @@ class ScDocument; class ScRange; class SvNumberFormatter; -// Return-Werte Im-/Exportfilter (ULONG) +// return values im-/export filter (ULONG) typedef ULONG FltError; -//enum FltError { -#define eERR_OK ERRCODE_NONE // kein Fehler, alles OK +#define eERR_OK ERRCODE_NONE // no error #define eERR_OPEN SCERR_IMPORT_OPEN // ... -#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unbekannter Fehler, auch historische Bedeutung -#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // nicht mehr genuegend Speicher zur Verfuegung -#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unbekanntes WK?-Format (Lotus 1-2-3) -#define eERR_FORMAT SCERR_IMPORT_FORMAT // Formatfehler beim Lesen (kein Formel-Fehler!) -#define eERR_NI SCERR_IMPORT_NI // Nicht implementierter Filter -#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unbekanntes BIFF-Format (Excel) -#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // nicht implementiertes BIFF-Format -#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // File Passwordgeschuetzt -#define eERR_INTERN SCERR_IMPORT_INTERNAL // interner Fehler -#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// ueberlauf der Zellkoordinaten: - // Tabelle abgschnitten auf erlaubtem Bereich -// mehr Fehlercodes siehe scerrors.hxx - -// }; - - -// fuer Import +#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unknown error, historical meaning +#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // out of memory +#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unknown WK? format (Lotus 1-2-3) +#define eERR_FORMAT SCERR_IMPORT_FORMAT // format error during reading (no formula error!) +#define eERR_NI SCERR_IMPORT_NI // filter not implemented +#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unknown BIFF format (Excel) +#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // not implemented BIFF format +#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // file password protected +#define eERR_INTERN SCERR_IMPORT_INTERNAL // internal error +#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// overflow of cell coordinates + // table restricted to valid area (?) +// more error codes: s. scerrors.hxx + +// for import enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 }; -// fuer Export +// for export enum ExportFormatLotus { ExpWK1, ExpWK3, ExpWK4 }; enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpBiff8, Exp2007Xml }; -// Optionen fuer DIF-Im-/Export (Kombination ueber '|') +// options for DIF im-/export (combine with '|') #define SC_DIFOPT_PLAIN 0x00000000 #define SC_DIFOPT_DATE 0x00000001 #define SC_DIFOPT_TIME 0x00000002 @@ -102,10 +98,10 @@ class ScFormatFilterPlugin { virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0; virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) = 0; virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) = 0; - // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet - // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) - // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) - // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren + // eFormat == EIF_AUTO -> matching filter is used automatically + // eFormat == EIF_BIFF5 -> only Biff5 stream is read sucessfully (in an Excel97 doc, too) + // eFormat == EIF_BIFF8 -> only Biff8 stream is read sucessfully (only in Excel97 docs) + // eFormat == EIF_BIFF_LE4 -> only non storage files _might_ be read sucessfully virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; |