[Libreoffice-commits] .: svx/inc svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Oct 21 02:32:57 PDT 2010
svx/inc/anchorid.hxx | 10 -
svx/inc/dragmt3d.hxx | 8
svx/inc/flagsdef.hxx | 2
svx/inc/float3d.hrc | 2
svx/inc/fmgridif.hxx | 8
svx/inc/fmhelp.hrc | 4
svx/inc/globl3d.hxx | 1
svx/inc/helpid.hrc | 2
svx/inc/imapdlg.hxx | 2
svx/inc/lightdlg.hxx | 4
svx/inc/numvset.hxx | 12 -
svx/inc/objfac3d.hxx | 2
svx/inc/optgenrl.hxx | 4
svx/inc/optgrid.hxx | 3
svx/inc/postattr.hxx | 11 -
svx/inc/relfld.hxx | 6
svx/inc/rotmodit.hxx | 2
svx/inc/rulritem.hxx | 48 ++---
svx/inc/sjctrl.hxx | 219 ++++++++++-----------------
svx/inc/srchdlg.hxx | 12 -
svx/inc/svdglob.hxx | 14 -
svx/inc/svdibrow.hxx | 2
svx/inc/svditer.hxx | 6
svx/inc/svdstr.hrc | 17 --
svx/inc/svdviter.hxx | 70 ++++----
svx/inc/svimbase.hxx | 11 -
svx/inc/svx/bmpmask.hxx | 2
svx/inc/svx/camera3d.hxx | 12 -
svx/inc/svx/charmap.hxx | 4
svx/inc/svx/colrctrl.hxx | 2
svx/inc/svx/contdlg.hxx | 14 -
svx/inc/svx/ctredlin.hxx | 14 -
svx/inc/svx/cube3d.hxx | 18 +-
svx/inc/svx/def3d.hxx | 2
svx/inc/svx/deflt3d.hxx | 28 +--
svx/inc/svx/dialogs.hrc | 113 +++++--------
svx/inc/svx/dlgctl3d.hxx | 14 -
svx/inc/svx/dlgctrl.hxx | 23 +-
svx/inc/svx/dstribut_enum.hxx | 4
svx/inc/svx/e3dundo.hxx | 6
svx/inc/svx/extrud3d.hxx | 5
svx/inc/svx/f3dchild.hxx | 2
svx/inc/svx/fillctrl.hxx | 2
svx/inc/svx/float3d.hxx | 22 +-
svx/inc/svx/fmdpage.hxx | 12 -
svx/inc/svx/fmglob.hxx | 2
svx/inc/svx/fmpage.hxx | 4
svx/inc/svx/fmsearch.hxx | 16 -
svx/inc/svx/fmshell.hxx | 13 -
svx/inc/svx/fmtools.hxx | 14 -
svx/inc/svx/fntctrl.hxx | 2
svx/inc/svx/fontwork.hxx | 6
svx/inc/svx/galmisc.hxx | 14 -
svx/inc/svx/graphctl.hxx | 18 --
svx/inc/svx/grfcrop.hxx | 2
svx/inc/svx/gridctrl.hxx | 114 +++++++-------
svx/inc/svx/ipolypolygoneditorcontroller.hxx | 24 +-
svx/inc/svx/itemwin.hxx | 2
svx/inc/svx/langbox.hxx | 4
svx/inc/svx/lathe3d.hxx | 16 -
svx/inc/svx/msdffdef.hxx | 10 -
svx/inc/svx/numfmtsh.hxx | 9 -
svx/inc/svx/numinf.hxx | 3
svx/inc/svx/obj3d.hxx | 62 +++----
svx/inc/svx/pageitem.hxx | 38 +---
svx/inc/svx/paraprev.hxx | 10 -
svx/inc/svx/polygn3d.hxx | 2
svx/inc/svx/polysc3d.hxx | 2
svx/inc/svx/ruler.hxx | 56 +++---
svx/inc/svx/scene3d.hxx | 18 --
svx/inc/svx/sdmetitm.hxx | 4
svx/inc/svx/sdooitm.hxx | 4
svx/inc/svx/sdprcitm.hxx | 4
svx/inc/svx/sdrobjectfilter.hxx | 3
svx/inc/svx/sdrpagewindow.hxx | 1
svx/inc/svx/sdshcitm.hxx | 1
svx/inc/svx/sdtacitm.hxx | 2
svx/inc/svx/sdtaditm.hxx | 2
svx/inc/svx/sdtaitm.hxx | 23 +-
svx/inc/svxempty.hxx | 1
svx/inc/svxerr.hxx | 5
svx/inc/swframeposstrings.hxx | 4
svx/inc/swframevalidation.hxx | 8
svx/inc/tbxctl.hxx | 2
svx/inc/verttexttbxctrl.hxx | 10 -
svx/inc/xexch.hxx | 3
svx/inc/xpolyimp.hxx | 19 --
svx/source/engine3d/float3d.cxx | 12 -
88 files changed, 571 insertions(+), 779 deletions(-)
New commits:
commit 3771cba650090d852ca5d948045307d561624f87
Author: Wolfgang Silbermayr <wolfgang.silbermayr at gmail.com>
Date: Thu Oct 21 10:32:34 2010 +0100
Translate comments into English
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/float3d.hrc b/svx/inc/float3d.hrc
index aa1c142..472cd24 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -106,7 +106,7 @@
#define FT_AMBIENTLIGHT 80
#define FL_LIGHT 81
-// Texturen
+// Textures
#define FT_TEX_KIND 90
#define BTN_TEX_LUMINANCE 91
#define BTN_TEX_COLOR 92
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..a5779b7 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/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..ff371f3 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,22 +981,6 @@
#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 )
@@ -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..b57e9e0 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;
@@ -147,7 +147,7 @@ private:
FixedLine aFLLight;
-// Texturen
+// Textures
FixedText aFtTexKind;
ImageButton aBtnTexLuminance;
ImageButton aBtnTexColor;
@@ -167,8 +167,8 @@ private:
ImageButton aBtnTexFilter;
FixedLine aFLTexture;
-// Material
-// Materialeditor
+// material
+// material editor
FixedText aFtMatFavorites;
ListBox aLbMatFavorites;
FixedText aFtMatColor;
@@ -185,21 +185,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 +268,7 @@ public:
/*************************************************************************
|*
-|* ControllerItem fuer 3D-Window (Floating/Docking)
+|* Controller item for 3D Window (Floating/Docking)
|*
\************************************************************************/
@@ -286,7 +286,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; }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list