I started translating comments in svx/inc from german to english. All
files directyl in svx/inc have been translated and the files in
svx/inc/svx from AccessibleControlShape.hxx to sdtaitm.hxx in
alphabetical order.
You can commit the patch under the terms of LGPL3+.
Greetings, Wolfgang.
diff --git a/svx/inc/anchorid.hxx b/svx/inc/anchorid.hxx
index a7c814b..f60689f 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/anchorid.hxx
@@ -30,11 +30,11 @@
enum SvxAnchorIds
{
- SVX_OBJ_AT_CNTNT = 0x01, //Absatzgebundener Rahmen
- SVX_OBJ_IN_CNTNT = 0x02, //Zeichengebundener Rahmen
- SVX_OBJ_PAGE = 0x04, //Seitengebundener Rahmen
- SVX_OBJ_AT_FLY = 0x08 //Rahmengebundener Rahmen
-// SVX_OBJ_AUTO_CNTNT = 0x10 //Automatisch positionierter, absatzgebundener Rahmen
+ SVX_OBJ_AT_CNTNT = 0x01, // Frame bound to paragraph
+ SVX_OBJ_IN_CNTNT = 0x02, // Frame bound to character
+ SVX_OBJ_PAGE = 0x04, // Frame bound to page
+ SVX_OBJ_AT_FLY = 0x08 // Frame bound to other frame
+// SVX_OBJ_AUTO_CNTNT = 0x10 // Automatically positioned frame bound to paragraph
};
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index a8ad139..3ab5120 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -38,7 +38,7 @@ class E3dScene;
/*************************************************************************
|*
-|* Parameter fuer Interaktion eines 3D-Objektes
+|* Parameters for the interaction of a 3D object
|*
\************************************************************************/
class E3dDragMethodUnit
@@ -67,7 +67,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod fuer 3D-Objekte
+|* Derivative of SdrDragMethod for 3D objects
|*
\************************************************************************/
@@ -104,7 +104,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod zum Drehen von 3D-Objekten
+|* Derivative of SdrDragMethod for spinning 3D objects
|*
\************************************************************************/
@@ -127,7 +127,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod zum Verschieben von 3D-Subobjekten
+|* Derivative of SdrDragMethod for moving 3D sub-objects
|*
\************************************************************************/
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/flagsdef.hxx
index b56d69f..1368ee6 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/flagsdef.hxx
@@ -81,7 +81,7 @@ enum SvxModeType
// define ----------------------------------------------------------------
// 1/2 cm in TWIPS
-// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt
+// Is also used for minimum size of LayFrms of any kind
#define MM50 283 //from original svx/inc/paragrph.hxx
//--------------from original svx/inc/tabstpge.hxx
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/fmgridif.hxx
index 31f3913..b2b3ebd 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/fmgridif.hxx
@@ -232,7 +232,7 @@ public:
FmXGridControl(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&);
virtual ~FmXGridControl();
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl);
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const
::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
@@ -317,12 +317,12 @@ public:
protected:
virtual FmXGridPeer* imp_CreatePeer(Window* pParent);
- // ImplCreatePeer waere besser ;) geht aber nicht, da dann nicht exportiert
+ // ImplCreatePeer would be better, but doesn't work because it's not exported
};
//==================================================================
-// FmXGridPeer -> Peer fuers Gridcontrol
+// FmXGridPeer -> Peer for the Gridcontrol
//==================================================================
typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer,
::com::sun::star::form::XBoundComponent,
@@ -385,7 +385,7 @@ public:
// spaeter Constructor, immer nach dem realen Constructor zu rufen !
void Create(Window* pParent, WinBits nStyle);
-// UNO Anbindung
+// UNO connection
DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow);
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type&
_rType) throw (::com::sun::star::uno::RuntimeException);
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 6745d70..f40993f 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -104,13 +104,13 @@
// at the end of the file!!
// -----------------------------------------------------------------------
-// "Uberlaufpr"ufung -----------------------------------------------------
+// Overflow check --------------------------------------------------------
// -----------------------------------------------------------------------
#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL
#if ACT_FM_HID_END > HID_FORMS_END
-#error Resource-Ueberlauf in #line, #file
+#error Resource overflow in #line, #file
#endif
#endif
diff --git a/svx/inc/globl3d.hxx b/svx/inc/globl3d.hxx
index 0d965bd..ce41001 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/globl3d.hxx
@@ -30,7 +30,6 @@
#include <tools/solar.h>
-//#define ESODEBUG
#define E3D_STREAMING
const double PrecisionLimit = 1.0e-14;
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 29899ed..573f7a9 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -288,7 +288,7 @@
#define ACT_SVX_HID_END (HID_SVX_START+248)
#if ACT_SVX_HID_END > HID_SVX_END
-#error Resource-Ueberlauf in #line, #file
+#error Resource overflow in #line, #file
#endif
#endif
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index 65efcea..2165307 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -53,7 +53,7 @@ class ImageMap;
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float
+|* Derivation from SfxChildWindow as "container" for float
|*
\************************************************************************/
diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index cf28397..1692829 100644
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
@@ -40,7 +40,7 @@
/*************************************************************************
|*
-|* 3D-Tab-Dialog
+|* 3D TabDialog
|*
\************************************************************************/
@@ -56,7 +56,7 @@ public:
/*************************************************************************
|*
-|* 3D-SingleTab-Dialog
+|* 3D SingleTabDialog
|*
\************************************************************************/
class Svx3DSingleTabDialog : public SfxSingleTabDialog
diff --git a/svx/inc/numvset.hxx b/svx/inc/numvset.hxx
index 63915d0..4ea7ca4 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/numvset.hxx
@@ -58,9 +58,6 @@ struct SvxBmpItemInfo
USHORT nItemId;
};
-/*-----------------09/09/97 01:05pm-----------------
-
---------------------------------------------------*/
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
Color aLineColor;
@@ -101,10 +98,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
const com::sun::star::lang::Locale& rLocale);
};
-/*-----------------13.02.97 09.32-------------------
-
---------------------------------------------------*/
-
class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{
String sBullets;
@@ -120,15 +113,12 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
Timer& GetFormatTimer() {return aFormatTimer;}
public:
- SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/);
+ SvxBmpNumValueSet( Window* pParent, const ResId& rResId);
~SvxBmpNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
-/*-----------------02.12.97 10:31-------------------
-
---------------------------------------------------*/
class SvxNumberingPreview : public Window
{
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/objfac3d.hxx
index 34dcb8b..aac412c 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/objfac3d.hxx
@@ -33,7 +33,7 @@
/*************************************************************************
|*
-|* Factory fuer Chart-spezifische Objekte
+|* Factory for chart-specific objects
|*
\************************************************************************/
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/optgenrl.hxx
index c3afa9c..ca7cdc1 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/optgenrl.hxx
@@ -27,7 +27,7 @@
#ifndef _SVX_OPTGENRL_HXX
#define _SVX_OPTGENRL_HXX
-// Defines for setting the fokus of a Edit via a slot from external.
+// Defines for setting the focus of a Edit via a slot from external.
#define UNKNOWN_EDIT ((USHORT)0)
#define COMPANY_EDIT ((USHORT)1)
#define FIRSTNAME_EDIT ((USHORT)2)
@@ -46,5 +46,3 @@
#define EMAIL_EDIT ((USHORT)15)
#endif // #ifndef _SVX_OPTGENRL_HXX
-
-
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index 9fbd009..bc51819 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -140,7 +140,7 @@ private:
FixedText aDivisionPointY;
CheckBox aCbxSynchronize;
- FixedLine aGrpDrawGrid; // Neu
+ FixedLine aGrpDrawGrid;
protected:
//these controls are used in draw and impress
@@ -164,7 +164,6 @@ protected:
private:
BOOL bAttrModified;
-// BOOL bEqualGrid; // Neu
#ifdef _SVX_OPTGRID_CXX
DECL_LINK( ClickRotateHdl_Impl, void * );
diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx
index 466baf1..d8b7b18 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/postattr.hxx
@@ -37,8 +37,7 @@
/*
-[Beschreibung]
-Dieses Item beschreibt das Autoren-Kuerzel eines Notizzettels.
+The author shorthand symbol of a note
*/
class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
@@ -69,8 +68,7 @@ public:
/*
-[Beschreibung]
-Dieses Item beschreibt das Datum eines Notizzettels.
+The date of a note
*/
class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
@@ -100,8 +98,7 @@ public:
/*
-[Beschreibung]
-Dieses Item beschreibt den Text eines Notizzettels.
+The text of a note
*/
class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
@@ -112,7 +109,7 @@ public:
SvxPostItTextItem( USHORT nWhich );
SvxPostItTextItem( const String& rText, USHORT nWhich );
- // "pure virtual Methoden" vom SfxPoolItem
+ // "pure virtual methods" vom SfxPoolItem
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx
index 9f5817b..b50aa11 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/relfld.hxx
@@ -34,12 +34,6 @@
// class SvxRelativeField ------------------------------------------------
-/*
- [Beschreibung]
-
- "Ahnlich der Klasse FontSizeBox. Abgeleitet von der Klasse MetricField.
- Zus"atzliche Funktionalit"at: relative Angaben.
-*/
class SVX_DLLPUBLIC SvxRelativeField : public MetricField
{
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
index 090f5b4..1343f46 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/rotmodit.hxx
@@ -32,7 +32,7 @@
#include "svx/svxdllapi.h"
//----------------------------------------------------------------------------
-// Ausrichtung bei gedrehtem Text
+// Alignment with rotated text
enum SvxRotateMode
{
diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
index 1d2a2b8..5a68d74 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/rulritem.hxx
@@ -38,8 +38,8 @@
class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
{
- long lLeft; // nLeft oder der neg. Erstzeileneinzug
- long lRight; // der unproblematische rechte Rand
+ long lLeft; // nLeft or the negativ first-line indentation
+ long lRight; // the unproblematic right edge
protected:
@@ -74,8 +74,8 @@ public:
class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
{
- long lLeft; // nLeft oder der neg. Erstzeileneinzug
- long lRight; // der unproblematische rechte Rand
+ long lLeft; // nLeft or the negative first-line indentation
+ long lRight; // the unproblematic right edge
protected:
@@ -143,9 +143,9 @@ public:
struct SvxColumnDescription
{
- long nStart; /* Spaltenbeginn */
- long nEnd; /* Spaltenende */
- BOOL bVisible; /* Sichtbarkeit */
+ long nStart; /* Start of the column */
+ long nEnd; /* End of the column */
+ BOOL bVisible; /* Visibility */
long nEndMin; //min. possible position of end
long nEndMax; //max. possible position of end
@@ -190,13 +190,13 @@ typedef SvPtrarr SvxColumns;
class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
{
- SvxColumns aColumns;// Spaltenarray
- long nLeft, // Linker Rand bei Tabelle
- nRight; // Rechter Rand bei Tabelle; bei Spalten immer gleich
- // zum umgebenden Rahmen
- USHORT nActColumn; // die aktuelle Spalte
- BOOL bTable; // Tabelle?
- BOOL bOrtho; // Gleichverteilte Spalten
+ SvxColumns aColumns;// Column array
+ long nLeft, // Left edge for the table
+ nRight; // Right edge for the table; for columns always
+ // equal to the surrounding frame
+ USHORT nActColumn; // the current column
+ BOOL bTable; // table?
+ BOOL bOrtho; // evenly spread columns
void DeleteAndDestroyColumns();
@@ -214,11 +214,11 @@ protected:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE
nMemberId = 0 );
public:
TYPEINFO();
- // rechter Rand des umgebenden Rahmens
- // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen
- SvxColumnItem(USHORT nAct = 0); // Spalten
+ // right edge of the surrounding frame
+ // nLeft, nRight each the distance to the surrounding frame
+ SvxColumnItem(USHORT nAct = 0); // columns
SvxColumnItem(USHORT nActCol,
- USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern
+ USHORT nLeft, USHORT nRight = 0); // table with borders
SvxColumnItem(const SvxColumnItem &);
~SvxColumnItem();
@@ -251,7 +251,7 @@ public:
BOOL IsOrtho () const { return FALSE ; }
BOOL IsConsistent() const { return nActColumn < aColumns.Count(); }
- long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte
+ long GetVisibleRight() const;// right visible edge of the current column
};
// class SvxObjectItem ---------------------------------------------------
@@ -259,11 +259,11 @@ public:
class SVX_DLLPUBLIC SvxObjectItem : public SfxPoolItem
{
private:
- long nStartX; /* Beginn in X-Richtung */
- long nEndX; /* Ende in X-Richtung */
- long nStartY; /* Beginn in Y-Richtung */
- long nEndY; /* Ende in Y-Richtung */
- BOOL bLimits; /* Grenzwertkontrolle durch die
Applikation */
+ long nStartX; /* Start in x direction */
+ long nEndX; /* End in x direction */
+ long nStartY; /* Start in y direction */
+ long nEndY; /* Ende in y direction */
+ BOOL bLimits; /* boundary limit control by the
application */
protected:
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 2b27902..b2ef152 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -34,24 +34,15 @@ class VCForm;
class VCManager;
class VCRadioManager;
-
-// Basis-Klasse aller VCControl-Wrapper-Klassen
-// Haelt Verweis auf das Control und handelt einige gemeinsame Properties
+// Base class of all VCControl wrapper classes
+// Keeps reference to the Control and handles some common properties
class ImpSjJScriptControlBase
{
protected:
VCControl* pControl;
public:
- // Beibehalten bis zum Vollupdate
- /*
- String getName() const;
- void setName( const String & aStrg );
- String getValue() const;
- String getType() const;
- */
-
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
String ImpGetName() const;
void ImpSetName( const String & aStrg );
@@ -59,7 +50,7 @@ class ImpSjJScriptControlBase
void ImpSetValue( const String & aStrg );
String ImpGetType() const;
- // Konstruktor
+ // Constructor
ImpSjJScriptControlBase::ImpSjJScriptControlBase( VCControl* _pControl );
};
@@ -69,40 +60,40 @@ class ImpSjJScriptControlBase
class ImpSjJScriptButtonObject : public SjJScriptButtonObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // constructor
ImpSjJScriptButtonObject( VCControl* _pControl, SjJSbxObject * p );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// PasswordControl (Edit-Control zur Password-Eingabe)
+// PasswordControl (edit control for entering password)
class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -112,16 +103,16 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject,
ImpSjJScriptC
virtual void setDefaultValue( const String & aStrg );
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none!
- // Konstruktor
+ // construktor
ImpSjJScriptPasswordObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -130,9 +121,9 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC
class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -142,28 +133,27 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject,
ImpSjJScriptC
virtual void setChecked( BOOL bCheck );
virtual BOOL getDefaultChecked() const;
virtual void setDefaultChecked( BOOL bCheck );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // construktor
ImpSjJScriptCheckboxObject( VCControl* _pControl, SjJSbxObject * p );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Wrapper-Klasse fuer RadioArray
+// Wrapper class for RadioArray
class ImpSjJScriptRadioArray: public SjJSbxArrayObject
{
VCRadioManager* pMgr;
@@ -172,7 +162,7 @@ public:
SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const;
SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const;
- // Konstruktor
+ // construktor
ImpSjJScriptRadioArray::ImpSjJScriptRadioArray( VCRadioManager* _pMgr, SjJSbxObject * p );
};
@@ -181,37 +171,33 @@ public:
class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // Properties von SjJScriptCheckboxObject
+ // Properties of SjJScriptCheckboxObject
virtual BOOL getChecked() const;
virtual void setChecked( BOOL bCheck );
virtual BOOL getDefaultChecked() const;
virtual void setDefaultChecked( BOOL bCheck );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // yyy Raus zum inkompatiblen
- //virtual INT32 getLength();
-
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptRadioObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -220,9 +206,9 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -232,17 +218,13 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject,
ImpSjJScriptContr
virtual INT32 getSelectedIndex() const;
virtual void setSelectedIndex( INT32 nNo );
- // liefert eine Array von Option-Objekten
- //yyy Raus zum inkompatiblen
- //virtual SjJSbxArrayObject * getOptions();
-
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -259,23 +241,20 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject,
ImpSjJScriptContr
virtual void setOnFocus( const String & aSourceStrg );
void onFocus();
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
virtual INT32 getLength() const;
- // Zugriff "uber den Index
+ // Access through the index
virtual SjJSbxObject * getElement( INT32 nIndex ) const;
- // Zugriff "uber den Namen
- // native Java-Methoden k"onnen (noch) nicht "uberladen werden
- //virtual SjJSbxObject * getElement_String( const String & aName ) const;
- // Konstruktor
+ // Constructor
ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p );
- // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997
+ // for setting entries of the object (to be called from Java)
virtual void setOption( INT32 nIndex, const String & aOptionText,
const String & aOptionValue,
BOOL bDefaultSelected, BOOL bSelected );
- // Schnittstelle fuer die Properties der Option-Objekte
+ // interface for the properties of the option objects
virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const;
virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex );
virtual BOOL getOptionSelected( INT32 nIndex ) const;
@@ -288,13 +267,11 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject,
ImpSjJScriptContr
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Wieso von Controlbase abgeleitet?
-
class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase
{
USHORT nListBoxIndex;
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
virtual BOOL getdefaultSelected() const;
virtual void setdefaultSelected( BOOL bSelected );
@@ -302,53 +279,44 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject,
ImpSjJScriptContr
virtual BOOL getSelected() const;
virtual void setSelected( BOOL bSelected );
-
- //yyy Zum Vollupdate raus:
- /*
- virtual INT32 getSelectedIndex() const;
- virtual void setSelectedIndex( INT32 nNo );
- */
-
-
virtual String getText() const;
virtual void setText( const String & sText );
- // getValue() wird in der Basisklasse definiert
virtual String getValue() const;
virtual void setValue( const String & aStrg );
- // DUMMY-Methoden
+ // DUMMY methods
virtual String getName() const { return "";}
virtual void setName( const String &s) { }
virtual String getType() const { return "";}
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Eigene Klasse fuer forms-Array anlegen
+// Separate class for forms array
class SjJSbxFormsArray: public SfxJSArray
{
VCManager* pManager;
public:
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
virtual INT32 getLength() const;
- // Zugriff "uber den Index
+ // access through the index
virtual SjJSbxObject * getElement( INT32 nIndex ) const;
- // Zugriff "uber den Namen
- // native Java-Methoden k"onnen (noch) nicht "uberladen werden
+ // access through the name
+ // cannot overload native java methods (yet)
virtual SjJSbxObject * getElement_String( const String & aName ) const;
- // Konstruktor
+ // Constructor
SjJSbxFormsArray( VCManager * _pManager, SjJSbxObject * p );
};
@@ -357,9 +325,9 @@ class SjJSbxFormsArray: public SfxJSArray
class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -367,17 +335,16 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject,
ImpSjJScriptControlBa
virtual String getDefaultValue() const;
virtual void setDefaultValue( const String & aStrg );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -399,7 +366,7 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
virtual void setOnSelect( const String & aSourceStrg );
void onSelect();
- // Konstruktor
+ // Constructor
ImpSjJScriptTextObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -408,9 +375,9 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -418,17 +385,16 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject,
ImpSjJScriptC
virtual String getDefaultValue() const;
virtual void setDefaultValue( const String & aStrg );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -450,7 +416,7 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
virtual void setOnSelect( const String & aSourceStrg );
void onSelect();
- // Konstruktor
+ // Constructor
ImpSjJScriptTextareaObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -458,30 +424,30 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject,
ImpSjJScriptC
class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptControlBase
{
- // Identisch mit ButtonObject
+ // identically equal to ButtonObject
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptSubmitObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -489,30 +455,30 @@ class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject,
ImpSjJScriptContr
class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControlBase
{
- // Identisch mit ButtonObject
+ // identically equal to ButtonObject
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptResetObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -521,25 +487,24 @@ class ImpSjJScriptResetObject : public SjJScriptResetObject,
ImpSjJScriptControl
class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptHiddenObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -548,22 +513,22 @@ class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject,
ImpSjJScriptContr
class ImpSjJScriptFileUploadObject : public SjJScriptFileUploadObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptFileUploadObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -574,7 +539,7 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
VCForm* pVCForm;
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
virtual String getName() const;
virtual void setName( const String & aStrg );
@@ -590,26 +555,18 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
virtual String getTarget() const;
virtual void setTarget( const String & sValue );
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
INT32 getLength() const;
SjJSbxObject* getElement( INT32 nIndex ) const;
SjJSbxObject* getElement_String( const String & aName ) const;
- // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject
- // yyy Raus zum inkompatiblen
- //virtual SjJSbxArrayObject * getElements();
-
- // Zugriff ueber den Namen eines Controls (falls ein Name zugeordnet ist)
- // yyy Raus zum inkompatiblen
- //virtual SjJSbxObject * getElement( const String & aName );
-
- // Methoden des Objektes
+ // Methods of the object
virtual void submit();
virtual void reset();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnSubmit_Fct() const;
virtual void setOnSubmit_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnReset_Fct() const;
@@ -621,7 +578,7 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
virtual void setOnReset( const String & aSourceStrg );
void onReset();
- // Konstruktor
+ // Constructor
ImpSjJScriptFormObject( VCForm* _pVCForm, SjJSbxObject * p );
};
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index 42f57a7..c930e70 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -88,10 +88,10 @@ public:
SearchAttrItem& GetObject( USHORT nPos ) const
{ return SrchAttrItemList::GetObject( nPos ); }
- // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen)
+ // the pointer to the item is not being copierd, so don't delete
void Insert( const SearchAttrItem& rItem )
{ SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); }
- // l"oscht die Pointer auf die Items
+ // deletes the pointer to the items
void Remove( USHORT nPos, USHORT nLen = 1 );
};
@@ -120,10 +120,10 @@ public:
/*
{k:\svx\prototyp\dialog\srchdlg.hxx}
- [Beschreibung]
- In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt
- und damit eine Suche gestartet. Es sind mehrere Sucharten
- ( Suchen, Alle suchen, Ersetzen, Alle ersetzen ) m"oglich.
+ [Description]
+ In this modeless dialog the attributes for a search are configured
+ and a search is started from it. Several search types
+ (search, search all, replace, replace all) are possible.
[Items]
<SvxSearchItem><SID_ATTR_SEARCH>
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index 396ab1c..4b08508 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -36,7 +36,7 @@
#include <svx/svxdllapi.h>
//************************************************************
-// Vorausdeklarationen
+// forward declaration
//************************************************************
class Link;
@@ -48,7 +48,7 @@ class ImpSdrStrCache;
// Defines
//************************************************************
-// Den zur App passenden Resourcemanager holen
+// Get the resource manager for the app
ResMgr* ImpGetResMgr();
class SdrResId: ResId {
@@ -56,11 +56,11 @@ public:
SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {}
};
-// ResourceCache fuer haeuffig benoetigte Strings
-// gecachet werden globale String-Resourcen mit den
-// IDs von SDR_StringCacheBegin (256) bis
-// SDR_StringCacheEnd (weiss ich grad' nicht).
-// Hierzu siehe auch SvdStr.Hrc
+// ResourceCache for frequently used strings.
+// Global string resources with the IDs from
+// SDR_StringCacheBegin (256) to SDR_StringCacheEnd
+// are cached.
+// See also SvdStr.Hrc
SVX_DLLPUBLIC String ImpGetResStr(sal_uInt16 nResID);
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index bb78fb3..76aed3d 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -70,7 +70,7 @@ protected:
virtual void DoubleClick(const BrowserMouseEvent&);
virtual void KeyInput(const KeyEvent& rEvt);
virtual void Select();
- virtual void SetDirty(); // wird z.B. bei Modusumschaltungen gerufen
+ virtual void SetDirty(); // is called for example in mode switches
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32
nIndex);
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point&
_rPoint);
public:
diff --git a/svx/inc/svditer.hxx b/svx/inc/svditer.hxx
index dcae622..ed70a3b 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svditer.hxx
@@ -37,9 +37,9 @@ class SdrObject;
class SdrMarkList;
// SdrObjListIter methods:
-// IM_FLAT : Flach ueber die Liste
-// IM_DEEPWITHGROUPS : Mit rekursivem Abstieg, Next() liefert auch Gruppenobjekte
-// IM_DEEPNOGROUPS : Mit rekursivem Abstieg, Next() liefert keine Gruppenobjekte
+// IM_FLAT : Flat over the list
+// IM_DEEPWITHGROUPS : With recursive descent parser, Next() also returns group objects
+// IM_DEEPNOGROUPS : With recursive descent parser, Next() returns no group objects
enum SdrIterMode { IM_FLAT, IM_DEEPWITHGROUPS, IM_DEEPNOGROUPS};
class SVX_DLLPUBLIC SdrObjListIter
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index b618670..56744d8 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -27,9 +27,8 @@
#define SDR_ResourceBegin 2560
-// Achtung: Alle Strings zwischen SDR_StringCacheBegin und
-// SDR_StringCacheEnd muessen buendig aneinander liegen.
-//BFS06#define SDR_StringCacheBegin (SDR_ResourceBegin)
+// Attention: All strings between SDR_StringCacheBegin and
+// SDR_StringCacheEnd must be aligned next to each other.
#define STR_ObjNameBegin (SDR_ResourceBegin)
#define STR_ObjNameSingulNONE (STR_ObjNameBegin + 0)
@@ -154,7 +153,6 @@
#define STR_ObjNameSingulUno (STR_ObjNameBegin +119)
#define STR_ObjNamePluralUno (STR_ObjNameBegin +120)
-// Neu ab 537: Namen fuer 3D-Objekte
#define STR_ObjNameSingulCube3d (STR_ObjNameBegin + 121)
#define STR_ObjNamePluralCube3d (STR_ObjNameBegin + 122)
#define STR_ObjNameSingulExtrude3d (STR_ObjNameBegin + 123)
@@ -165,7 +163,6 @@
#define STR_ObjNamePluralLathe3d (STR_ObjNameBegin + 128)
#define STR_ObjNameSingulObj3d (STR_ObjNameBegin + 129)
#define STR_ObjNamePluralObj3d (STR_ObjNameBegin + 130)
-//BFS01#define STR_ObjNameSingulPoly3d (STR_ObjNameBegin + 131)
#define STR_ObjNamePluralPoly3d (STR_ObjNameBegin + 132)
#define STR_ObjNameSingulScene3d (STR_ObjNameBegin + 133)
#define STR_ObjNamePluralScene3d (STR_ObjNameBegin + 134)
@@ -398,12 +395,6 @@
#define STR_ItemNam_SHADOWTRANSPARENCE (STR_ItemNamBegin + 4)
#define STR_ItemNam_SHADOW3D (STR_ItemNamBegin + 5)
#define STR_ItemNam_SHADOWPERSP (STR_ItemNamBegin + 6)
-//BFS01#define STR_ItemNam_SHADOWRESERVE1 (STR_ItemNamBegin + 7)
-//BFS01#define STR_ItemNam_SHADOWRESERVE2 (STR_ItemNamBegin + 8)
-//BFS01#define STR_ItemNam_SHADOWRESERVE3 (STR_ItemNamBegin + 9)
-//BFS01#define STR_ItemNam_SHADOWRESERVE4 (STR_ItemNamBegin + 10)
-//BFS01#define STR_ItemNam_SHADOWRESERVE5 (STR_ItemNamBegin + 11)
-//BFS01#define STR_ItemNamSET_SHADOW (STR_ItemNamBegin + 12)
#define STR_ItemNam_CAPTIONTYPE (STR_ItemNamBegin + 13)
#define STR_ItemNam_CAPTIONFIXEDANGLE (STR_ItemNamBegin + 14)
#define STR_ItemNam_CAPTIONANGLE (STR_ItemNamBegin + 15)
@@ -462,14 +453,12 @@
#define STR_ItemNamEnd (STR_ItemNam_SHEARANGLE)
#define STR_ItemEnd STR_ItemNamEnd
-// 22-05-98: 2 Eintraege fuer die Bitmaps von der StrErrorReserve abgeknapst
-//BFS06#define BMAP_Begin (STR_ErrorEnd+1)
#define BMAP_Begin (STR_ItemEnd+1)
#define BMAP_GrafikEi (BMAP_Begin +0)
#define BMAP_GrafikDe (BMAP_Begin +1)
#define BMAP_End (BMAP_GrafikDe)
-// Strings fuer den Vorlagen-Dialog
+// Strings for the template dialog
#define SIP_Begin (BMAP_End)
#define SIP_UNKNOWN_ATTR (SIP_Begin + 0)
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svdviter.hxx
index 43f8c0e..1d5528a 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svdviter.hxx
@@ -32,6 +32,39 @@
#include <sal/types.h>
#include "svx/svxdllapi.h"
+/*
+
+Using this class, you can find out:
+- SdrView* First/NextView()
+ - All Views in which a model is displayed
+ - All Views in which a certain page is visible (also as MasterPage)
+ - All Views in which a certain object is visible (also as MasterPage)
+- SdrPageView* First/NextPageView()
+ - All PageViews in which a model is displayed
+ - All PageViews in which a certain page is visible (also as MasterPage)
+ - All PageViews in which a certain object is visible (also as MasterPage)
+- OutputDevice* First/NextOutDev()
+ - All OutputDevices in which a model is displayed
+ - All OutputDevices in which a certain page is visible (also as MasterPage)
+ - All OutputDevices in which a certain object is visible (also as MasterPage)
+- Window* First/NextWindow()
+ - All Windows in which a model is displayed
+ - All Windows in which a certain page is visible (also as MasterPage)
+ - All Windows in which a certain object is visible (also as MasterPage)
+You can specify if the selection is restricted to a certain page/object by
+choosing the corresponding constructor.
+
+Among others, the following are considered:
+- Visibility state of the layer
+- Visible Layer of MasterPages
+- Multiple layer for group objects
+
+Not considered are:
+- Whether the pages/objects were already painted or if an Invalidate is still pending
+- Whether the pages/objects in a Window are in a visible region
+
+*/
+
////////////////////////////////////////////////////////////////////////////////////////////////////
class OutputDevice;
@@ -85,42 +118,5 @@ public:
Window* NextWindow();
};
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef _JUST_DESCRIPTION
-
-Mit dieser Klasse kann man rausbekommen:
-- SdrView* First/NextView()
- - Alle Views in denen ein Models dargestellt wird
- - Alle Views in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage)
- - Alle Views in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage)
-- SdrPageView* First/NextPageView()
- - Alle PageViews in denen ein Models dargestellt wird
- - Alle PageViews in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage)
- - Alle PageViews in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage)
-- OutputDevice* First/NextOutDev()
- - Alle OutputDevices in denen ein Models dargestellt wird
- - Alle OutputDevices in denen eine bestimme Page sichtbar ist (ww. auch als MasterPage)
- - Alle OutputDevices in denen ein bestimmes Objekt sichtbar ist (ww. auch auf MasterPage)
-- Window* First/NextWindow()
- - Alle Windows in denen ein Models dargestellt wird
- - Alle Windows in denen eine bestimme Page sichtbar ist (auch als MasterPage)
- - Alle Windows in denen ein bestimmes Objekt sichtbar ist (auch auf MasterPage)
-Ob die Auswahl auf ein(e) bestimmte(s) Page/Objekt beschraenkt wird, bestimmt man
-durch die Wahl des Konstruktors.
-
-Es werden u.a. auch berueksichtigt:
-- Layer Sichtbarkeitsstatus
-- Visible Layer von MasterPages
-- Mehrfachlayer bei Gruppenobjekten
-
-Es wird nicht berueksichtigt:
-- Ob die Pages/Objekte wirklich schon gepaintet wurden oder noch ein Invalidate ansteht, ...
-- Ob die Pages/Objekte in einem Window im sichtbaren Bereich liegen
-
-#endif // _JUST_DESCRIPTION
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#endif //_SVDVITER_HXX
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svimbase.hxx
index 58fb0c9..9b101ee 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svimbase.hxx
@@ -166,43 +166,36 @@ public:
ULONG GetOrgAlignedSize() const { return GetOrgAlignedWidth() *
GetOrgHeight(); }
ULONG GetDestAlignedSize() const { return GetDestAlignedWidth() *
GetDestHeight(); }
- // Farbtiefe des Ausgangsbildes ermitteln und setzen
+ // Get and set the color depth of the origin picture
SimDepthType GetDepth() const { return eOrgDepth; }
void SetDepth( const SimDepthType eDepth ) { eOrgDepth = eDepth;
}
- // Farbtiefen nach Undo und Redo ermitteln und setzen
+ // Get and set the color depth after Undo and Redo
SimDepthType GetUndoDepth() const { return eUndoDepth; }
void SetUndoDepth(const SimDepthType eDepth) { eUndoDepth =
eDepth; }
SimDepthType GetRedoDepth() const { return eRedoDepth; }
void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth =
eDepth; }
- // Vor- und Ruecklauf der Bildverarbeitung
BOOL BeginProcessing( BOOL bUndo = TRUE );
void EndProcessing();
BOOL BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo
= TRUE);
void EndProcessingExt() { EndProcessing(); }
- // Zeiger auf Arrays zur Verfuegung stellen
HPBYTE GetOrgPointer() { return pOrgArray; }
HPBYTE GetDestPointer() { return pDestArray; }
- // DIB-Erzeugung fuer Anzeige
BOOL CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast
= 0,
SfxProgress* pProgress = NULL );
- // Undo-Verwaltung
BOOL DoUndo( SfxProgress* pProgress = NULL );
BOOL DoRedo( SfxProgress* pProgress = NULL );
- // DIB-Rueckgabe fuer Anzeige
const Bitmap& GetOutBitmap() const;
- // DIB-Rueckgabe fuer Speicherung
Bitmap GetSaveBitmap();
- // Palette besorgen
SimPalette* GetOrgPalette() const { return nWhichOrg == 1 ? pPal1 :
pPal2; }
SimPalette* GetDestPalette() const { return nWhichOrg == 1 ? pPal2 :
pPal1; }
};
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 8a82413..63d4c5f 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -60,7 +60,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als 'Beh"alter' f"ur Float
+|* Derivative from SfxChildWindow as 'container' for Float
|*
\************************************************************************/
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 6f9e98b..edebf03 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -33,7 +33,7 @@
/*************************************************************************
|*
-|* Kamera-Ableitung
+|* Camera derivative
|*
\************************************************************************/
@@ -57,7 +57,7 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
double fFocalLen = 35.0, double fBankAng = 0);
Camera3D();
- // Anfangswerte wieder herstellen
+ // Reset to default values
void Reset();
void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
@@ -71,19 +71,19 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
const basegfx::B3DPoint& GetLookAt() const { return aLookAt; }
void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt);
- // Brennweite in mm
+ // Focal length in mm
void SetFocalLength(double fLen);
void SetFocalLengthWithCorrect(double fLen);
double GetFocalLength() const { return fFocalLength; }
- // Neigung links/rechts
+ // Bank angle links/rechts
void SetBankAngle(double fAngle);
double GetBankAngle() const { return fBankAngle; }
- // Um die Kameraposition drehen, LookAt wird dabei veraendert
+ // For rotating the camera position. Changes LookAt.
void Rotate(double fHAngle, double fVAngle);
- // Um den Blickpunkt drehen, Position wird dabei veraendert
+ // For changing the point of view. Changes the position.
void RotateAroundLookAt(double fHAngle, double fVAngle);
void SetAutoAdjustProjection(bool bAdjust = true)
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 43d5272..9d0c2a0 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -33,8 +33,8 @@
#include <vcl/metric.hxx>
#include <vcl/scrbar.hxx>
#include <map>
-#include <tools/shl.hxx> //add CHINA001
-#include <tools/debug.hxx> //add CHINA001
+#include <tools/shl.hxx>
+#include <tools/debug.hxx>
#include "svx/svxdllapi.h"
// define ----------------------------------------------------------------
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 20981d9..883464a 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -75,7 +75,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller
+|* Derivation from SfxChildWindow as "container" for Controller
|*
\************************************************************************/
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 2603474..280ec8a 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -35,7 +35,7 @@
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float
+|* Derivation from SfxChildWindow as "container" for Float
|*
\************************************************************************/
@@ -59,12 +59,6 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
class SvxSuperContourDlg;
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class SvxContourDlgItem : public SfxControllerItem
{
SvxSuperContourDlg& rDlg;
@@ -78,12 +72,6 @@ public:
SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings&
rBindings );
};
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow
{
using Window::Update;
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index b6f1427..3e42a23 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -53,7 +53,7 @@
#define FLT_DATE_SAVE 5
-// Struct fuer Datums-Sortierung
+// Struct for sorting data
class SVX_DLLPUBLIC RedlinData
{
@@ -72,7 +72,7 @@ public:
virtual ~SvxRedlinEntry();
};
-// Klasse fuer die Darstellung von schriftabhaengigen Strings
+// Class for the representation of Strings depending on the font
class SvLBoxColorString : public SvLBoxString
{
private:
@@ -143,7 +143,7 @@ public:
BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData);
BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData);
- // keine NULL-Ptr. ueberpruefung {
+ // no NULL-pointer checking {
BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const
String* pComment);
BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
BOOL IsValidComment(const String* pComment);
@@ -246,13 +246,13 @@ public:
String GetComment()const;
- // Methoden fuer Calc {
+ // Methods for Calc {
void SetRange(const String& rString);
String GetRange() const;
void HideRange(BOOL bHide=TRUE);
void DisableRange(BOOL bFlag=TRUE);
void SetFocusToRange();
- // } Methoden fuer Calc
+ // } Methods for Calc
void HideClocks(BOOL bHide=TRUE);
void DisableRef(BOOL bFlag);
@@ -289,7 +289,7 @@ public:
const Link& GetModifyCommentHdl() const { return aModifyComLink; }
- // Methoden fuer Calc {
+ // Methods for Calc {
void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; }
const Link& GetModifyRangeHdl() const { return aModifyRefLink; }
@@ -299,7 +299,7 @@ public:
void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true );
- // } Methoden fuer Calc
+ // } Methods for Calc
};
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index 39be134..e3a3c0c 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -34,13 +34,13 @@
/*************************************************************************
|*
|* |
-|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__
-|* (abhaengig von bPosIsCenter) /
-|* Mit nSideFlags kann angegeben werden, ob nur ein Teil der
-|* Quaderflaechen erzeugt werden kann; die entsprechenden Bits
-|* sind in dem enum definiert. Das Flag bDblSided legt fest,
-|* ob die erzeugten Flaechen doppelseitig sind (nur sinnvoll,
-|* wenn nicht alle Flaechen erzeugt wurden).
+|* Create a 3D cuboid; aPos: Center oder left, bottom, behind |__
+|* (depending on bPosIsCenter) /
+|* nSideFlags indicates, if only some of the cuboid surfaces can
+|* be created; the corresponding bits are defined in the enum.
+|* The flag bDblSided indicates whether the created surfaces are
+|* two-sided (which only makes sense if not all of the surfaces were
+|* created).
|*
\************************************************************************/
@@ -74,7 +74,7 @@ public:
virtual void operator=(const SdrObject&);
- // Lokale Parameter setzen mit Geometrieneuerzeugung
+ // Set local parameters with geometry recreation
void SetCubePos(const basegfx::B3DPoint& rNew);
const basegfx::B3DPoint& GetCubePos() { return aCubePos; }
@@ -87,7 +87,7 @@ public:
void SetSideFlags(UINT16 nNew);
UINT16 GetSideFlags() { return nSideFlags; }
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
};
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 22e2ab8..6616618 100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -56,7 +56,6 @@ namespace svxform
static oslModule s_hDbtoolsModule;
static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc;
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
mutable BOOL m_bCreateAlready;
private:
diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx
index 056291f..b9ba9a3 100644
--- a/svx/inc/svx/def3d.hxx
+++ b/svx/inc/svx/def3d.hxx
@@ -39,7 +39,7 @@ const double EPSILON = 1e-06;
#define DEG2RAD(fAngle) (fPiDiv180 * (fAngle))
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++ 3D-Hilfsfunktionen +++++++++++++++++++++++++++++++++++++++++++++++++
+//+++ 3D helper functions ++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001,
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 2c95c76..71d28e2 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -35,29 +35,29 @@
/*************************************************************************
|*
-|* Klasse zum verwalten der 3D-Default Attribute
+|* Class for managing the 3D default attributes
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dDefaultAttributes
{
private:
- // Compound-Objekt
+ // Compound object
Color aDefaultAmbientColor;
BOOL bDefaultCreateNormals;
BOOL bDefaultCreateTexture;
- // Cube-Objekt
+ // Cube object
basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize;
UINT16 nDefaultCubeSideFlags;
BOOL bDefaultCubePosIsCenter;
- // Sphere-Objekt
+ // Sphere object
basegfx::B3DPoint aDefaultSphereCenter;
basegfx::B3DVector aDefaultSphereSize;
- // Lathe-Objekt
+ // Lathe object
long nDefaultLatheEndAngle;
BOOL bDefaultLatheSmoothed;
BOOL bDefaultLatheSmoothFrontBack;
@@ -65,7 +65,7 @@ private:
BOOL bDefaultLatheCloseFront;
BOOL bDefaultLatheCloseBack;
- // Extrude-Objekt
+ // Extrude object
BOOL bDefaultExtrudeSmoothed;
BOOL bDefaultExtrudeSmoothFrontBack;
BOOL bDefaultExtrudeCharacterMode;
@@ -73,14 +73,14 @@ private:
BOOL bDefaultExtrudeCloseBack;
public:
- // Konstruktor
+ // Construktor
E3dDefaultAttributes();
- // Defaults zuruecksetzen
+ // Reset to defaults
void Reset();
- // Getter/Setter fuer Default-Werte aller 3D-Objekte
- // Compound-Objekt
+ // Getter/Setter for default values of all 3D objects
+ // Compound object
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
@@ -89,7 +89,7 @@ public:
BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
- // Cube-Objekt
+ // Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
@@ -99,13 +99,13 @@ public:
BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
- // Sphere-Objekt
+ // Sphere object
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
void SetDefaultSphereCenter(const basegfx::B3DPoint& rNew) { aDefaultSphereCenter = rNew; }
const basegfx::B3DVector& GetDefaultSphereSize() { return aDefaultSphereSize; }
void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; }
- // Lathe-Objekt
+ // Lathe object
long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
@@ -119,7 +119,7 @@ public:
BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
- // Extrude-Objekt
+ // Extrude object
BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index e33e90d..7b795cc 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -34,7 +34,7 @@
// Resource-Id's ------------------------------------------------------------
-// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
+// Please maintain FIRSTFREE (does not apply to strings)
#define RID_SVX_FIRSTFREE 314
// some strings also used in CUI
@@ -202,26 +202,25 @@
#define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78)
#define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84)
-// Ids fuer FrameBitmaps durch ImageList ersetzt
-// 67 bis 72 frei
+// 67 to 72 free
-// ResId fuer den Gitter- und Raster-Dialog
+// ResId for the grid dialog
#define RID_SVXDLG_GRID (RID_SVX_START + 79)
-// ResId's fuer FontMenu-Controls
+// ResId's for the FontMenu controls
#define RID_MN_FONTSIZE (RID_SVX_START + 80)
-// ResId's fuer Undo-TbxControls
+// ResId's for Undo-TbxControls
#define RID_SVXTBX_UNDO (RID_SVX_START + 81)
-// ResId fuer Zoom-Popup-Menue
+// ResId for zoom popup menu
#define RID_SVXMNU_ZOOM (RID_SVX_START + 82)
-// ResId fuer Funktions-Popup-Menue
+// ResId for funktion popup menue
#define RID_SVXMNU_PSZ_FUNC (RID_SVX_START + 83)
#define RID_SVXMNU_XMLSECSTATBAR (RID_SVX_START + 84)
-// ResId fuer Position- und Size-Bitmap
+// ResId for position and size bitmap
#define RID_SVXBMP_POSITION (RID_SVX_START + 85)
#define RID_SVXBMP_SIZE (RID_SVX_START + 86)
@@ -239,16 +238,16 @@
#define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71)
#define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72)
-// Resource mit Bitmaps fuer die CheckListBox
+// Resource with bitmaps for the CheckListBox
#define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91)
-// Menu fuers Lineal
+// Menu for the ruler
#define RID_SVXMN_RULER (RID_SVX_START + 92)
-// FontWork-Dialog
+// FontWork dialog
#define RID_SVXDLG_FONTWORK (RID_SVX_START + 93)
-// FontWork-ValueSet-Bitmaps
+// FontWork ValueSet bitmaps
#define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94)
#define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95)
#define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96)
@@ -269,13 +268,13 @@
#define RID_SVXCTRL_COLOR (RID_SVX_START + 117)
-// fuer ToolboxControl-Style
+// for Toolbox-Control style
#define RID_SVXTBX_STYLE (RID_SVX_START + 120)
#define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
#define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
-// ResId fuer InternetPage
+// ResId for InternetPage
#define RID_SVXPAGE_INTERNET (RID_SVX_START + 154)
//InetDlg
@@ -294,7 +293,7 @@
#define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198)
#define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199)
-// 3D-Entfernung/Perspektive Bitmaps
+// 3D distance/perspective bitmaps
#define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162)
#define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163)
#define RID_SVXBMP_3D_DISTANCE_03 (RID_SVX_START + 164)
@@ -317,33 +316,33 @@
#define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180)
#define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181)
-// fuer ToolboxControls Alignment und Drawobjekte
+// for ToolboxControls alignment and draw objects
#define RID_SVXTBX_DRAW (RID_SVX_START + 189)
#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190)
-// Ids fuer Autokorrektur
+// Ids fuer auto correction
#define RID_SVX_AUTOCORR (RID_SVX_START + 192)
-// Auswahl ext. Linguitik
+// Choice for external linguistics
#define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193)
-// TabPage und Dialog f"ur LDAP-Server
+// TabPage and dialog for LDAP server
#define RID_SVXPAGE_LDAP (RID_SVX_START + 204)
#define RID_SVXDLG_LDAP (RID_SVX_START + 205)
-// Dialog fuer Funktionen
+// Dialog for functions
#define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206)
// QueryBox for Exit Recovery Wizard
#define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215)
-// ResId fuer den ImportGraphic-Dialog
+// ResId for the ImportGraphic dialog
#define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499)
#define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226)
-// ResId's f???r Hyperlink-Dialog-Tabpages
+// ResId's for hyperlink dialog tabpages
// ResId's for Starone impl. bitmaps
#define RID_UNODRAW_OBJECTS (RID_SVX_START + 233)
@@ -385,11 +384,11 @@
// Strings ------------------------------------------------------------------
-// Strings fuer die Sprachen (HM-Abhaengig)
+// Strings for the language
#define RID_SVXSTR_LANGUAGE_BEGIN (RID_SVX_START + 0)
#define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15)
-// Messages im DBMgr-Bereich
+// Messages for the DBMgr
#define RID_SVXSTR_DBINI (RID_SVX_START + 60)
#define RID_SVXSTR_DBDRV (RID_SVX_START + 61)
#define RID_SVXSTR_NODBDRV (RID_SVX_START + 62)
@@ -404,18 +403,18 @@
#define RID_SVXSTR_INVALID_RECORD (RID_SVX_START + 71)
#define RID_SVXSTR_NOSET_MATCHING (RID_SVX_START + 72)
-// Strings aus dem Suchen-Dialog
+// Strings from the search dialog
#define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80)
#define RID_SVXSTR_SEARCH (RID_SVX_START + 81)
#define RID_SVXSTR_REPLACE (RID_SVX_START + 82)
#define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144)
-// ResIds fuer die verschiedenen Strings des PageDlgs
+// ResIds for the PageDialog
#define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146)
#define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147)
-// Strings der ToolBox-Controls aus tbcontrl.cxx
+// Strings of the ToolBox-Controls from tbcontrl.cxx
#define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191)
#define RID_SVXSTR_FRAME (RID_SVX_START + 192)
#define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194)
@@ -425,17 +424,17 @@
#define RID_SVXSTR_MORE (RID_SVX_START + 198)
-// Strings der UndoTbxControls
+// Strings for the UndoTbxControls
#define RID_SVXSTR_UNDO (RID_SVX_START + 200)
#define RID_SVXSTR_REDO (RID_SVX_START + 201)
#define RID_SVXSTR_ACTION (RID_SVX_START + 202)
#define RID_SVXSTR_ACTIONS (RID_SVX_START + 203)
-// Strings fuer Insert/Overwrite
+// Strings for insert/overwrite
#define RID_SVXSTR_INSERT_TEXT (RID_SVX_START + 210)
#define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 211)
-// Strings fuer Selection Mode
+// Strings for the selection mode
#define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 212)
#define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213)
#define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214)
@@ -446,19 +445,19 @@
#define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225)
#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226)
-// weitere ID bei 219
+// further ID at 219
-// String-ResId fuer den ImportGraphic-Dialog
+// String-ResId for the ImportGraphic dialog
#define RID_SVXSTR_ALL_FILES (RID_SVX_START + 241)
-// Strings des Lineals
+// Strings for the ruler
#define RID_SVXSTR_RULER_START (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246)
#define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247)
#define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248)
-// Schlie"ssen (im TabDialog Line/Area)
+// Close (in TabDialog line/aria)
#define RID_SVXSTR_CLOSE (RID_SVX_START + 260)
// FontWork-ValueSet-Strings
@@ -476,7 +475,7 @@
#define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272)
#define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273)
-// Farben-Strings
+// Color strings
#define RID_SVXSTR_BLACK (RID_SVX_START + 275)
#define RID_SVXSTR_BLUE (RID_SVX_START + 276)
#define RID_SVXSTR_GREEN (RID_SVX_START + 277)
@@ -496,7 +495,7 @@
#define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291)
#define RID_SVXSTR_ORANGE (RID_SVX_START + 292)
-// Linienenden-Strings
+// Line endings strings
#define RID_SVXSTR_ARROW (RID_SVX_START + 300)
#define RID_SVXSTR_SQUARE (RID_SVX_START + 301)
#define RID_SVXSTR_CIRCLE (RID_SVX_START + 302)
@@ -508,9 +507,9 @@
// String-Arrays
#define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312)
-// Hyperlink-Dlg
+// Hyperlink dialog
#define RID_SVXMN_HYPERLINK (RID_SVX_START + 321)
-// Hyperlink-QueryBoxen
+// Hyperlink query boxes
#define RID_SVXQB_NOCONNECT (RID_SVX_START + 322)
#define RID_SVXQB_DONTEXIST (RID_SVX_START + 323)
//color configuration
@@ -528,18 +527,18 @@
#define RID_SVXSTR_MEM_ERROR (RID_SVX_START + 415)
#define RID_SVXSTR_DLG_TITLE_INFO (RID_SVX_START + 416)
-// Define - Bereich fuer BmpMaskierung
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for bitmap masking
+// !!! don't use defines from this region !!!
#define RID_SVX_BMPMASK_START (RID_SVX_START + 420)
#define RID_SVX_BMPMASK_END (RID_SVX_START + 440)
-// Define - Bereich fuer IMAP-Editor
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for IMAP editor
+// !!! don't use defines from this region !!!
#define RID_SVX_IMAP_START (RID_SVX_START + 450)
#define RID_SVX_IMAP_END (RID_SVX_START + 460)
-// Define - Bereich fuer Contour-Editor
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for contour editor
+// !!! don't use defines from this region !!!
#define RID_SVX_CONTOUR_START (RID_SVX_START + 461)
#define RID_SVX_CONTOUR_END (RID_SVX_START + 471)
@@ -554,7 +553,7 @@
#define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480)
#define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481)
-// Defines fuer die 3D-Engine
+// Defines for the 3D engine
#define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489)
#define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490)
#define RID_SVX_3D_UNDO_SEGMENTS (RID_SVX_START + 491)
@@ -578,10 +577,6 @@
#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//?
#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//?
-// RID_SVX_END == (RID_SVX_START + 499) !!!
-// am besten ab 520 frei (RB)
-// seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine
-// Obergrenze geben (abgesehen von USHRT_MAX) (os)
#define RID_STR_BULLET_THEME (RID_SVX_START + 508)
@@ -986,28 +981,12 @@
#define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 )
#define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 )
-// ResId fuer den ImportClipboard-Dialog
-// depricated
-//#define RID_SVXDLG_CLIPBOARD ( RID_SVX_START + 9 )
-
-// ResId fuer den Sonderzeichen-Dialog
-
-// allgemeine DBMgr-Dialoge
-// depricated
-//#define RID_SVX_DBSELDLG ( RID_SVX_START + 11 )
-//#define RID_SVX_DBEDDLG ( RID_SVX_START + 12 )
-//#define RID_SVX_DBLOGON ( RID_SVX_START + 13 )
-//#define RID_SVX_RECDLG ( RID_SVX_START + 14 )
-//#define RID_SVX_BRSEEKDLG ( RID_SVX_START + 15 )
-//#define RID_SVX_BRCFGDLG ( RID_SVX_START + 16 )
-//#define RID_SVX_BRSORTDLG ( RID_SVX_START + 17 )
-
// document recovery and error report
// recycling ids from DBMgr
#define RID_SVX_MDLG_DOCRECOVERY_PROGR ( RID_SVX_START + 11 )
#define RID_SVX_MDLG_DOCRECOVERY_BROKEN ( RID_SVX_START + 12 )
#define RID_SVX_MDLG_ERR_REP_OPTIONS ( RID_SVX_START + 13 )
-#define RID_SVX_MDLG_ERR_REP_PREVIEW ( RID_SVX_START + 14 )
+#define RID_SVXrMDLG_ERR_REP_PREVIEW ( RID_SVX_START + 14 )
#define RID_SVX_TABDLG_DOCRECOVERY ( RID_SVX_START + 0 )
@@ -1037,7 +1016,7 @@
#define OFA_TP_APPEARANCE (RID_OFA_START + 203)
#define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204)
-//die RID_??_TP_* stehen nochmal im offids.hrc
+//the RID_??_TP_* are duplicate in offids.hrc
#define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207)
#define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213)
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index fe06fdf..e31e837 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -130,7 +130,7 @@ public:
virtual void SetObjectType(sal_uInt16 nType);
- // User Callback eintragen
+ // register user callback
void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
void SetChangeCallback(Link aNew) { maChangeCallback = aNew; }
@@ -169,7 +169,7 @@ private:
ScrollBar maVerScroller;
PushButton maSwitcher;
- // Callback bei interaktiven Aenderungen
+ // callback for interactive changes
Link maUserInteractiveChangeCallback;
Link maUserSelectionChangeCallback;
@@ -178,17 +178,17 @@ public:
SvxLightCtl3D( Window* pParent, WinBits nStyle = 0);
~SvxLightCtl3D();
- // Reagiere auf Groessenaenderungen
+ // react to size changes
virtual void Resize();
void NewLayout();
- // Selektion auf Gueltigkeit pruefen
+ // check the selection for validity
void CheckSelection();
- // Um weitere Einstellungen nach Aussen zu bringen...
+ // bring further settings to the outside world
Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; }
- // User Callback eintragen
+ // register user callback
void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
@@ -203,7 +203,7 @@ protected:
DECL_LINK( ScrollBarMove, void*);
DECL_LINK( ButtonPress, void*);
- // Lokale Parameter Initialisieren
+ // initialize local parameters
void Init();
void move( double fDeltaHor, double fDeltaVer );
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index a6c2d52..93eba33 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -62,8 +62,8 @@ namespace com { namespace sun { namespace star { namespace awt {
/*************************************************************************
|*
-|* Von SfxTabPage abgeleitet, um vom Control ueber virtuelle Methode
-|* benachrichtigt werden zu koennen.
+|* Derived from SfxTabPage for being able to get notified through the
+|* virtual method from the control.
|*
\************************************************************************/
class SvxTabPage : public SfxTabPage
@@ -78,8 +78,8 @@ public:
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt)
-|* eines Objekts
+|* Control for display and selection of the corner and center points of
+|* an object
|*
\************************************************************************/
typedef UINT16 CTL_STATE;
@@ -110,7 +110,6 @@ protected:
Bitmap* pBitmap;
CTL_STATE m_nState;
- // #103516# Added a possibility to completely disable this control
sal_Bool mbCompleteDisable;
RECT_POINT GetRPFromPoint( Point ) const;
@@ -149,15 +148,14 @@ public:
RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point&
rPixelPoint ) const;
- // #103516# Added a possibility to completely disable this control
sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; }
void DoCompletelyDisable(sal_Bool bNew);
};
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl des Winkels der Eckpunkte
-|* eines Objekts
+|* Control for display and selecton of the angle of the corner points
+|* of an object
|*
\************************************************************************/
class SvxAngleCtl : public SvxRectCtl
@@ -181,7 +179,7 @@ public:
/*************************************************************************
|*
-|* Preview-Control zur Darstellung von Bitmaps
+|* Preview control for the display of bitmaps
|*
\************************************************************************/
@@ -207,7 +205,7 @@ public:
/*************************************************************************
|*
-|* Control zum Editieren von Bitmaps
+|* Control for editing bitmaps
|*
\************************************************************************/
class SVX_DLLPUBLIC SvxPixelCtl : public Control
@@ -253,7 +251,7 @@ public:
/*************************************************************************
|*
-|* ColorLB kann mit Farben und Namen gefuellt werden
+|* ColorLB can be filled with colors and names
|*
\************************************************************************/
class SVX_DLLPUBLIC ColorLB : public ColorListBox
@@ -348,7 +346,7 @@ private:
/*************************************************************************
|*
-|* FillAttrLB vereint alle Fuellattribute in einer ListBox
+|* FillAttrLB unites all fill attributes an a ListBox
|*
\************************************************************************/
class FillAttrLB : public ColorListBox
@@ -474,7 +472,6 @@ private:
SdrObject* mpLineObjB;
SdrObject* mpLineObjC;
- //#58425# Symbole auf einer Linie (z.B. StarChart)
Graphic* mpGraphic;
sal_Bool
mbWithSymbol;
Size
maSymbolSize;
diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx
index e9e3dfc..527354a 100644
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/svx/inc/svx/dstribut_enum.hxx
@@ -27,10 +27,6 @@
#ifndef _SVX_DSTRIBUT_ENUM_HXX
#define _SVX_DSTRIBUT_ENUM_HXX
-/*************************************************************************
-|*
-\************************************************************************/
-
enum SvxDistributeHorizontal
{
SvxDistributeHorizontalNone = 0,
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index 1c5e595..7db4697 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -37,7 +37,7 @@ class E3dView;
/************************************************************************\
|*
-|* Basisklasse fuer alle 3D-Undo-Aktionen.
+|* Base class for all 3D undo actions.
|*
\************************************************************************/
class E3dUndoAction : public SdrUndoAction
@@ -62,7 +62,7 @@ class E3dUndoAction : public SdrUndoAction
/************************************************************************\
|*
-|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen (ob das wohl klappt ?)
+|* Undo for 3D rotation through the rotation matrices
|*
\************************************************************************/
class E3dRotateUndoAction : public E3dUndoAction
@@ -91,7 +91,7 @@ class E3dRotateUndoAction : public E3dUndoAction
/************************************************************************\
|*
-|* Undo fuer 3D-Attribute (Implementiert ueber Set3DAttributes())
+|* Undo for 3D attributes (implemented using Set3DAttributes())
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index 73a4fc7..890e145 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -93,15 +93,14 @@ public:
virtual void operator=(const SdrObject&);
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI (for example "3 frames selected")
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung
+ // set/get local parameters with geometry regeneration
void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; }
- // Aufbrechen
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index 4e0b001..1da03b5 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -35,7 +35,7 @@
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer 3D Window
+|* Derived from SfxChildWindow as "container" for 3D Window
|*
\************************************************************************/
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 32b15d4..38e6d92 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -44,7 +44,7 @@ class ListBox;
/*************************************************************************
|*
-|* Klassen fuer Flaechenattribute (Controls und Controller)
+|* Class for surface attributes (controls and controller)
|*
\************************************************************************/
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 9bdb2fe..52e71e1 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -78,7 +78,7 @@ private:
ImageButton aBtnUpdate;
ImageButton aBtnAssign;
-// Geometrie
+// geometry
FixedText aFtPercentDiagonal;
MetricField aMtrPercentDiagonal;
FixedText aFtBackscale;
@@ -104,7 +104,7 @@ private:
ImageButton aBtnDoubleSided;
-// Darstellung
+// presentation
FixedText aFtShademode;
ListBox aLbShademode;
ImageButton aBtnShadow3d;
@@ -118,7 +118,7 @@ private:
FixedLine aFLCamera;
FixedLine aFLRepresentation;
-// Beleuchtung
+// lighting
ImageButton aBtnLight1;
ImageButton aBtnLight2;
ImageButton aBtnLight3;
@@ -139,15 +139,13 @@ private:
ImageButton aBtnLightColor;
FixedText aFTLightsource;
- // #99694# Keyboard shortcuts activate the next control, so the
- // order needed to be changed here
FixedText aFTAmbientlight; // Text label
ColorLB aLbAmbientlight; // ListBox
ImageButton aBtnAmbientColor; // color button
FixedLine aFLLight;
-// Texturen
+// textures
FixedText aFtTexKind;
ImageButton aBtnTexLuminance;
ImageButton aBtnTexColor;
@@ -167,8 +165,8 @@ private:
ImageButton aBtnTexFilter;
FixedLine aFLTexture;
-// Material
-// Materialeditor
+// material
+// material editor
FixedText aFtMatFavorites;
ListBox aLbMatFavorites;
FixedText aFtMatColor;
@@ -185,21 +183,21 @@ private:
FixedLine aFLMatSpecular;
FixedLine aFLMaterial;
-// Unterer Teil
+// bottom part
ImageButton aBtnConvertTo3D;
ImageButton aBtnLatheObject;
ImageButton aBtnPerspective;
Svx3DPreviewControl aCtlPreview;
SvxLightCtl3D aCtlLightPreview;
-// der Rest ...
+// the rest ...
Image aImgLightOn;
Image aImgLightOff;
BOOL bUpdate;
ViewType3D eViewType;
Size aSize;
- // Model, Page, View etc. fuer Favoriten
+ // Model, Page, View etc. for favourites
FmFormModel* pModel;
FmFormPage* pFmPage;
VirtualDevice* pVDev;
@@ -268,7 +266,7 @@ public:
/*************************************************************************
|*
-|* ControllerItem fuer 3D-Window (Floating/Docking)
+|* Controller item for 3D Window (Floating/Docking)
|*
\************************************************************************/
@@ -286,7 +284,7 @@ class Svx3DCtrlItem : public SfxControllerItem
/*************************************************************************
|*
-|* ControllerItem fuer Status eines Slots
+|* ControllerItem for State of a Slot
|* (SID_CONVERT_TO_3D, SID_CONVERT_TO_3D_LATHE_FAST)
|*
\************************************************************************/
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index 2993123..c99034c 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -40,21 +40,19 @@ class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage
{
protected:
- // Erzeugen eines SdrObjects anhand einer Description. Kann von
- // abgeleiteten Klassen dazu benutzt werden, eigene ::com::sun::star::drawing::Shapes zu
- // unterstuetzen (z.B. Controls)
+ // Creating a SdrObject based on a Description. Cann be used by derived classes to
+ // support own ::com::sun::star::drawing::Shapes (for example Controls)
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > & xShape )throw ();
- // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt
- // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder
- // ein ein SvxShape aggregierendes Objekt anlegen.
+ // The following method is called when a SvxShape object should be created.
+ // Derived classes can create a derivation or an object aggregating SvxShape.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape(
SdrObject *pObj ) const throw ();
public:
SvxFmDrawPage( SdrPage* pPage );
virtual ~SvxFmDrawPage() throw ();
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage);
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const
::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx
index c07362f..23071d4 100644
--- a/svx/inc/svx/fmglob.hxx
+++ b/svx/inc/svx/fmglob.hxx
@@ -38,7 +38,7 @@ const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+
sal_uInt32('1')*0x01000000;
const sal_uInt16 OBJ_FM_CONTROL =
::com::sun::star::form::FormComponentType::CONTROL;
- // fuer FormularKomponenten
+ // for form components
const sal_uInt16 OBJ_FM_EDIT =
::com::sun::star::form::FormComponentType::TEXTFIELD;
const sal_uInt16 OBJ_FM_BUTTON =
::com::sun::star::form::FormComponentType::COMMANDBUTTON;
const sal_uInt16 OBJ_FM_FIXEDTEXT =
::com::sun::star::form::FormComponentType::FIXEDTEXT;
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 3b6d10a..1582531 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -34,7 +34,7 @@
class StarBASIC;
class FmFormModel;
-class FmFormPageImpl; // haelt die Liste aller Forms
+class FmFormPageImpl; // contains a list of all forms
FORWARD_DECLARE_INTERFACE(container,XNameContainer)
@@ -66,7 +66,7 @@ public:
virtual SdrObject* RemoveObject(ULONG nObjNum);
- // Zugriff auf alle Formulare
+ // access to all forms
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>&
GetForms( bool _bForceCreate = true ) const;
#ifndef SVX_LIGHT
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 1fda6f0..939f4ac 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -63,24 +63,24 @@ SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Referen
struct FmFoundRecordInformation
{
- ::com::sun::star::uno::Any aPosition; // Bookmark des Datensatzes, in dem der
Text gefunden wurde
- sal_Int16 nFieldPos; // dito : die relative Position der Spalte (im Stringnamen
in Feldliste im Constructor)
- sal_Int16 nContext; // Kontext, in dem gesucht und gefunden wurde (falls die
aktuelle Suche verschiedene solche kennt)
+ ::com::sun::star::uno::Any aPosition; // bookmark of the record in which the text
was found
+ sal_Int16 nFieldPos; // ditto : the relative position of the column (in the
string name of the field list in the constructor)
+ sal_Int16 nContext; // the context in which was searched and found (if the
current search knows several contexts)
};
//
===================================================================================================
-// = struct FmSearchContext - Informationen fuer Suche in verschiedenen Kontexten
+// = struct FmSearchContext - informations for the search in different contexts
//
===================================================================================================
struct FmSearchContext
{
// [in]
- sal_Int16 nContext; // die Nummer des Kontextes
+ sal_Int16 nContext; // the number of the context
// [out]
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
xCursor; // der Iterator fuer diesen Kontext
- String strUsedFields; // eine Liste von durch ';'
getrennten Feldnamen
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
xCursor; // the iterator for the context
+ String strUsedFields; // a list of field names separeted
by ';'
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
- arrFields; // die korrespondierenden Text-Interfaces fuer die
Felder in strUsedFields
+ arrFields; // the corresponding text interfaces for the fields
in strUsedFields
String sFieldDisplayNames; // if not empty :
names to be displayed for the searchable fields (must have the same token count as strUsedFields !)
};
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index faf26fc..54b7ec7 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -89,14 +89,13 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
sal_uInt16 m_nLastSlot;
sal_Bool m_bDesignMode : 1;
- sal_Bool m_bHasForms : 1; // Flag welches festhaelt, ob Formulare auf einer Seite
- // vorhanden sind, nur für den DesignMode, siehe UIFeatureChanged!
+ sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist,
+ // only for the DesignMode, see UIFeatureChanged!
- // die Markierungen einer FormView haben sich geaendert ...
+ // the marks of a FormView have changed...
void NotifyMarkListChanged(FmFormView*);
- // (die FormView selber ist kein Broadcaster, deshalb kann sie den Formular-Explorer, den
dieses
- // Ereignis interesiert, nicht sauber verstaendigen (sie koennte sich lediglich von der
Application
- // das Navigator-Fenster geben lassen, aber das wollen wir ja nicht, ge ? ...))
+ // (the FormView itself is not a broadcaster, therefore it can't always correctly notify
the
+ // form explorer who is interested in the event)
class FormShellWaitObject
{
@@ -177,7 +176,7 @@ public:
protected:
void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich);
- // gibt es ein Formular auf der aktuellen Seite?
+ // is there a form on the current page?
void DetermineForms(sal_Bool bInvalidate);
void impl_setDesignMode( sal_Bool bDesign);
};
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 4bd8310..490f337 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -83,7 +83,7 @@
class Window;
//==================================================================
-// allgemeine Typen
+// common types
//==================================================================
// displaying a database exception for the user
// display info about a simple ::com::sun::star::sdbc::SQLException
@@ -98,8 +98,8 @@ sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star
SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>& xControlModel);
//
===================================================================================================
-// = class CursorWrapper - eine Hilfsklasse, die parallel mit je einem
::com::sun::star::uno::Reference<XDatabaseUpdateCursor>,
-// XDatabaseBookmarkCursor und
XDatabaseDirectCursor arbeitet
+// = class CursorWrapper - a helper class which works in common with a
::com::sun::star::uno::Reference<XDatabaseUpdateCursor>,
+// XDatabaseBookmarkCursor and
XDatabaseDirectCursor each
//
===================================================================================================
class CursorWrapper
@@ -116,8 +116,8 @@ public:
CursorWrapper() { }
CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>&
_rxCursor, sal_Bool bUseCloned = sal_False);
SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
- // bei bUseCloned == sal_True wird der Cursor ueber das XCloneable-Interface (dass er
besitzen muss) gedoubled und
- // erst dann benutzt
+ // if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface
(which it must implement)
+ // and then used
friend bool operator==(const CursorWrapper& lhs, const CursorWrapper& rhs)
{
@@ -130,7 +130,7 @@ public:
CursorWrapper* operator ->() { return this; }
operator const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& () const{
return m_xGeneric; }
- // 'Konvertierungen'
+ // 'Conversions'
const CursorWrapper& operator=(const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XRowSet>& xCursor);
operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& () const
{ return m_xMoveOperations; }
operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate>& ()
const { return m_xBookmarkOperations; }
@@ -141,7 +141,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate >&
getRowLocate() const { return m_xBookmarkOperations; }
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >&
getColumnsSupplier() const { return m_xColumnsSupplier; }
- // das normale queryInterface
+ // the usual queryInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type)
throw ( ::com::sun::star::uno::RuntimeException )
{ return m_xMoveOperations->queryInterface(type); }
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 13c43f7..e555933 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -56,7 +56,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- // Aus Effizienz-gr"unden nicht const
+ // for reasons of efficiency not const
SvxFont& GetFont();
const SvxFont& GetFont() const;
void SetFont( const SvxFont& rFont );
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index cd06a07..0cf41dd 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -58,7 +58,7 @@ class XFormTextShadowYValItem;
/*************************************************************************
|*
-|* ControllerItem fuer Fontwork
+|* ControllerItem for Fontwork
|*
\************************************************************************/
@@ -78,7 +78,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog
+|* Derived from SfxChildWindow as "container" for fontwork dialog
|*
\************************************************************************/
@@ -91,7 +91,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
/*************************************************************************
|*
-|* Floating Window zur Attributierung von Texteffekten
+|* Floating window for setting attributes of text effects
|*
\************************************************************************/
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index 57f98cc..e82a655 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -60,13 +60,13 @@ struct ExchangeData
enum SgaObjKind
{
- SGA_OBJ_NONE = 0, // Abstraktes Objekt
- SGA_OBJ_BMP = 1, // Bitmap-Objekt
- SGA_OBJ_SOUND = 2, // Sound-Objekt
- SGA_OBJ_VIDEO = 3, // Video-Objekt
- SGA_OBJ_ANIM = 4, // Animations-Objekt
- SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt
- SGA_OBJ_INET = 6 // Grafik aus dem Internet
+ SGA_OBJ_NONE = 0, // abstract object
+ SGA_OBJ_BMP = 1, // bitmap object
+ SGA_OBJ_SOUND = 2, // sound object
+ SGA_OBJ_VIDEO = 3, // video object
+ SGA_OBJ_ANIM = 4, // animation object
+ SGA_OBJ_SVDRAW = 5, // Svdraw object
+ SGA_OBJ_INET = 6 // graphics from the internet
};
// -----------
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index ef01eea..eb2bc63 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -36,12 +36,6 @@
#include <svx/svdview.hxx>
#include <svx/svdobj.hxx>
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class GraphCtrlUserCall;
class SvxGraphCtrlAccessibleContext;
@@ -141,12 +135,6 @@ public:
};
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class GraphCtrlUserCall : public SdrObjUserCall
{
GraphCtrl& rWin;
@@ -159,12 +147,6 @@ public:
virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle&
rOldBoundRect );
};
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class GraphCtrlView : public SdrView
{
GraphCtrl& rGraphCtrl;
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index 04ac8b7..c7366f5 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -44,7 +44,7 @@ public:
USHORT );
virtual ~SvxGrfCrop();
- // "pure virtual Methoden" vom SfxPoolItem
+ // "pure virtual methods" from SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &, USHORT nIVer) const;
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 302f0a6..b2432c2 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -67,17 +67,17 @@ enum GridRowStatus
};
//==================================================================
-// DbGridRow, Zeilenbeschreibung
+// DbGridRow, description of rows
//==================================================================
class DbGridRow : public SvRefBase
{
- ::com::sun::star::uno::Any m_aBookmark; //
::com::sun::star::text::Bookmark der Zeile, kann gesetzt sein
+ ::com::sun::star::uno::Any m_aBookmark; //
::com::sun::star::text::Bookmark of the row, can be set
DbDataColumns m_aVariants;
GridRowStatus m_eStatus;
sal_Bool m_bIsNew;
- // Zeile ist nicht mehr gueltig,
- // wird bei der naechsten positionierung
entfernt
+ // row is no longer valid
+ // is removed on the next positioning
public:
DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(sal_True) { }
DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor);
@@ -85,7 +85,7 @@ public:
~DbGridRow();
- // da GetField auf Geschwindigkeit getuned ist vorher immer noch hasField verwenden
+ // Because GetField is tuned on speed, always use hasField first
sal_Bool HasField(sal_uInt32 nPos) const {return nPos < m_aVariants.Count();}
const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return
*m_aVariants.GetObject(nPos); }
@@ -159,23 +159,23 @@ public:
// zusaetzliche Controls
FixedText m_aRecordText;
- AbsolutePos m_aAbsolute; // AbsolutePositionierung
+ AbsolutePos m_aAbsolute; // absolute positioning
FixedText m_aRecordOf;
FixedText m_aRecordCount;
- ImageButton m_aFirstBtn; // ImageButton fuer 'gehe zum
ersten Datensatz'
- ImageButton m_aPrevBtn; // ImageButton fuer 'gehe zum
vorhergehenden Datensatz'
- ImageButton m_aNextBtn; // ImageButton fuer 'gehe zum
naechsten Datensatz'
- ImageButton m_aLastBtn; // ImageButton fuer 'gehe zum
letzten Datensatz'
- ImageButton m_aNewBtn; // ImageButton fuer 'gehe zum neuen
Datensatz'
+ ImageButton m_aFirstBtn; // ImageButton for 'go to the first
record'
+ ImageButton m_aPrevBtn; // ImageButton for 'go to the
previous record'
+ ImageButton m_aNextBtn; // ImageButton for 'go to the next
record'
+ ImageButton m_aLastBtn; // ImageButton for 'go to the last
record'
+ ImageButton m_aNewBtn; // ImageButton for 'go to a new
record'
sal_uInt16 m_nDefaultWidth;
sal_Int32 m_nCurrentPos;
sal_Bool m_bPositioning; // protect PositionDataSource
against recursion
public:
- // StatusIds fuer Controls der Bar
- // wichtig fuers Invalidieren
+ // StatusIds for Controls of the Bar
+ // important for invalidation
enum State
{
RECORD_TEXT = 1,
@@ -191,7 +191,7 @@ public:
NavigationBar(Window* pParent, WinBits nStyle = 0);
- // Status Methoden fuer Controls
+ // Status methods for Controls
void InvalidateAll(sal_Int32 nCurrentPos = -1, sal_Bool bAll = sal_False);
void InvalidateState(sal_uInt16 nWhich) {SetState(nWhich);}
void SetState(sal_uInt16 nWhich);
@@ -213,8 +213,8 @@ public:
friend class DbGridControl::NavigationBar;
public:
- // diese Optionen werden verodert und geben an, welche der einzelnen feature
- // freigegeben werden koennen, default ist readonly also 0
+ // these options are or'ed and indicate, which of the single
+ // features can be released, default is readonly which means 0
enum Option
{
OPT_READONLY = 0x00,
@@ -231,14 +231,14 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >
m_xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
m_xServiceFactory;
- DbGridColumns m_aColumns; // Spaltenbeschreibung
+ DbGridColumns m_aColumns; // Column description
NavigationBar m_aBar;
- DbGridRowRef m_xDataRow; // Zeile die modifiziert werden kann
- // kommt vom DatenCursor
- DbGridRowRef m_xSeekRow, // Zeile die von Iterator gesetzt wird
- // kommt vom DatenCursor
+ DbGridRowRef m_xDataRow; // Row which can be modified
+ // comes from the data cursor
+ DbGridRowRef m_xSeekRow, // Row to which the iterator can set
+ // comes from the data cursor
- m_xEmptyRow; // Datensatz zum einfuegen
+ m_xEmptyRow; // record set to insert
sal_uInt32 m_nAsynAdjustEvent;
@@ -261,17 +261,16 @@ private:
FmGridListener* m_pGridListener;
protected:
- CursorWrapper* m_pDataCursor; // Cursor fuer Updates
- CursorWrapper* m_pSeekCursor; // Cursor zum Seeken
+ CursorWrapper* m_pDataCursor; // Cursor for Updates
+ CursorWrapper* m_pSeekCursor; // Cursor for Seeking
private:
- // dieses sind Laufvariablen
- DbGridRowRef m_xCurrentRow; // Row an der aktuellen Zeile
- DbGridRowRef m_xPaintRow; // Row die gerade drgestellt werden soll
- sal_Int32 m_nSeekPos; // Position des SeekCursors
- sal_Int32 m_nTotalCount; // wird gesetzt, wenn der DatenCursor mit
dem Zählen der
- // Datensätze fertig ist
- // initial Wert ist -1
+ // iteration variables
+ DbGridRowRef m_xCurrentRow;
+ DbGridRowRef m_xPaintRow; // Row to be displayed
+ sal_Int32 m_nSeekPos; // Position of the SeekCursor
+ sal_Int32 m_nTotalCount; // is set when the data cursor finished
counting the
+ // records. Initial value is -1
osl::Mutex m_aDestructionSafety;
osl::Mutex m_aAdjustSafety;
@@ -279,9 +278,9 @@ private:
m_aNullDate; // NullDate of the Numberformatter;
BrowserMode m_nMode;
- sal_Int32 m_nCurrentPos; // Aktuelle Position;
- sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von
Zeilen
- sal_uInt16 m_nOptions; // Was kann das Control (Insert,
Update, Delete)
+ sal_Int32 m_nCurrentPos; // Current position;
+ sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows
+ sal_uInt16 m_nOptions; // What is the able to do (Insert,
Update, Delete)
// default readonly
sal_uInt16 m_nOptionMask; // the mask of options to be enabled in
setDataSource
// (with respect to the data source capabilities)
@@ -304,7 +303,7 @@ private:
sal_Bool m_bHideScrollbars : 1;
protected:
- sal_Bool m_bUpdating : 1; // werden gerade updates
durchgefuehrt
+ sal_Bool m_bUpdating : 1; // are any updates being
executed right now?
protected:
virtual sal_Bool SeekRow(long nRow);
@@ -399,8 +398,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >&
getNumberFormatter() const {return m_xFormatter;}
- // die Datenquelle
- // die Optionen koennen die Updatefaehigkeiten noch einschraenken, nicht erweitern
+ // the data source
+ // the options can restrict but not extend the update abilities
virtual void setDataSource(const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XRowSet >& rCursor,
sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE);
virtual void Dispatch(sal_uInt16 nId);
@@ -412,18 +411,18 @@ public:
sal_Bool HasHandle() const {return m_bHandle;}
void InsertHandleColumn();
- /// welche Position hat die Spalte mit der Id in der ::com::sun::star::sdbcx::View, die
Handle-Column zahelt nicht mit
+ // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the
handle column doesn't count
sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId);
return (nPos==(sal_uInt16)-1) ? GRID_COLUMN_NOT_FOUND : nPos-1; }
- /** welche Position hat die Spalte mit der Id in m_aColumns, also dem von GetColumns
gelieferten ::com::sun::star::sdbcx::Container ?
- (unterscheidet sich u.U. von der von GetViewColumnPos gelieferten, wenn es versteckt
Spalten gibt)
- */
+ // which position does the column with the id in m_aColumns have, that means the
::com::sun::star::sdbcx::Container
+ // returned from the GetColumns (may be different from the position returned by
GetViewColumnPos
+ // if there are hidden columns)
sal_uInt16 GetModelColumnPos( sal_uInt16 nId ) const;
- /// Anzahl der Spalten im Model
+ // the number of columns in the model
sal_uInt16 GetViewColCount() const { return ColCount() - 1; }
sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.Count(); }
- /// umgekehrt zu GetViewColumnPos : Id zu Position, die erste Nicht-Handle-Column hat die
Position 0
+ // reverse to GetViewColumnPos: Id of position, the first non-handle column has position 0
sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); }
sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
@@ -450,7 +449,7 @@ public:
const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;}
- // Positionierung
+ // positioning
void MoveToPosition(sal_uInt32 nPos);
void MoveToFirst();
void MoveToNext();
@@ -458,15 +457,17 @@ public:
void MoveToLast();
void AppendNew();
- // Abgleich der Cursor falls von außen der DatenCursor verschoben wurde
- // Flag bedeutet ob ein Abgleich es Rowcounts vorgenommen werden soll
+ // adjustment of the cursors in case the data cursor has been
+ // moved from the outside.
+ // the flag indicates if an adjustment of the row count should be
+ // done as well
void AdjustDataSource(sal_Bool bFull = sal_False);
void Undo();
virtual void BeginCursorAction();
virtual void EndCursorAction();
- // wird die aktuelle Zeile neu gesetzt
+ // is the current line being updated
sal_Bool IsUpdating() const {return m_bUpdating;}
virtual void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True );
@@ -478,15 +479,16 @@ public:
sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; }
void setDisplaySynchron(sal_Bool bSync);
void forceSyncDisplay();
- // wenn das auf sal_False gesetzt wird, laeuft die Anzeige nicht mehr mit der aktuellen
Cursor-Position synchron
- // (soll heissen, in AdjustDataSource wird nicht in die zur CursorPosition gehoerenden
Zeile gesprungen)
- // wer das benutzt, sollte bitte wissen, was er tut, da zum Beispiel die Eingabe von Daten
in einer Zeile auf der Anzeige,
- // die gar nicht mit der Position des Cursors synchron ist, ziemlich kritisch sein koennte
+ // when set to sal_False, the display is no longer in sync with the current cursor position
+ // (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition)
+ // when using this, you should know what you are doing, because for example entering data
+ // in a row in the display that is not in sync with the position of the cursor can be very
critical
sal_Bool isForcedROController() const { return m_bForceROController; }
void forceROController(sal_Bool bForce);
- // Setzt man das auf sal_True, hat das GridControl immer einen
::com::sun::star::frame::Controller, der allerdings read-only ist. Ausserdem
- // wird die Edit-Zeile des Controllers so eingestellt, dass sie ihre Selektion bei
Fokus-Verlust weiterhin anzeigt.
+ // when set to sal_True, the GridControl always has a ::com::sun::star::frame::Controler
which is
+ // read-only though. Additionally, the edit row of the controller is configured in a way
+ // that its selection stays displayed on focus loss.
const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;}
@@ -568,7 +570,7 @@ public:
protected:
void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor);
sal_Bool SeekCursor(long nRow, sal_Bool bAbsolute = sal_False);
- void RemoveColumns(); // aufraeumen eigener strukturen
+ void RemoveColumns(); // cleaning of own structures
void AdjustRows();
sal_Int32 AlignSeekCursor();
sal_Bool SetCurrent(long nNewRow);
@@ -577,10 +579,10 @@ protected:
virtual void DeleteSelectedRows();
sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
- // Zeile an der gerade eingefuegt wird
+ // row which is currently being appended
sal_Bool IsCurrentAppending() const;
- // Leerzeile zum Einfuegen
+ // empty row for insertion
sal_Bool IsInsertionRow(long nRow) const;
void SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;}
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index b81e74e..c50d98d 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -35,20 +35,20 @@
// Defines
//************************************************************
-enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // nur fuer Statusabfrage
- SDRPATHSMOOTH_ANGULAR, // Eckig
- SDRPATHSMOOTH_ASYMMETRIC, // unsymmetrisch, normales Smooth
- SDRPATHSMOOTH_SYMMETRIC}; // symmetrisch
+enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query
+ SDRPATHSMOOTH_ANGULAR, // angular
+ SDRPATHSMOOTH_ASYMMETRIC, // asymmetric, normal Smooth
+ SDRPATHSMOOTH_SYMMETRIC}; // symmetric
-enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // nur fuer Statusabfrage
- SDRPATHSEGMENT_LINE, // gerader Streckenabschnitt
- SDRPATHSEGMENT_CURVE, // Kurvenabschnitt (Bezier)
- SDRPATHSEGMENT_TOGGLE}; // nur fuer Set: Toggle
+enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // only for status query
+ SDRPATHSEGMENT_LINE, // straight path segment
+ SDRPATHSEGMENT_CURVE, // curve path segment (Bezier)
+ SDRPATHSEGMENT_TOGGLE}; // only for Set: Toggle
-enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // nur fuer Statusabfrage
- SDROBJCLOSED_OPEN, // Objekte geoeffnet (Linie, Polyline, ...)
- SDROBJCLOSED_CLOSED, // Objekte geschlossen (Polygon, ...)
- SDROBJCLOSED_TOGGLE}; // nur fuer Set: Toggle (not implemented yet)
+enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // only for status query
+ SDROBJCLOSED_OPEN, // non-closed object (line, polyline, ...)
+ SDROBJCLOSED_CLOSED, // closed object (polygon, ...)
+ SDROBJCLOSED_TOGGLE}; // only for Set: Toggle (not implemented yet)
class IPolyPolygonEditorController
{
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 85d67a6..9177bd0 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -127,7 +127,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
protected:
virtual void Modify();
virtual void Down();
- virtual void Up(); // Nur zur Sicherheit
+ virtual void Up(); // just to be sure
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index a1f78a6..738d9ca 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -105,10 +105,6 @@ namespace layout
class SvxLanguageBoxImpl;
class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
{
- /*DECL_GET_IMPL( SvxLanguageBox );
- DECL_CONSTRUCTORS( SvxLanguageBox, ListBox, WB_BORDER );
- DECL_GET_WINDOW (SvxLanguageBox);*/
-
public:
SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE );
~SvxLanguageBox ();
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index eb1ce3e..cf2d6ae 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -33,18 +33,18 @@
/*************************************************************************
|*
-|* 3D-Rotationsobjekt aus uebergebenem 2D-Polygon erzeugen
+|* Create a 3D rotation object from a passed 2D polygon
|*
-|* Das aPolyPoly3D wird in nHSegments-Schritten um die Achse rotiert.
-|* nVSegments gibt die Anzahl der Linien von aPolyPoly3D an und stellt damit
-|* quasi eine vertikale Segmentierung dar.
+|* The aPolyPoly3D is rotated around its axis in nHSegments steps.
+|* nVSegments contains the number of lines of aPolyPoly3D and therefore
+|* is effectively a vertical segmentation.
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dLatheObj : public E3dCompoundObject
{
private:
- // Partcodes fuer Wireframe-Generierung: Standard oder Deckelflaeche
+ // Part codes for Wireframe generation: standard oder cover surface
enum { LATHE_PART_STD = 1, LATHE_PART_COVER = 2 };
basegfx::B2DPolyPolygon maPolyPoly2D;
@@ -105,15 +105,15 @@ private:
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung
+ // set/get local parameters with geometry recreation
void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew);
const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; }
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index bb476d4..4735086 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -247,7 +247,7 @@
#define DFF_msofbtSelection 0xF119 // an FDGSL followed by the
SPIDs of the shapes in the selection X 0
-// Werte fuer den ULONG im DFF_PST_TextHeaderAtom
+// Values for the ULONG in DFF_PST_TextHeaderAtom
enum DFF_TextHeader {
DFFTH_TITLE,
DFFTH_BODY,
@@ -578,7 +578,7 @@ enum DFF_TextHeader {
#define DFF_PBit_Print 0x00000001
//---------------------------------------------------------------------------
-// Dreh- und Angelpunkt: der Shape-Typ
+// linchpin: the shape type
//---------------------------------------------------------------------------
typedef enum
{
@@ -790,10 +790,10 @@ typedef enum
mso_sptNil = mso_sptMax
} MSO_SPT;
-// verschiedene enums aus der OfficeDraw-Doku, Appendix D - Anfang
+// different enums from the OfficeDraw documentation, Appendix D - beginning
//
-// beachte: in Abweichung von der MS-Doku beginnen alle
-// mit "mso_" statt mit "mso"
+// note: in opposite to the MS documentation, they all
+// start with "mso_" instead of "mso"
//
enum MSO_ShapePath {
mso_shapeLines, // A line of straight segments
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 94e4660..1ee3b7a 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -64,8 +64,9 @@ enum SvxNumberValueType
// define ----------------------------------------------------------------
-#define CAT_ALL 0 // Reihenfolge der Kategorie-
-#define CAT_USERDEFINED 1 // ListBox-Eintraege in der TabPage
+// sort order of the category ListBox entries in the TabPage
+#define CAT_ALL 0
+#define CAT_USERDEFINED 1
#define CAT_NUMBER 2
#define CAT_PERCENT 3
#define CAT_CURRENCY 4
@@ -171,7 +172,7 @@ public:
String& rPreviewStr,
Color*& rpFontColor );
- void MakePrevStringFromVal( const String& rFormatStr,
//@ 19.09.97
+ void MakePrevStringFromVal( const String& rFormatStr,
String& rPreviewStr,
Color*& rpFontColor,
double nValue);
@@ -218,7 +219,7 @@ public:
void GetCurrencyFormats(SvStrings& rList);
private:
- static const double DEFAULT_NUMVALUE; // 123456789
+ static const double DEFAULT_NUMVALUE;
SvNumberFormatter* pFormatter;
SvNumberFormatTable* pCurFmtTable;
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 94177b5..8d71241 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -38,8 +38,7 @@
/*
-[Beschreibung]
-Dieses Item dient als Transport-Medium fuer einen Number-Formatter.
+This item is used as a transport medium for a number formatter
*/
class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 775c3fb..fe25bcf 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -45,7 +45,7 @@
#include "svx/svxdllapi.h"
//************************************************************
-// Vorausdeklarationen
+// Forward declaration
//************************************************************
class SfxPoolItem;
@@ -65,22 +65,22 @@ namespace sdr { namespace properties {
/*************************************************************************
|*
-|* GeoData relevant fuer Undo-Actions
+|* GeoData relevant for undo actions
|*
\************************************************************************/
class E3DObjGeoData : public SdrObjGeoData
{
public:
- basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des
Objekts
- basegfx::B3DHomMatrix maTransformation; // lokale Transformation
+ basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object
+ basegfx::B3DHomMatrix maTransformation; // lokal transformations
E3DObjGeoData() {}
};
/*************************************************************************
|*
-|* Liste fuer 3D-Objekte
+|* List for 3D objects
|*
\************************************************************************/
@@ -100,7 +100,7 @@ public:
/*************************************************************************
|*
-|* Basisklasse fuer 3D-Objekte
+|* Base class for 3D objects
|*
\************************************************************************/
@@ -110,18 +110,18 @@ private:
// to allow sdr::properties::E3dProperties access to StructureChanged()
friend class sdr::properties::E3dProperties;
- // Aus der E3dObjList und E3dDragMethod alles erlauben
+ // Allow everything for E3dObjList and E3dDragMethod
friend class E3dObjList;
friend class E3dDragMethod;
protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
- E3dObjList maSubList; // Subliste
(Childobjekte)
+ E3dObjList maSubList; // child objekts
- basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des
Objekts (aus geometrieerzeugung)
- basegfx::B3DHomMatrix maTransformation; // lokale Transformation
- basegfx::B3DHomMatrix maFullTransform; // globale Transformation (inkl.
Parents)
+ basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object
(from the geometry generation)
+ basegfx::B3DHomMatrix maTransformation; // local transformation
+ basegfx::B3DHomMatrix maFullTransform; // global transformation
(including. parents)
// Flags
unsigned mbTfHasChanged : 1;
@@ -164,7 +164,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual SdrObjList* GetSubList() const;
- // 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang!
+ // Insert 3D object into the group; transfer to other owner!
virtual void Insert3DObj(E3dObject* p3DObj);
void Remove3DObj(E3dObject* p3DObj);
@@ -174,23 +174,24 @@ public:
const basegfx::B3DRange& GetBoundVolume() const;
void InvalidateBoundVolume();
- // komplette Transformation inklusive aller Parents berechnen
+ // calculate complete transformation including all parents
const basegfx::B3DHomMatrix& GetFullTransform() const;
- // Transformationsmatrix abfragen bzw. (zurueck)setzen
+ // get and (re)set transformation matrix
const basegfx::B3DHomMatrix& GetTransform() const;
virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix);
virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix);
- // [FG] 2D-Rotationen, werden hier als Rotationen um die Z-Achse, die in den Bildschirm zeigt,
- // implementiert plus eine Verschiebung der Scene. Dies bedeutet auch die Scene (E3dScene)
- // muss diese Routine in der Klasse als virtual definieren.
+ // 2D rotations, are implemented as a rotation around the Z axis
+ // which is vertical to the screen, plus a shift of the scene.
+ // This means that also the scene (E3dScene) must define this
+ // routine as virtual in its class.
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
// get wireframe polygon for local object. No transform is applied.
basegfx::B3DPolyPolygon CreateWireframe() const;
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
USHORT GetLogicalGroup() { return 0; }
@@ -200,22 +201,22 @@ public:
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
- // Selektion Setzen/Lesen
+ // get/set the selection
bool GetSelected() const { return mbIsSelected; }
void SetSelected(bool bNew);
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
/*************************************************************************
|*
-|* Klasse fuer alle zusammengesetzen Objekte (Cube, Lathe, Scene, Extrude)
-|* Diese Klasse erspart ein paar ISA-Abfragen und sie beschleunigt das
-|* Verhalten ungemein, da alle Attribute usw. fuer die untergeordneten
-|* Polygone hierueber gehalten werden. Die Polygone duerfen nur Attribute
-|* halten, wenn sie direkt einer Szene untergeordnet sind.
+|* Class for all compound objects (Cube, Lathe, Scene, Extrude)
+|* This class saves some ISA queries and accelerates the behaviour
+|* significantly, because all the attributes etc. are kept through this.
+|* The polygons may only keep attributes if they are directly
+|* subordinated to the scene.
|*
\************************************************************************/
@@ -231,10 +232,10 @@ private:
protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
- // Material des Objektes
+ // material of the object
Color aMaterialAmbientColor;
- // Attribute zur Geometrieerzeugung
+ // attributes for geometry creation
unsigned bCreateNormals : 1;
unsigned bCreateTexture : 1;
@@ -307,21 +308,20 @@ public :
virtual UINT16 GetObjIdentifier() const;
virtual void RecalcSnapRect();
- // Parameter Geometrieerzeugung setzen/lesen
+ // set/get parameters for geometry creation
BOOL GetCreateNormals() const { return bCreateNormals; }
void SetCreateNormals(BOOL bNew);
BOOL GetCreateTexture() const { return bCreateTexture; }
void SetCreateTexture(BOOL bNew);
- // Copy-Operator
+ // copy operator
virtual void operator=(const SdrObject&);
- // Material des Objektes
+ // material of the object
const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
void SetMaterialAmbientColor(const Color& rColor);
- // #110988#
sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
};
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 9a7c294..b0e9ca5 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -34,10 +34,6 @@
#include "svx/svxdllapi.h"
-/*--------------------------------------------------------------------
- Beschreibung: SvxNumType
- --------------------------------------------------------------------*/
-
enum SvxNumType
{
SVX_CHARS_UPPER_LETTER,
@@ -51,7 +47,7 @@ enum SvxNumType
};
/*--------------------------------------------------------------------
- Beschreibung: Benutzung der Seite
+ usage of the page
--------------------------------------------------------------------*/
enum SvxPageUsage
@@ -65,24 +61,21 @@ enum SvxPageUsage
};
/*--------------------------------------------------------------------
- Beschreibung: Teile der Seitenbeschreibung
+ parts of the page description
--------------------------------------------------------------------*/
-
-
/*
-[Beschreibung]
-Dieses Item beschreibt ein Seiten-Attribut (Name der Vorlage, Numerierung,
-Portrait oder Landscape, Layout).
+This item describes a page attribute (name of the template, enumeration,
+portait or landscape, layout)
*/
class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
{
private:
- String aDescName; // Name der Vorlage
- SvxNumType eNumType; // Numerierung
- BOOL bLandscape; // Portrait / Landscape
- USHORT eUse; // Layout
+ String aDescName; // name of the template
+ SvxNumType eNumType; // enumeration
+ BOOL bLandscape; // portrait / landscape
+ USHORT eUse; // layout
public:
@@ -103,18 +96,18 @@ public:
virtual SfxPoolItem* Create( SvStream&, USHORT ) const;
virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const;
- // Ausrichtung
+ // orientation
USHORT GetPageUsage() const { return eUse;
}
void SetPageUsage(USHORT eU) { eUse= eU;
}
BOOL IsLandscape() const { return
bLandscape; }
void SetLandscape(BOOL bL) { bLandscape = bL;
}
- // Numerierung
+ // enumeration
SvxNumType GetNumType() const { return eNumType;
}
void SetNumType(SvxNumType eNum) { eNumType = eNum;
}
- // Name des Descriptors
+ // name of the descriptor
const String& GetDescName() const { return aDescName; }
void SetDescName(const String& rStr) { aDescName = rStr; }
};
@@ -122,16 +115,9 @@ public:
/*--------------------------------------------------------------------
- Beschreibung: Container fuer Header/Footer-Attribute
+ container for header/footer attributes
--------------------------------------------------------------------*/
-
-
-/*
-[Beschreibung]
-Dieses Item dient als Container fuer Header- und Footer-Attribute.
-*/
-
class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem
{
public:
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index 3a40b61..b2a7f48 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -54,18 +54,18 @@ private:
Size aWinSize;
Size aSize;
- // Einzuege
+ // indentation
long nLeftMargin;
long nRightMargin;
short nFirstLineOfst;
- // Abstaende
+ // distances
USHORT nUpper;
USHORT nLower;
- // Ausrichtung
+ // adjustment
SvxAdjust eAdjust;
- // Letzte Zeile im Blocksatz
+ // last line in justification
SvxAdjust eLastLine;
- // Zeilenabstand
+ // line distance
SvxPrevLineSpace eLine;
USHORT nLineVal;
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 2078925..fdbccc0 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -34,7 +34,7 @@
class SVX_DLLPUBLIC E3dPolygonObj : public E3dCompoundObject
{
private:
- // Parameter
+ // parameters
basegfx::B3DPolyPolygon aPolyPoly3D;
basegfx::B3DPolyPolygon aPolyNormals3D;
basegfx::B2DPolyPolygon aPolyTexture2D;
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index f0f3311..f529e50 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -33,7 +33,7 @@
/*************************************************************************
|*
-|* 3D-Szene mit Darstellung durch 2D-Polygone
+|* 3D scene displayed through 2D polygons
|*
\************************************************************************/
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index 5b338a9..459c685 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -52,33 +52,33 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
using Window::Notify;
SvxRulerItem **pCtrlItem;
- SvxLongLRSpaceItem *pLRSpaceItem; //Linker und Rechter Rand
- SfxRectangleItem *pMinMaxItem; //Maxima fuers Draggen
- SvxLongULSpaceItem *pULSpaceItem; //Oberer und Unterer Rand
- SvxTabStopItem *pTabStopItem; //Tabstops
- SvxLRSpaceItem *pParaItem; //Absaetze
- SvxLRSpaceItem *pParaBorderItem; //Border distance
- SvxPagePosSizeItem *pPagePosItem; //Seitenabstaende zum Lineal
- SvxColumnItem *pColumnItem; //Spalten
- SvxObjectItem *pObjectItem; //Objekt
+ SvxLongLRSpaceItem *pLRSpaceItem; // left and right edge
+ SfxRectangleItem *pMinMaxItem; // maxima for dragging
+ SvxLongULSpaceItem *pULSpaceItem; // upper and lower edge
+ SvxTabStopItem *pTabStopItem; // tab stops
+ SvxLRSpaceItem *pParaItem; // paragraphs
+ SvxLRSpaceItem *pParaBorderItem; // border distance
+ SvxPagePosSizeItem *pPagePosItem; // page distance to the rule
+ SvxColumnItem *pColumnItem; // columns
+ SvxObjectItem *pObjectItem; // object
Window *pEditWin;
SvxRuler_Impl *pRuler_Imp;
BOOL bAppSetNullOffset :1;
BOOL bHorz :1;
- long lLogicNullOffset; // in logischen Koordinaten
- long lAppNullOffset; // in logischen Koordinaten
- long lMinFrame; // minimale Framebreite in Pixel
+ long lLogicNullOffset; // in logic coordinates
+ long lAppNullOffset; // in logic coordinates
+ long lMinFrame; // minimal frame width in pixels
long lInitialDragPos;
USHORT nFlags;
enum {
NONE = 0x0000,
DRAG_OBJECT = 0x0001,
- // letzte Spalte verkleinern, Shift
+ // reduce size of the last column, shift
DRAG_OBJECT_SIZE_LINEAR = 0x0002,
DRAG_OBJECT_SIZE_PROPORTIONAL = 0x0004, // proportional, Ctrl
- // nur aktuelle Zeile (Tabelle; Shift-Ctrl)
+ // only current line (table; Shift-Ctrl)
DRAG_OBJECT_ACTLINE_ONLY = 0x0008,
- // aktuell gleiche Tastenbelegung
+ // currently same key assignment
DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL
}
nDragType;
@@ -87,8 +87,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
USHORT nTabBufSize;
long lDefTabDist;
long lTabPos;
- RulerTab *pTabs; // Tabpositionen in Pixel
- RulerIndent *pIndents; // Absatzraender in Pixel
+ RulerTab *pTabs; // tab positions in pixel
+ RulerIndent *pIndents; // paragraph margins in pixel
RulerBorder *pBorders;
USHORT nBorderCount;
RulerBorder *pObjectBorders;
@@ -104,27 +104,27 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE);
USHORT GetObjectBordersOff(USHORT nIdx) const;
- // Seitenr"ander oder umgebender Rahmen
+ // page borders or surrounding frame
void UpdateFrame(const SvxLongLRSpaceItem *);
void UpdateFrame(const SvxLongULSpaceItem *);
void UpdateFrameMinMax(const SfxRectangleItem *);
- // Absatzeinzuege
+ // paragraph indentations
void UpdatePara(const SvxLRSpaceItem *);
// Border distance
void UpdateParaBorder(const SvxLRSpaceItem *);
// Tabs
void Update(const SvxTabStopItem *);
- // Seitenposition und -breite
+ // page position and width
void Update(const SvxPagePosSizeItem *);
- // Spalten
+ // columns
void Update(const SvxColumnItem *, USHORT nSID);
- // Object Selektion
+ // object selection
void Update(const SvxObjectItem *);
- // Protect
+ // protect
void Update( const SvxProtectItem* );
// left-to-right text
void UpdateTextRTL( const SfxBoolItem* );
- // Absatzeinzuege
+ // paragraph indentations
void UpdatePara();
void UpdateTabs();
void UpdatePage();
@@ -153,9 +153,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
long ConvertSizeLogic(long lSize) const;
long GetFirstLineIndent() const;
-// long GetLogicFirstLineIndent() const;
long GetLeftIndent() const;
-// long GetLogicLeftIndent() const;
long GetRightIndent() const;
long GetLogicRightIndent() const;
long GetPageWidth() const;
@@ -213,8 +211,8 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- // Berechnung der Grenzwerte fuer Objectgrenzen
- // Werte sind bezogen auf die Seite
+ // calculation of boundary values for object borders
+ // values refer to the page
virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const;
BOOL IsActLastColumn(
BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ;
@@ -251,7 +249,7 @@ public:
void SetDefTabDist(long);
long GetDefTabDist() const;
- // Setzen / Erfragen NullOffset in logischen Einheiten
+ // set/get NullOffset in logic units
void SetNullOffsetLogic(long lOff = 0);
long GetNullOffsetLogic() const { return lAppNullOffset; }
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index f40ca3a..73060f4 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -45,7 +45,7 @@ namespace drawinglayer { namespace geometry {
/*************************************************************************
|*
-|* GeoData relevant fuer Undo-Actions
+|* GeoData relevant for undo actions
|*
\************************************************************************/
@@ -57,12 +57,11 @@ public:
E3DSceneGeoData() {}
};
-// #110988#
class Imp3DDepthRemapper;
/*************************************************************************
|*
-|* Basisklasse fuer 3D-Szenen
+|* base class for 3D scenes
|*
\************************************************************************/
@@ -76,11 +75,10 @@ protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
- // Transformationen
+ // transformations
B3dCamera aCameraSet;
Camera3D aCamera;
- // #110988#
Imp3DDepthRemapper* mp3DDepthRemapper;
// Flag to determine if only selected objects should be drawn
@@ -96,7 +94,6 @@ protected:
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
- // #110988#
void ImpCleanup3DDepthMapper();
public:
@@ -112,7 +109,6 @@ public:
virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
- // #110988#
sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const;
// Perspective: enum ProjectionType { PR_PARALLEL, PR_PERSPECTIVE }
@@ -225,20 +221,20 @@ public:
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
void RotateScene(const Point& rRef, long nWink, double sn, double cs);
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Transformationen rausgeben
+ // get transformations
B3dCamera& GetCameraSet() { return aCameraSet; }
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
basegfx::B3DVector GetShadowPlaneDirection() const;
void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
- // Polygon das waehrend des Erzeugens aufgezogen wird
+ // polygon which is built during creation
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
// create moves
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 5d994d2..34ff0d5 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -33,8 +33,8 @@
//------------------------------------------------------------
// class SdrAngleItem
-// Fuer alle Metriken. GetPresentation liefert dann bei
-// Value=2500 z.B. ein "25mm".
+// For all metrics. GetPresentation returns for example for
+// Value=2500 a "25mm".
//------------------------------------------------------------
class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 01980c7..ae4bcd4 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -33,8 +33,8 @@
//------------------------------------------------------------
// class SdrOnOffItem
-// hier liefert GetValueTextByVal() "an" oder "aus"
-// anstelle von "TRUE" und "FALSE"
+// here GetValueTextByVal() returns "an" or "aus" instead
+// of "TRUE" or "FALSE"
//------------------------------------------------------------
class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
public:
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index 8e37303..d5810be 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -33,7 +33,7 @@
//------------------------------------------------------------
// class SdrPercentItem
-// Ganze Prozente von 0
+// Integer percents of 0
//------------------------------------------------------------
class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
@@ -55,7 +55,7 @@ public:
//------------------------------------------------------------
// class SdrSignedPercentItem
-// Ganze Prozente von +/-
+// Integer percents of +/-
//------------------------------------------------------------
class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/svx/inc/svx/sdrobjectfilter.hxx
index 01565ef..7b69c2e 100644
--- a/svx/inc/svx/sdrobjectfilter.hxx
+++ b/svx/inc/svx/sdrobjectfilter.hxx
@@ -28,9 +28,6 @@
#include "svx/svxdllapi.h"
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
class SdrObject;
//........................................................................
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index 60fb360..9b1bc95 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -92,7 +92,6 @@ class SVX_DLLPUBLIC SdrPageWindow
void* mpDummy;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
mxControlContainer;
- // #110094# ObjectContact section
sdr::contact::ObjectContact* CreateViewSpecificObjectContact();
public:
@@ -121,12 +120,10 @@ public:
// Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
void InvalidatePageWindow(const basegfx::B2DRange& rRange);
- // #110094# ObjectContact section
sdr::contact::ObjectContact& GetObjectContact() const;
/// determines whether there already exists an ObjectContact
bool HasObjectContact() const;
- // #i26631#
void ResetObjectContact();
/** sets all elements in the view which support a design and a alive mode into the given mode
diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx
index fa42352..f289eb6 100644
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/svx/inc/svx/sdshcitm.hxx
@@ -40,7 +40,6 @@ public:
SdrShadowColorItem(const String& rName, const Color& rTheColor):
XColorItem(SDRATTR_SHADOWCOLOR,rName,rTheColor) {}
-// SdrShadowColorItem(SvStream& rIn):
XColorItem(SDRATTR_SHADOWCOLOR,rIn) {}
};
#endif
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index 43e34ab..592d5e0 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -30,7 +30,7 @@
#include <svl/intitem.hxx>
#include <svx/svddef.hxx>
-// Anzahl der Durchlaeufe. 0=Endlos.
+// Number of loops. 0=infinite.
class SdrTextAniCountItem: public SfxUInt16Item {
public:
SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index bf16e93..93f7d4a 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -47,7 +47,7 @@ public:
SdrTextAniDirectionItem(SvStream& rIn) :
SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual USHORT GetValueCount() const;
SdrTextAniDirection GetValue() const { return
(SdrTextAniDirection)SfxEnumItem::GetValue(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index c4f24a9..3506805 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -35,12 +35,11 @@
// class SdrTextVertAdjustItem
//------------------------------
-// Implementiert werden zunaechst nur TOP und CENTER, neustens auch BOTTOM
-enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // Kopfbuendig (so wie man es normalerweise
kennt)
- SDRTEXTVERTADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw)
- SDRTEXTVERTADJUST_BOTTOM, // Fussbuendig
- SDRTEXTVERTADJUST_BLOCK // #103516# support vertical full with
supported now
- /*,SDRTEXTVERTADJUST_STRETCH*/}; // Auch die Buchstaben in der Hoehe
verzerren (ni)
+enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally used)
+ SDRTEXTVERTADJUST_CENTER, // centered (for example for the title texts
in Draw)
+ SDRTEXTVERTADJUST_BOTTOM, // aligned to bottom
+ SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now
+ /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height
(ni)
class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
public:
@@ -63,11 +62,11 @@ public:
// class SdrTextHorzAdjustItem
//------------------------------
-enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // Linksbuendig verankert
- SDRTEXTHORZADJUST_CENTER, // Zentriert (z.B. fuer die Titeltexte im Draw)
- SDRTEXTHORZADJUST_RIGHT, // Rechtsbuendig verankert
- SDRTEXTHORZADJUST_BLOCK // So wie es frueher war: Gesamte
Textrahmenbreite verwenden, Absatzformatierung macht wieder Sinn
- /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X-Richtung (ni).
+enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted
+ SDRTEXTHORZADJUST_CENTER, // centered (for example for title texts in
Draw)
+ SDRTEXTHORZADJUST_RIGHT, // right adjusted
+ SDRTEXTHORZADJUST_BLOCK // use the whole text frame width
+ /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni).
class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
public:
@@ -76,7 +75,7 @@ public:
SdrTextHorzAdjustItem(SvStream& rIn) :
SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual USHORT GetValueCount() const;
SdrTextHorzAdjust GetValue() const { return
(SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx
index ccfa3cf..92e21d4 100644
--- a/svx/inc/svxempty.hxx
+++ b/svx/inc/svxempty.hxx
@@ -35,7 +35,6 @@ extern XubString& rImplEmptyStr;
inline const XubString& GetEmptyStr() { return rImplEmptyStr; }
#define GetEmptySStr GetEmptyStr
#else
-// CSET stellt rImplEmptyStr nicht in items.lib (?)
const XubString& GetEmptyStr();
#define GetEmptySStr GetEmptyStr
#endif
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx
index 31baf42..5eaf51f 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svxerr.hxx
@@ -36,9 +36,6 @@
#define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS (1UL | ERRCODE_AREA_SVX | \
ERRCODE_CLASS_NOTEXISTS)
-// moved to editeng lib
-//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX)
-
#define ERRCODE_SVX_LINGU_LINGUNOTEXISTS (3UL | ERRCODE_AREA_SVX | \
ERRCODE_CLASS_NOTEXISTS )
#define ERRCODE_SVX_LINGU_HYPHENNOTEXISTS (4UL | ERRCODE_AREA_SVX | \
@@ -50,8 +47,6 @@
#define ERRCODE_SVX_GRAPHIC_NOTREADABLE (7UL | ERRCODE_AREA_SVX | \
ERRCODE_CLASS_READ )
-// moved to editeng lib
-//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | ERRCODE_CLASS_READ )
#define ERRCODE_SVX_LINGU_NOLANGUAGE (9UL | ERRCODE_AREA_SVX | \
ERRCODE_CLASS_NOTEXISTS )
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/swframeposstrings.hxx
index ba73e3d..bdbb92b 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/swframeposstrings.hxx
@@ -30,10 +30,10 @@
#include <tools/string.hxx>
#include "svx/svxdllapi.h"
-/* -----------------04.03.2004 12:58-----------------
+/*
contains strings needed for positioning dialogs
of frames and drawing in Writer
- --------------------------------------------------*/
+ */
class SvxSwFramePosString_Impl;
class SVX_DLLPUBLIC SvxSwFramePosString
{
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/swframevalidation.hxx
index 0bd57c9..a6b2e32 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/swframevalidation.hxx
@@ -30,9 +30,9 @@
#include <tools/gen.hxx>
#include <limits.h>
-/* -----------------03.03.2004 16:31-----------------
- struct to determine min/max values for fly frame positioning in Writer
- --------------------------------------------------*/
+/*
+ struct to determine min/max values for fly frame positioning in Writer
+ */
struct SvxSwFrameValidation
{
sal_Int16 nAnchorType; //com::sun::star::text::TextContentAnchorType
@@ -61,7 +61,7 @@ struct SvxSwFrameValidation
sal_Int32 nMinHeight;
sal_Int32 nMaxHeight;
- Size aPercentSize; // Size fuer 100%-Wert
+ Size aPercentSize; // Size for 100% value
SvxSwFrameValidation() :
bAutoHeight(false),
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/tbxctl.hxx
index eee93e3..efd3bb8 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/tbxctl.hxx
@@ -32,7 +32,7 @@
/*************************************************************************
|*
-|* Klasse f"ur SwToolbox
+|* Class for SwToolbox
|*
\************************************************************************/
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx
index 2fa88fe..52badab 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/verttexttbxctrl.hxx
@@ -30,9 +30,9 @@
#include <sfx2/tbxctrl.hxx>
#include "svx/svxdllapi.h"
-/* -----------------------------27.04.01 15:38--------------------------------
- control to remove/insert cjk settings dependent vertical text toolbox item
- ---------------------------------------------------------------------------*/
+/*
+ control to remove/insert cjk settings dependent vertical text toolbox item
+ */
class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl
{
sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked
@@ -45,18 +45,14 @@ public:
void SetVert(sal_Bool bSet) {bCheckVertical = bSet;}
};
-/* -----------------------------12.09.2002 11:50------------------------------
- ---------------------------------------------------------------------------*/
class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
};
-/* -----------------------------12.09.2002 11:50------------------------------
- ---------------------------------------------------------------------------*/
class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
public:
diff --git a/svx/inc/xexch.hxx b/svx/inc/xexch.hxx
index bb18e46..f616fc2 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/xexch.hxx
@@ -33,7 +33,7 @@
#include "svx/svxdllapi.h"
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Clipboard-Format fuer XOutDev-Fuellattribute
+// Clipboard format for XOutDev filling attributes
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
class XFillAttrSetItem;
@@ -54,7 +54,6 @@ public:
XFillExchangeData(const XFillAttrSetItem rXFillAttrSetItem);
virtual ~XFillExchangeData();
- // Zuweisungsoperator
XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData
);
SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData&
rXFillExchangeData );
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index 3650a69..33dc044 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -31,15 +31,6 @@
#include <tools/gen.hxx>
#include <svx/xpoly.hxx>
-/*************************************************************************
-|*
-|* class ImpXPolygon
-|*
-|* Beschreibung
-|* Ersterstellung 08.11.94
-|* Letzte Aenderung Joe 26.09.95
-|*
-*************************************************************************/
class ImpXPolygon
{
public:
@@ -73,16 +64,6 @@ public:
void Remove( USHORT nPos, USHORT nCount );
};
-
-/*************************************************************************
-|*
-|* class ImpXPolyPolygon
-|*
-|* Beschreibung
-|* Ersterstellung 08.11.94
-|* Letzte Aenderung Joe 26-09-1995
-|*
-*************************************************************************/
DECLARE_LIST( XPolygonList, XPolygon* )
class ImpXPolyPolygon
Context
- [Libreoffice] [Patch] Several comment translations in svx/inc · Wolfgang Silbermayr
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.