[Libreoffice-commits] core.git: include/sot include/svl
Michael Weghorn
m.weghorn at posteo.de
Wed Dec 17 22:10:00 PST 2014
include/sot/object.hxx | 8 ++++----
include/sot/storage.hxx | 29 ++++++++++++++---------------
include/svl/macitem.hxx | 12 +++++-------
include/svl/numuno.hxx | 4 ++--
include/svl/poolitem.hxx | 16 ++++++----------
include/svl/style.hxx | 14 +++++++-------
6 files changed, 38 insertions(+), 45 deletions(-)
New commits:
commit 7efdc59d61c4f57780047627645caed81f3e654c
Author: Michael Weghorn <m.weghorn at posteo.de>
Date: Wed Dec 17 18:28:58 2014 +0100
fdo#39468 translate German comments
Change-Id: Ibcd2199db171c531018301631d76ec56924da23a
Reviewed-on: https://gerrit.libreoffice.org/13511
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 0bcfdc7..9c52bdb 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -96,8 +96,8 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
friend class SotFactory;
sal_uInt16 nOwnerLockCount;
bool bOwner;
- bool bSVObject; // Ist Proxy, dann TRUE wenn andere Seite SV ist
- bool bInClose; // TRUE, im DoClose
+ bool bSVObject; // is proxy, then TRUE if other side is SV
+ bool bInClose; // TRUE, in DoClose
protected:
virtual ~SotObject();
@@ -115,7 +115,7 @@ public:
virtual const SotFactory * GetSvFactory() const;
virtual void * Cast( const SotFactory * );
- // Nur damit die Makros in So3 nicht ganz ausufern
+ // only for the macros in So3 not to get out of hand
virtual IUnknown * GetInterface( const SvGlobalName & );
bool Owner() const { return bOwner; }
@@ -127,7 +127,7 @@ public:
bool IsInClose() const { return bInClose; }
private:
- // Kopieren und Zuweisen dieses Objekttyps ist nicht erlaubt
+ // copying and assigning this object type is not allowed
SOT_DLLPRIVATE SotObject & operator = ( const SotObject & );
SOT_DLLPRIVATE SotObject( const SotObject & );
};
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index ce8466d..2104e70 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -52,7 +52,7 @@ class BaseStorageStream;
class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream
{
friend class SotStorage;
- BaseStorageStream * pOwnStm;// Zeiger auf den eigenen Stream
+ BaseStorageStream * pOwnStm; // pointer to the own stream
protected:
virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
@@ -103,13 +103,13 @@ class SOT_DLLPUBLIC SotStorage : virtual public SotObject
friend class SotStorageStream;
friend class SvStorage;
- BaseStorage * m_pOwnStg; // Zielstorage
- SvStream * m_pStorStm; // nur fuer SDSTORAGES
+ BaseStorage * m_pOwnStg; // target storage
+ SvStream * m_pStorStm; // only for SDSTORAGES
sal_uLong m_nError;
- OUString m_aName; // Name des Storage
- bool m_bIsRoot; // z.B.: File-Storage
+ OUString m_aName; // name of the storage
+ bool m_bIsRoot; // e.g.: File Storage
bool m_bDelStm;
- OString m_aKey; // aKey.Len != 0 -> Verschluesselung
+ OString m_aKey; // aKey.Len != 0 -> encryption
long m_nVersion;
protected:
@@ -170,40 +170,39 @@ public:
void SignAsRoot( bool b = true ) { m_bIsRoot = b; }
void SetDeleteStream( bool bDelete ) { m_bDelStm = bDelete; }
- // eigener Datenbereich
+ // own data sector
virtual void SetClass( const SvGlobalName & rClass,
sal_uLong bOriginalClipFormat,
const OUString & rUserTypeName );
virtual void SetConvertClass( const SvGlobalName & rConvertClass,
sal_uLong bOriginalClipFormat,
const OUString & rUserTypeName );
- virtual SvGlobalName GetClassName();// Typ der Daten im Storage
+ virtual SvGlobalName GetClassName(); // type of data in the storage
virtual sal_uLong GetFormat();
virtual OUString GetUserName();
virtual bool ShouldConvert();
- // Liste aller Elemente
+ // list of all elements
virtual void FillInfoList( SvStorageInfoList * ) const;
virtual bool CopyTo( SotStorage * pDestStg );
virtual bool Commit();
virtual bool Revert();
- /* Element Methoden */
- // Stream mit Verbindung zu Storage erzeugen,
- // in etwa eine Parent-Child Beziehung
+ // create stream with connection to Storage,
+ // more or less a Parent-Child relationship
SotStorageStream * OpenSotStream( const OUString & rEleName,
StreamMode = STREAM_STD_READWRITE,
StorageMode = 0 );
SotStorage * OpenSotStorage( const OUString & rEleName,
StreamMode = STREAM_STD_READWRITE,
bool transacted = true );
- // Abfrage auf Storage oder Stream
+ // query whether Storage or Stream
virtual bool IsStream( const OUString & rEleName ) const;
virtual bool IsStorage( const OUString & rEleName ) const;
virtual bool IsContained( const OUString & rEleName ) const;
- // Element loeschen
+ // remove element
virtual bool Remove( const OUString & rEleName );
- // Elementnamen aendern
+ // change element's name
virtual bool Rename( const OUString & rEleName,
const OUString & rNewName );
virtual bool CopyTo( const OUString & rEleName, SotStorage * pDest,
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index e2cf48b..1fa3f4c 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -51,7 +51,7 @@ public:
SvxMacro( const OUString &rMacName, const OUString &rLanguage);
SvxMacro( const OUString &rMacName, const OUString &rLibName,
- ScriptType eType); // = STARBASIC entfernt
+ ScriptType eType); // = STARBASIC removes
const OUString &GetLibName() const { return aLibName; }
const OUString &GetMacName() const { return aMacName; }
@@ -69,8 +69,7 @@ inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName,
: aMacName( rMacName ), aLibName( rLibName ), eType( eTyp )
{}
-//Macro Table, zerstoert die Pointer im DTor!
-
+// Macro Table, destroys the pointers in the DTor!
typedef std::map<sal_uInt16, SvxMacro> SvxMacroTable;
#define SVX_MACROTBL_VERSION31 0
@@ -89,7 +88,7 @@ public:
SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy );
int operator==( const SvxMacroTableDtor& rOther ) const;
- // loescht alle Eintraege
+ // deletes all entries
void clear() { aSvxMacroTable.clear(); }
SvStream& Read( SvStream &, sal_uInt16 nVersion = SVX_MACROTBL_AKTVERSION );
@@ -118,8 +117,7 @@ public:
/*
-[Beschreibung]
-Dieses Item beschreibt eine Makro-Tabelle.
+This item describes a Macro table.
*/
class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
@@ -129,7 +127,7 @@ public:
explicit inline SvxMacroItem ( const sal_uInt16 nId );
- // "pure virtual Methoden" vom SfxPoolItem
+ // "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index d1a3373..1671dce 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -62,9 +62,9 @@ public:
void SetNumberFormatter(SvNumberFormatter* pNew);
SvNumberFormatter* GetNumberFormatter() const;
- // ueberladen, um Attribute im Dokument anzupassen
+ // overload to adapt attributes in the document
virtual void NumberFormatDeleted(sal_uInt32 nKey);
- // ueberladen, um evtl. neu zu formatieren
+ // overload to possibly format something anew
virtual void SettingsChanged();
// XNumberFormatsSupplier
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index df4b6fb..45d415b 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -48,7 +48,7 @@ enum SfxItemKind {
#define SFX_ITEMS_MAXREF 0xfffffffe
#define SFX_ITEMS_SPECIAL 0xffffffff
-#define CONVERT_TWIPS 0x80 //Uno-Konvertierung fuer Massangaben (fuer MemberId)
+#define CONVERT_TWIPS 0x80 // Uno conversion for measurement (for MemberId)
@@ -81,8 +81,6 @@ inline ::com::sun::star::uno::Any Bool2Any( bool bValue )
}
-
-//! Notloesung!!!
enum SfxFieldUnit
{
SFX_FUNIT_NONE, SFX_FUNIT_TWIP
@@ -111,13 +109,11 @@ enum SfxMapUnit
enum SfxItemPresentation
-/* [Beschreibung]
-
- Die Werte dieses Enums bezeichnen den Grad der textuellen
- Presentation eines Items nach Aufruf der virtuellen Methode
- <SfxPoolItem::GetPresentation()const>.
-*/
-
+/*
+ * The values of this enum describe the degree of textual
+ * representation of an item after calling the virtual
+ * method <SfxPoolItem::GetPresentation()const>.
+ */
{
SFX_ITEM_PRESENTATION_NAMELESS,
SFX_ITEM_PRESENTATION_COMPLETE
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 904ac85..8254f68 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -78,18 +78,18 @@ private:
SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool();
protected:
- SfxStyleSheetBasePool* pPool; // zugehoeriger Pool
- SfxStyleFamily nFamily; // Familie
+ SfxStyleSheetBasePool* pPool; // related pool
+ SfxStyleFamily nFamily;
OUString aName, aParent, aFollow;
OUString maDisplayName;
- OUString aHelpFile; // Name der Hilfedatei
+ OUString aHelpFile; // name of the help file
SfxItemSet* pSet; // ItemSet
sal_uInt16 nMask; // Flags
- sal_uLong nHelpId; // Hilfe-ID
+ sal_uLong nHelpId; // help ID
- bool bMySet; // sal_True: Set loeschen im dtor
+ bool bMySet; // sal_True: delete Set in dtor
bool bHidden;
SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
@@ -127,8 +127,8 @@ public:
virtual bool HasParentSupport() const; // Default true
virtual bool HasClearParentSupport() const; // Default false
virtual bool IsUsed() const; // Default true
- // Default aus dem Itemset; entweder dem uebergebenen
- // oder aus dem per GetItemSet() zurueckgelieferten Set
+ // Default from the Itemset; either from the passed one
+ // or from the Set returned by GetItemSet()
virtual OUString GetDescription();
virtual OUString GetDescription( SfxMapUnit eMetric );
More information about the Libreoffice-commits
mailing list