[Libreoffice-commits] .: 2 commits - connectivity/source sw/source

Stefan Knorr astron at kemper.freedesktop.org
Mon Feb 27 09:47:29 PST 2012


 connectivity/source/inc/dbase/DCode.hxx      |    2 -
 connectivity/source/inc/dbase/DIndex.hxx     |   47 +++++++++++++--------------
 connectivity/source/inc/dbase/DTable.hxx     |   44 ++++++++++++-------------
 connectivity/source/inc/dbase/dindexnode.hxx |   42 ++++++++++++------------
 sw/source/ui/config/optdlg.src               |    2 -
 5 files changed, 68 insertions(+), 69 deletions(-)

New commits:
commit 8b32c721c61b5c7a52284ef743586159f8f443ee
Author: Philipp Weissenbacher <p.weissenbacher at gmail.com>
Date:   Wed Feb 22 17:33:09 2012 +0100

    Translate comments to German and fix some whitespace

diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 7c5fc73..26fa112 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -50,7 +50,7 @@ namespace connectivity
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL);
         };
 
-        // Attribute aus einer Ergebniszeile
+        // Attributes from a result row
         class OFILEOperandAttr : public file::OOperandAttr
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xIndex;
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 7dcc660..34f1056 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -59,43 +59,42 @@ namespace connectivity
 
         public:
             //==================================================================
-            // Kopfsatz-Struktur, verbleibt im Speicher
+            // Header struct - stays in memory
             //==================================================================
             struct NDXHeader
             {
-                sal_uInt32  db_rootpage;                    /* Position der Rootpage        */
-                sal_uInt32  db_pagecount;                   /* Anzahl Pages                 */
-                sal_uInt8   db_frei[4];                     /* reserviert                   */
-                sal_uInt16  db_keylen;                      /* Laenge des Schluessels       */
-                sal_uInt16  db_maxkeys;                     /* Max. # keys pro Seite        */
-                sal_uInt16  db_keytype;                     /* Art des Schluessels
-                                                           (0-Text)
-                                                           (1-Numerisch)                */
-                sal_uInt16  db_keyrec;                      /* Laenge eines IndexSatzes
-                                                           SatzNr + keylen              */
-                sal_uInt8   db_frei1[3];                    /* reserviert                   */
-                sal_uInt8   db_unique;                      /* eindeutig                    */
-                char        db_name[488];                   /* index_name   (Feldname)      */
+                sal_uInt32  db_rootpage;                    /* Rootpage position                */
+                sal_uInt32  db_pagecount;                   /* Page count                       */
+                sal_uInt8   db_frei[4];                     /* Reserved                         */
+                sal_uInt16  db_keylen;                      /* Key length                       */
+                sal_uInt16  db_maxkeys;                     /* Maximum number of keys per page  */
+                sal_uInt16  db_keytype;                     /* Type of key:
+                                                               0 = Text
+                                                               1 = Numerical                    */
+                sal_uInt16  db_keyrec;                      /* Length of an index record
+                                                               RecordNumber + keylen            */
+                sal_uInt8   db_frei1[3];                    /* Reserved                         */
+                sal_uInt8   db_unique;                      /* Unique                           */
+                char        db_name[488];                   /* index_name (field name)          */
             };
 
         private:
-            SvStream*       m_pFileStream;                  // Stream zum Lesen/Schreiben des Index
+            SvStream*       m_pFileStream;                  // Stream to read/write the index
             NDXHeader       m_aHeader;
-            ONDXPageList    m_aCollector;                   // Pool von nicht mehr benoetigten Seiten
-            ONDXPagePtr     m_aRoot,                        // Wurzel des b+ Baums
-                            m_aCurLeaf;                 // aktuelles Blatt
-            sal_uInt16          m_nCurNode;                 // Position des aktuellen Knoten
+            ONDXPageList    m_aCollector;                   // Pool of obsolete pages
+            ONDXPagePtr     m_aRoot,                        // Root of the B+ tree
+                            m_aCurLeaf;                     // Current leaf
+            sal_uInt16      m_nCurNode;                     // Position of the current node
 
-            sal_uInt32          m_nPageCount,
+            sal_uInt32      m_nPageCount,
                             m_nRootPage;
 
             ODbaseTable*    m_pTable;
-            sal_Bool            m_bUseCollector : 1;                        // Verwenden des GarbageCollectors
+            sal_Bool        m_bUseCollector : 1;            // Use the Garbage Collector
 
             ::rtl::OUString getCompletePath();
             void closeImpl();
-            /* closes and kill the index file and throws an error.
-            */
+            // Closes and kills the index file and throws an error
             void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile);
         protected:
             virtual ~ODbaseIndex();
@@ -145,7 +144,7 @@ namespace connectivity
 
             sal_Bool isUnique() const { return m_IsUnique; }
             sal_Bool UseCollector() const {return m_bUseCollector;}
-            // Tree operationen
+            // Tree operations
             void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
             void Release(sal_Bool bSave = sal_True);
             sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 7ca7ee6..b28392a 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -47,13 +47,13 @@ namespace connectivity
 
         class ODbaseTable : public ODbaseTable_BASE
         {
-            // der Typ einer dBase datei wird mit dem ersten Byte bestimmt
+        // The first byte of a dBase file specifies its type
         public:
             enum DBFType  { dBaseIII         = 0x03,
                             dBaseIV          = 0x04,
                             dBaseV           = 0x05,
                             VisualFoxPro     = 0x30,
-                            VisualFoxProAuto = 0x31, // Visual FoxPro w. AutoIncrement field
+                            VisualFoxProAuto = 0x31, // Visual FoxPro with AutoIncrement field
                             dBaseFS          = 0x43,
                             dBaseFSMemo      = 0xB3,
                             dBaseIIIMemo     = 0x83,
@@ -67,32 +67,32 @@ namespace connectivity
                             };
 
         private:
-            struct DBFHeader {                       /* Kopfsatz-Struktur            */
-                                DBFType db_typ;                         /* Dateityp                     */
-                                sal_uInt8    db_aedat[3];                    /* Datum der letzen Aenderung   */
-                                                                        /* JJ MM TT                     */
-                                sal_uInt32   db_anz;                         /* Anzahl der Saetze            */
-                                sal_uInt16  db_kopf;                        /* laenge Kopfsatz-Struktur     */
-                                sal_uInt16  db_slng;                        /* laenge der Daten-Saetze      */
-                                sal_uInt8    db_frei[20];                    /* reserviert                   */
+            struct DBFHeader {                       /* Header struct */
+                                DBFType      db_typ;                        /* File type                    */
+                                sal_uInt8    db_aedat[3];                   /* Date of last change          */
+                                                                            /* JJ MM DD                     */
+                                sal_uInt32  db_anz;                         /* Data set count               */
+                                sal_uInt16  db_kopf;                        /* Header length                */
+                                sal_uInt16  db_slng;                        /* Data set length              */
+                                sal_uInt8   db_frei[20];                    /* Reserved                     */
                             };
-            struct DBFColumn {                       /* Feldbezeichner               */
-                                sal_uInt8    db_fnm[11];                     /* Feldname                     */
-                                sal_uInt8    db_typ;                         /* Feldtyp                      */
-                                sal_uInt32  db_adr;                         /* Feldadresse                  */
-                                sal_uInt8    db_flng;                        /* Feldlaenge                   */
-                                sal_uInt8    db_dez;                         /* Dezimalstellen fuer N        */
-                                sal_uInt8    db_frei2[14];                   /* reserviert                   */
+            struct DBFColumn {                       /* Column descriptors */
+                                sal_uInt8    db_fnm[11];                     /* Field name                  */
+                                sal_uInt8    db_typ;                         /* Field type                  */
+                                sal_uInt32   db_adr;                         /* Field address               */
+                                sal_uInt8    db_flng;                        /* Field length                */
+                                sal_uInt8    db_dez;                         /* Decimal places for N        */
+                                sal_uInt8    db_frei2[14];                   /* Reserved                    */
                             };
             struct DBFMemoHeader
                             {
-                                DBFMemoType db_typ;                     /* Dateityp                     */
-                                sal_uInt32  db_next;                        /* naechster freier Block       */
-                                sal_uInt16  db_size;                        /* Blockgroesse: dBase 3 fest   */
+                                DBFMemoType db_typ;                         /* File type                    */
+                                sal_uInt32  db_next;                        /* Next free block              */
+                                sal_uInt16  db_size;                        /* Block size: dBase 3 fixed    */
                             };
 
-            ::std::vector<sal_Int32> m_aTypes;      // holds all type for columns just to avoid to ask the propertyset
-            ::std::vector<sal_Int32> m_aPrecisions; // same as aboth
+            ::std::vector<sal_Int32> m_aTypes;      // holds all types for columns just to avoid to ask the propertyset
+            ::std::vector<sal_Int32> m_aPrecisions; // same as above
             ::std::vector<sal_Int32> m_aScales;
             ::std::vector<sal_Int32> m_aRealFieldLengths;
             DBFHeader       m_aHeader;
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index c075ee3..6af869c 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -51,8 +51,8 @@ namespace connectivity
         class ONDXKey : public ONDXKey_BASE
         {
             friend class ONDXNode;
-            sal_uInt32          nRecord;                /* Satzzeiger               */
-            ORowSetValue    xValue;                 /* Schluesselwert           */
+            sal_uInt32      nRecord;                /* Record pointer */
+            ORowSetValue    xValue;                 /* Key values     */
 
         public:
             ONDXKey(sal_uInt32 nRec=0);
@@ -91,9 +91,9 @@ namespace connectivity
 
 
         //==================================================================
-        // Index Seitenverweis
+        // Index Page Pointer
         //==================================================================
-        SV_DECL_REF(ONDXPage) // Basisklasse da weitere Informationen gehalten werden muessen
+        SV_DECL_REF(ONDXPage) // Base class - because we need to store additional information
 
 
         class ONDXPagePtr : public ONDXPageRef
@@ -101,7 +101,7 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-            sal_uInt32  nPagePos;       // Position in der Indexdatei
+            sal_uInt32  nPagePos;       // Position in the index file
 
         public:
             ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
@@ -116,7 +116,7 @@ namespace connectivity
             //  sal_Bool Is() const { return isValid(); }
         };
         //==================================================================
-        // Index Seite
+        // Index Page
         //==================================================================
         class ONDXPage : public SvRefBase
         {
@@ -125,17 +125,17 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPage&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPage&);
 
-            sal_uInt32      nPagePos;               // Position in der Indexdatei
+            sal_uInt32      nPagePos;       // Position in the index file
             sal_Bool        bModified : 1;
             sal_uInt16      nCount;
 
-            ONDXPagePtr aParent,            // VaterSeite
-                        aChild;             // Zeiger auf rechte ChildPage
+            ONDXPagePtr aParent,            // Parent page
+                        aChild;             // Pointer to the right child page
             ODbaseIndex& rIndex;
-            ONDXNode*  ppNodes;             // array von Knoten
+            ONDXNode*  ppNodes;             // Array of nodes
 
         public:
-            // Knoten Operationen
+            // Node operations
             sal_uInt16  Count() const {return nCount;}
 
             sal_Bool    Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
@@ -146,11 +146,11 @@ namespace connectivity
             void    Release(sal_Bool bSave = sal_True);
             void    ReleaseFull(sal_Bool bSave = sal_True);
 
-            // Aufteilen und Zerlegen
+            // Split and merge
             ONDXNode Split(ONDXPage& rPage);
             void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
 
-            // Zugriffsoperationen
+            // Access operators
             ONDXNode& operator[] (sal_uInt16 nPos);
             const ONDXNode& operator[] (sal_uInt16 nPos) const;
 
@@ -165,12 +165,12 @@ namespace connectivity
             sal_uInt32 GetPagePos() const {return nPagePos;}
             ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
 
-            // Parent braucht nicht nachgeladen zu werden
+            // Parent does not need to be reloaded
             ONDXPagePtr GetParent();
             ODbaseIndex& GetIndex() {return rIndex;}
             const ODbaseIndex& GetIndex() const {return rIndex;}
 
-            // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+            // Setting the child, via reference to retain the PagePos
             void SetChild(ONDXPagePtr aCh);
             void SetParent(ONDXPagePtr aPa);
 
@@ -187,7 +187,7 @@ namespace connectivity
             void SetModified(sal_Bool bMod) {bModified = bMod;}
             void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
 
-            sal_Bool Find(const ONDXKey&);  // rek. Abstieg
+            sal_Bool Find(const ONDXKey&);  // Descend recursively
             sal_uInt16 FindPos(const ONDXKey& rKey) const;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -225,12 +225,12 @@ namespace connectivity
         typedef ::std::vector<ONDXPage*>    ONDXPageList;
 
         //==================================================================
-        // Index Knoten
+        // Index Node
         //==================================================================
         class ONDXNode
         {
             friend class ONDXPage;
-            ONDXPagePtr aChild;             /* naechster Seitenverweis  */
+            ONDXPagePtr aChild;             /* Next page reference */
             ONDXKey   aKey;
 
         public:
@@ -239,15 +239,15 @@ namespace connectivity
                        ONDXPagePtr aPagePtr = ONDXPagePtr())
                        :aChild(aPagePtr),aKey(rKey) {}
 
-            // verweist der Knoten auf eine Seite
+            // Does the node point to a page?
             sal_Bool            HasChild() const {return aChild.HasPage();}
-            // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
+            // If an index is provided, we may be able to retrieve the page
             ONDXPagePtr&    GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
 
             const ONDXKey& GetKey() const   { return aKey;}
             ONDXKey&       GetKey()         { return aKey;}
 
-            // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+            // Setting the child, via reference to retain the PagePos
             void            SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL);
             void            SetKey(ONDXKey& rKey) {aKey = rKey;}
 
commit bacf45b72258271f8ff96a371688b781d9c0ba37
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date:   Sat Feb 25 11:56:19 2012 +0100

    Writer/Options: Move Comments 10 units up

diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index e02d415..347bd8b 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -171,7 +171,7 @@ TabPage TP_CONTENT_OPT
     CheckBox CB_POSTIT
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT";
-        Pos = MAP_APPFONT ( 12 , 103 ) ;
+        Pos = MAP_APPFONT ( 12 , 93 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Comments" ;
     };


More information about the Libreoffice-commits mailing list