include/svx/svddef.hxx | 36 ++--
include/svx/svddrag.hxx | 23 +--
include/svx/svdmark.hxx | 24 +--
include/svx/svdoole2.hxx | 14 -
include/svx/svdundo.hxx | 345 ++++++++++++++++++-----------------------------
include/svx/unoapi.hxx | 52 +++----
include/svx/unopage.hxx | 23 +--
include/svx/unoprov.hxx | 32 ++--
include/svx/view3d.hxx | 51 +++---
9 files changed, 259 insertions(+), 341 deletions(-)
New commits:
commit 51f9af747fce6f46df4422677943dae73f839876
Author: Philipp Weissenbacher <p.weissenbac...@gmail.com>
Date: Wed Jul 31 22:21:55 2013 +0200
Translate German comments, fix some WS
Conflicts:
include/svx/unoapi.hxx
Change-Id: Icd0adbe98727a83fae3822863f7c6395f7474882
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index af70697..dc6c351 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -24,24 +24,24 @@
/*************************************************************************/
// SdrItemPool V2, 09-11-1995:
-// 7 neue Items fuer XLineAttrSetItem
-// 7 neue Items fuer XFillAttrSetItem
-// 8 neue Items fuer SdrShadowSetItem
-// 5 neue Items fuer SdrCaptionSetItem
-// 25 neue Items fuer SdrMiscSetItem
-// 6 neue Items fuer SdrNotPersist
+// 7 new Items for XLineAttrSetItem
+// 7 new Items for XFillAttrSetItem
+// 8 new Items for SdrShadowSetItem
+// 5 new Items for SdrCaptionSetItem
+// 25 new Items for SdrMiscSetItem
+// 6 new Items for SdrNotPersist
// SdrItemPool V3, 29-02-1996
-// 17 neue Items fuer XFillAttrSetItem (Bitmapfuellungen) (von KA)
+// 17 new Items for XFillAttrSetItem (Bitmapfill)
// SdrItemPool V4, 10-08-1996
-// 45 neue Items fuer Edge und Measure (Verbinder und Bemassungsobjekt)
(von Joe)
+// 45 new Items for Edge and Measure (Connector and Measuring object)
// SdrItemPool V4+, 18-10-1996
-// 8 neue Items fuer CircItems
-// 18 neue Items fuer NotPersist+Umbau dort
+// 8 new Items for CircItems
+// 18 new Items for NotPersist + Refactoring there
// SdrItemPool V4++, 13-11-1996
-// 2 neue Items fuer NotPersist+(MoveX/Y)
+// 2 new Items for NotPersist+(MoveX/Y)
// SdrItemPool V4+++, 07-06-1999
-// 15 neue Items fuer NotPersist (Reserve)
-// 15 neue Items fuer GrafItems
+// 15 new Items for NotPersist (Reserve)
+// 15 new Items for GrafItems
//
// WhichMapping:
// V1 Range = 1000..1065 (66)
@@ -50,7 +50,7 @@
// V4 Range = 1000..1185 (186) (45 neue Whiches)
// Map V2: 10 6 20 4 11 6
9
// V1: 1000..1009, 1010..1015, 1016..1035, 1036..1039, 1040..1050,
1051..1056 1057..1065
-// V2: 1000..1009, 1017..1022, 1030..1049, 1050..1053, 1062..1072,
1078..1083, 1109..1117, und hinten noch 6 neue dran
+// V2: 1000..1009, 1017..1022, 1030..1049, 1050..1053, 1062..1072,
1078..1083, 1109..1117, and 6 new ones appended at the end
// |<------------ XOut ------------>| |<----------- SvDraw
----------->
// Map V3:
// V2: 1000..1029, 1030..1123
@@ -145,10 +145,10 @@
#define SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13) /* 1160
*/ /* Pool V4 */
#define SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14) /* 1161
*/ /* Pool V4 */
#define SDRATTR_MEASUREFORMATSTRING (SDRATTR_MEASURE_FIRST+15) /* 1162
*/ /* Pool V4 */
-#define SDRATTR_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16) /* 1163
*/ /* Pool V4, Nachtrag 25-9-1996 */
-#define SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17) /* 1164
*/ /* Pool V4, Nachtrag 25-9-1996 */
-#define SDRATTR_MEASURETEXTISFIXEDANGLE (SDRATTR_MEASURE_FIRST+18) /* 1165
*/ /* Pool V4, Nachtrag 25-9-1996 */
-#define SDRATTR_MEASURETEXTFIXEDANGLE (SDRATTR_MEASURE_FIRST+19) /* 1166
*/ /* Pool V4, Nachtrag 25-9-1996 */
+#define SDRATTR_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16) /* 1163
*/ /* Pool V4, Correction 25-9-1996 */
+#define SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17) /* 1164
*/ /* Pool V4, Correction 25-9-1996 */
+#define SDRATTR_MEASURETEXTISFIXEDANGLE (SDRATTR_MEASURE_FIRST+18) /* 1165
*/ /* Pool V4, Correction 25-9-1996 */
+#define SDRATTR_MEASURETEXTFIXEDANGLE (SDRATTR_MEASURE_FIRST+19) /* 1166
*/ /* Pool V4, Correction 25-9-1996 */
#define SDRATTR_MEASUREDECIMALPLACES (SDRATTR_MEASURE_FIRST+20) /* 1167
*/ /* Pool V4 */
#define SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES) /*
1170 */ /* Pool V4 */
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index a5236e1..82e3f11 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -41,19 +41,19 @@ struct SVX_DLLPUBLIC SdrDragStatUserData
class SVX_DLLPUBLIC SdrDragStat {
protected:
- SdrHdl* pHdl; // Der Handle an dem der User zottelt
+ SdrHdl* pHdl; // The Handle for the User
SdrView* pView;
SdrPageView* pPageView;
- std::vector<Point*> aPnts; // Alle bisherigen Punkte: [0]=Start,
[Count()-2]=Prev
- Point aRef1; // Referenzpunkt: Resize-Fixpunkt, (Drehachse,
- Point aRef2; // Spiegelachse, ...)
- Point aPos0; // Position beim letzten Event
- Point aRealPos0; // Position beim letzten Event
- Point aRealNow; // Aktuelle Dragposition ohne Snap, Ortho und Limit
- Point aRealLast; // RealPos des letzten Punkts (fuer MinMoved)
+ std::vector<Point*> aPnts; // All previous Points: [0]=Start,
[Count()-2]=Prev
+ Point aRef1; // Referencepoint: Resize fixed point, (axis of
rotation,
+ Point aRef2; // axis of reflection, ...)
+ Point aPos0; // Position at the last Event
+ Point aRealPos0; // Position at the last Event
+ Point aRealNow; // Current dragging position without Snap, Ortho and
Limit
+ Point aRealLast; // RealPos of the last Point (for MinMoved)
Rectangle aActionRect;
- // Reserve fuer kompatible Erweiterungen, die sonst inkompatibel wuerden.
+ // Backup for compatible extensions which otherwise would become
incompatible
Point aReservePoint1;
Point aReservePoint2;
Point aReservePoint3;
@@ -139,8 +139,7 @@ public:
bool IsNoSnap() const { return bWantNoSnap; }
void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; }
- // And here the Obj say which Ortho (if there is one)
- // can be usefully applied to him.
+ // And here the Obj say which Ortho (if there is one) can be usefully
applied to him.
// Ortho4 means Ortho in four directions (for Rect and CIRT)
bool IsOrtho4Possible() const { return bOrtho4; }
void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; }
@@ -175,7 +174,7 @@ public:
const Rectangle& GetActionRect() const { return aActionRect; }
void SetActionRect(const Rectangle& rR) { aActionRect=rR; }
- // also considering 1stPointAsCenter
+ // Also considering 1stPointAsCenter
void TakeCreateRect(Rectangle& rRect) const;
};
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index d8058fb..09b4bfa 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -37,25 +37,25 @@ class SdrPageView;
typedef std::set<sal_uInt16> SdrUShortCont;
-// Alles was eine View ueber ein markiertes Objekt wissen muss
+// Everything a View needs to know about a selected object
class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser
{
protected:
- SdrObject* mpSelectedSdrObject;
// the seleceted object
+ SdrObject* mpSelectedSdrObject;
// the selected object
SdrPageView* mpPageView;
- SdrUShortCont* mpPoints; //
Markierte Punkte
- SdrUShortCont* mpLines; //
Markierte Linienabschnitte
- SdrUShortCont* mpGluePoints; //
Markierte Klebepunkte (deren Id's)
- sal_Bool mbCon1; // fuer
Connectoren
- sal_Bool mbCon2; // fuer
Connectoren
- sal_uInt16 mnUser; // z.B.
fuer CopyObjects, mitkopieren von Edges
+ SdrUShortCont* mpPoints; //
Selected Points
+ SdrUShortCont* mpLines; //
Selected Line
+ SdrUShortCont* mpGluePoints; //
Selected Gluepoints (their Id's)
+ sal_Bool mbCon1; // for
Connectors
+ sal_Bool mbCon2; // for
Connectors
+ sal_uInt16 mnUser; // E.g.
for CopyObjects, also copy Edges
public:
explicit SdrMark(SdrObject* pNewObj = 0L, SdrPageView* pNewPageView = 0L);
SdrMark(const SdrMark& rMark);
virtual ~SdrMark();
- // derived from ObjectUser
+ // Derived from ObjectUser
virtual void ObjectInDestruction(const SdrObject& rObject);
SdrMark& operator=(const SdrMark& rMark);
@@ -233,8 +233,8 @@ public:
mbGluePointNameOk = sal_False;
}
- // Eine verbale Beschreibung der markierten Objekte z.B.:
- // "27 Linien", "12 Objekte", "Polygon" oder auch "Kein Objekt"
+ // A verbal description of selected objects e.g.:
+ // "27 Lines", "12 Objects", "Polygon" or even "Not an object"
const String& GetMarkDescription() const;
const String& GetPointMarkDescription() const
{
@@ -246,7 +246,7 @@ public:
return GetPointMarkDescription(sal_True);
}
- // pPage=0L: Die Markierungen aller! Seiten beruecksichtigen
+ // pPage=0L: Selection of everything! Respect Pages
sal_Bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const;
sal_Bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const;
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index e1ecb96..3f3b3d4 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -62,7 +62,7 @@ protected:
Graphic* pGraphic;
String aProgName;
- // wg. Kompatibilitaet erstmal am SdrTextObj
+ // Due to compatibility at SdrTextObj for now
bool bFrame:1;
bool bInDestruction:1;
// #i118524#
@@ -94,13 +94,13 @@ public:
bool isUiActive() const;
void SetAspect( sal_Int64 nAspect );
- // Ein OLE-Zeichenobjekt kann eine StarView-Grafik beinhalten.
- // Diese wird angezeigt, wenn das OLE-Objekt leer ist.
+ // An OLE graphic object can contain a StarView graphic,
+ // which will be displayed if the OLE object is empty.
void SetGraphic(const Graphic* pGrf);
- const Graphic* GetGraphic() const;
+ const Graphic* GetGraphic() const;
void GetNewReplacement();
- // the original size of the object ( size of the icon for iconified object
)
+ // The original size of the object (size of the icon for iconified object)
// no conversion is done if no target mode is provided
Size GetOrigObjSize( MapMode* pTargetMapMode = NULL ) const;
@@ -113,8 +113,8 @@ public:
String GetPersistName() const;
void SetPersistName( const String& rPersistName );
- // Einem SdrOle2Obj kann man ein Applikationsnamen verpassen, den man
- // spaeter wieder abfragen kann (SD braucht das fuer
Praesentationsobjekte).
+ // One can add an application name to a SdrOle2Obj, which can be queried
for
+ // later on (SD needs this for presentation objects).
void SetProgName(const String& rNam) { aProgName=rNam; }
const String& GetProgName() const { return aProgName; }
bool IsEmpty() const;
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index f065394..d7c62e54 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -41,12 +41,9 @@ class SdrLayerAdmin;
class SdrObjGeoData;
class OutlinerParaObject;
-//************************************************************
-// SdrUndoAction
-//
-// Abstrakte Basisklasse fuer alle UndoActions der DrawingEngine
-//
-//************************************************************
+/**
+ * Abstract base class (ABC) for all UndoActions of DrawingEngine
+ */
class SVX_DLLPUBLIC SdrUndoAction : public SfxUndoAction
{
@@ -72,22 +69,19 @@ public:
virtual void SdrRepeat(SdrView& rView);
};
-//************************************************************
-// SdrUndoGroup
-//
-// Zusammenfassung beliebig vieler einzelner UndoActions zu einer einzigen
-// UndoAction. Beim Undo() werden die Einzelactions rueckwaets aufgerufen
-// (die zuletzt angehaengte zuerst...), beim Redo() dagegen entspricht die
-// Aufrufreihenfolge der Einfuegereihenfolge.
-//
-//************************************************************
+/**
+ * Aggregation of arbitrarily many UndoActions to a single UndoAction.
+ * Undo() executes the single UndoActions backwards (LIFO, first the last
+ * ones attached), Redo() executes the UndoActions in the order they were
+ * added (FIFO).
+ */
class SVX_DLLPUBLIC SdrUndoGroup : public SdrUndoAction
{
protected:
std::vector<SdrUndoAction*> aBuf;
- // Beschreibung der Action, nicht expandiert (beinhaltet %O)
+ // No expanded description of the Action (contains %O)
OUString aComment;
OUString aObjDescription;
@@ -116,12 +110,9 @@ public:
SdrRepeatFunc GetRepeatFunction() const { return eFunction; }
};
-//************************************************************
-// SdrUndoObj
-//
-// Abstrakte Basisklasse fuer alle UndoActions die mit Objekten zu tun haben.
-//
-//************************************************************
+/**
+ * Abstract base class for all UndoActions that handle objects.
+ */
class SVX_DLLPUBLIC SdrUndoObj : public SdrUndoAction
{
@@ -139,14 +130,11 @@ protected:
void ImpShowPageOfThisObject();
};
-//************************************************************
-// SdrUndoAttrObj
-//
-// Aenderung der Objektattribute.
-// Action direkt vor dem Setzen der neuen Attribute konstruieren.
-// Auch fuer StyleSheets
-//
-//************************************************************
+/**
+ * Changing the object attributes.
+ * Create Action right before setting the new attributes.
+ * Also for StyleSheets.
+ */
class SVX_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj
{
@@ -155,22 +143,22 @@ protected:
SfxItemSet* pRedoSet;
SfxItemSet* pRepeatSet;
- // oder besser den StyleSheetNamen merken?
+ // FIXME: Or should we better remember the StyleSheetNames?
rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet;
bool bStyleSheet;
bool bHaveToTakeRedoSet;
- // Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text:
+ // When assigning TextItems to a drawing object with text:
OutlinerParaObject* pTextUndo;
// #i8508#
// The text rescue mechanism needs also to be implemented for redo actions.
OutlinerParaObject* pTextRedo;
- // Wenn sich um ein Gruppenobjekt handelt:
+ // If we have a group object:
SdrUndoGroup* pUndoGroup;
- // helper to ensure StyleSheet is in pool (provided by SdrModel from
SdrObject)
+ // Helper to ensure StyleSheet is in pool (provided by SdrModel from
SdrObject)
void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool&
rStyleSheetPool, SfxStyleSheet& rSheet);
public:
@@ -186,18 +174,15 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-//************************************************************
-// SdrUndoMoveObj
-//
-// Blosses verschieben eines Objektes.
-// Action direkt vor dem Verschieben konstruieren.
-//
-//************************************************************
+/**
+ * Only moving of an object.
+ * Create Action right before moving.
+ */
class SVX_DLLPUBLIC SdrUndoMoveObj : public SdrUndoObj
{
protected:
- Size aDistance; // Entfernung, um die
verschoben wird
+ Size aDistance; // Distance by which we move
public:
SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {}
@@ -217,20 +202,17 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-//************************************************************
-// SdrUndoGeoObj
-//
-// Aenderung der Geometrie eines Objektes.
-// Action direkt vor der geometrischen Transformation konstruieren.
-//
-//************************************************************
+/**
+ * Changing the geometry of an object.
+ * Create Action right before the geometric transformation.
+ */
class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
{
protected:
SdrObjGeoData* pUndoGeo;
SdrObjGeoData* pRedoGeo;
- // Wenn sich um ein Gruppenobjekt handelt:
+ // If we have a group object:
SdrUndoGroup* pUndoGroup;
public:
@@ -243,13 +225,10 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoObjList
-//
-// Manipulationen an einer ObjList: Neues Obj, DeleteObj, SetObjZLevel,
Grouping, ...
-// Abstrakte Basisklasse.
-//
-//************************************************************
+/**
+ * Manipulation of an ObjList: New Object, DeleteObj, SetObjZLevel, Grouping,
...
+ * Abstract base class.
+ */
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
class ObjListListener;
@@ -260,11 +239,11 @@ private:
protected:
SdrObjList* pObjList;
- SdrView* pView; // um bei ObjDel, Undo die
- SdrPageView* pPageView; // Selektion widerherstellen zu
koennen
+ SdrView* pView; // To be able to re-create the
selection for a
+ SdrPageView* pPageView; // for a ObjDel, Undo
sal_uInt32 nOrdNum;
- // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
- // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
+ // It's possible that the object is re-assigned during a Undo/Redo.
+ // The object is deleted in the dtor, if bOwner==TRUE
ObjListListener* m_pListener;
protected:
@@ -280,14 +259,12 @@ private:
void SetOrdNum(sal_uInt32 nOrdNum_);
};
-//************************************************************
-// SdrUndoRemoveObj
-//
-// Entfernen Objekts aus einer Objektliste. Innerhalb einer UndoGroup
-// mit korrospondierenden Inserts zu verwenden.
-// Action vor dem entfernen aus der ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Removing an Object from an ObjectList.
+ * To be used with corresponding Inserts within a UndoGroup.
+ *
+ * Create Action before removing from the ObjList.
+ */
class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList
{
@@ -299,14 +276,11 @@ public:
virtual void Redo();
};
-//************************************************************
-// SdrUndoInsertObj
-//
-// Einfuegen Objekts in eine Objektliste. Innerhalb einer UndoGroup
-// mit korrospondierenden Removes zu verwenden.
-// Action vor dem entfernen aus der ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Inserting Objects into a ObjectList.
+ * Use with corresponding Removes within an UndoGroup.
+ * Create Action before removal from ObjList.
+ */
class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList
{
@@ -318,13 +292,10 @@ public:
virtual void Redo();
};
-//************************************************************
-// SdrUndoDelObj
-//
-// Loeschen eines Objekts.
-// Action vor dem entfernen aus der ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Deleting an Object.
+ * Create Action before removing from ObjList.
+ */
class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
{
@@ -342,13 +313,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-//************************************************************
-// SdrUndoNewObj
-//
-// Einfuegen eines neuen Objektes.
-// Action nach dem einfuegen in die ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Inserting a NEW Object.
+ * Create Actio after insertion into the ObjList.
+ */
class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj
{
@@ -364,13 +332,10 @@ public:
static OUString GetComment(const SdrObject& _rForObject);
};
-//************************************************************
-// SdrUndoReplaceObj
-//
-// Austausch eines Objektes.
-// Action vor dem Replace an der ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Replacing an Object.
+ * Create Action before Replace in ObjList.
+ */
class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
{
@@ -396,13 +361,10 @@ public:
void SetOldOwner(bool bNew);
};
-//************************************************************
-// SdrUndoCopyObj
-//
-// Kopieren eines Objekts
-// Action nach dem einfuegen in die ObjList konstruieren.
-//
-//************************************************************
+/**
+ * Copying an Object.
+ * Create Action before inserting into the ObjList.
+ */
class SdrUndoCopyObj : public SdrUndoNewObj
{
@@ -413,10 +375,6 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoObjOrdNum
-//************************************************************
-
class SdrUndoObjOrdNum : public SdrUndoObj
{
protected:
@@ -448,10 +406,6 @@ public:
virtual void Redo();
};
-//************************************************************
-// SdrUndoObjSetText
-//************************************************************
-
class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj
{
protected:
@@ -478,7 +432,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-// Implement Title/Description Elements UI for Writer text frames, graphics
and embedded objects (#i73249#)
+/**
+ * Implement Title/Description Elements UI for Writer
+ * text frames, graphics and embedded objects (#i73249#)
+ */
class SdrUndoObjStrAttr : public SdrUndoObj
{
public:
@@ -511,12 +468,9 @@ public:
* Layer
*/
-//************************************************************
-// SdrUndoLayer
-//
-// Abstrakte Basisklasse fuer alle UndoActions die mit SdrLayer zu tun haben.
-//
-//************************************************************
+/**
+ * Abstract base class for all UndoActions that have something to do with
SdrLayer.
+ */
class SdrUndoLayer : public SdrUndoAction
{
@@ -531,12 +485,10 @@ protected:
virtual ~SdrUndoLayer();
};
-//************************************************************
-// SdrUndoNewLayer
-//
-// Einfuegen eines neuen Layer. Action nach dem Einfuegen konstruieren.
-//
-//************************************************************
+/**
+ * Inserting a new Layer.
+ * Create Action after Insertion.
+ */
class SdrUndoNewLayer : public SdrUndoLayer
{
@@ -550,12 +502,10 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoDelLayer
-//
-// Loeschen eines Layer. Action vor dem Remove konstruieren
-//
-//************************************************************
+/**
+ * Deleting a Layer.
+ * Create Action before the Remove.
+ */
class SdrUndoDelLayer : public SdrUndoLayer
{
@@ -569,12 +519,10 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoMoveLayer
-//
-// Verschieben eines Layer. Action vor dem Verschieben konstruieren.
-//
-//************************************************************
+/**
+ * Moving a Layer.
+ * Create Action before the Move.
+ */
class SdrUndoMoveLayer : public SdrUndoLayer
{
@@ -595,12 +543,9 @@ public:
* Pages
*/
-//************************************************************
-// SdrUndoPage
-//
-// Abstrakte Basisklasse fuer alle UndoActions die mit SdrPages zu tun haben.
-//
-//************************************************************
+/**
+ * ABC for all UndoActions that have something to do with SdrPages.
+ */
class SVX_DLLPUBLIC SdrUndoPage : public SdrUndoAction
{
@@ -618,21 +563,17 @@ protected:
void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr,
sal_uInt16 n=0, bool bRepeat = false) const;
};
-//************************************************************
-// SdrUndoPageList
-//
-// Manipulationen an einer PageList: Neue Page, DeletePage,
MovePage(ChangePageNum)
-// Abstrakte Basisklasse.
-//
-//************************************************************
+/**
+ * ABC for manipulation of a PageList: New Page, DeletePage, MovePage
(ChangePageNum).
+ */
class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
{
protected:
sal_uInt16 nPageNum;
- // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page
- // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE
+ // It's possible that the object is re-assigned during a Undo/Redo.
+ // The Page is deleted in the dtor, if bItsMine==TRUE
bool bItsMine;
protected:
@@ -640,18 +581,15 @@ protected:
virtual ~SdrUndoPageList();
};
-//************************************************************
-// SdrUndoDelPage
-//
-// Loeschen einer Page.
-// Action vor dem entfernen aus der List konstruieren.
-//
-//************************************************************
+/**
+ * Deleting a Page.
+ * Create Action before removing from the List.
+ */
class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
{
- // Beim loeschen einer MasterPage merke ich mir in dieser UndoGroup
- // alle Beziehungen der Zeichenseiten zu der geloeschten MasterPage
+ // When deleting a MasterPage, we remember all relations of the
+ // Character Page with the MasterPage in this UndoGroup.
SdrUndoGroup* pUndoGroup;
public:
@@ -668,13 +606,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-//************************************************************
-// SdrUndoNewPage
-//
-// Einfuegen einer neuen Page.
-// Action nach dem einfuegen in die Liste konstruieren.
-//
-//************************************************************
+/**
+ * Inserting a new Page.
+ * Create Action after inserting into the List.
+ */
class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList
{
@@ -687,13 +622,10 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoCopyPage
-//
-// Kopieren einer Page
-// Action nach dem einfuegen in die Liste konstruieren.
-//
-//************************************************************
+/**
+ * Copying a Page.
+ * Create Action after inserting into the List.
+ */
class SdrUndoCopyPage : public SdrUndoNewPage
{
@@ -707,13 +639,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const;
};
-//************************************************************
-// SdrUndoSetPageNum
-//
-// Verschieben der Page innerhalb der Liste
-// Action vor dem Verschieben der Page konstruieren.
-//
-//************************************************************
+/**
+ * Moving a Page within the List.
+ * Create Action before moving the Page.
+ */
class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage
{
@@ -736,13 +665,10 @@ public:
* Masterpages
*/
-//************************************************************
-// SdrUndoPageMasterPage
-//
-// Abstrakte Basisklasse fuer alle UndoActions die mit
-// MasterPage-Beziehungen zu tun haben.
-//
-//************************************************************
+/**
+ * ABC for all UndoActions that have something to do with
+ * MasterPage relationships.
+ */
class SdrUndoPageMasterPage : public SdrUndoPage
{
@@ -758,13 +684,10 @@ public:
SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage();
};
-//************************************************************
-// SdrUndoPageRemoveMasterPage
-//
-// Entfernen einer MasterPage von einer Zeichenseite.
-// Action vor dem Entfernen des MasterPageDescriptors erzeugen.
-//
-//************************************************************
+/**
+ * Removal of a MasterPage from a Character Page.
+ * Create Action before removing the MasterPageDescriptor.
+ */
class SdrUndoPageRemoveMasterPage : public SdrUndoPageMasterPage
{
@@ -777,13 +700,10 @@ public:
virtual OUString GetComment() const;
};
-//************************************************************
-// SdrUndoPageChangeMasterPage
-//
-// Aenderung des MasterPageDescriptors (z.B. Aendern der VisibleLayer).
-// Action vor der Aenderung am MasterPageDescriptor erzeugen.
-//
-//************************************************************
+/**
+ * Changing the MasterPageDescriptor (e.g. change of the VisibleLayer).
+ * Create Action before changing the MasterPageDescriptors.
+ */
class SVX_DLLPUBLIC SdrUndoPageChangeMasterPage : public SdrUndoPageMasterPage
{
@@ -803,14 +723,15 @@ public:
///////////////////////////////////////////////////////////////////////
-/** the SdrUndoFactory can be set and retrieved from the SdrModel.
- It is used by the drawing layer implementations to create undo actions.
- It can be used by applications to create application specific undo actions.
-*/
+/**
+ * The SdrUndoFactory can be set and retrieved from the SdrModel.
+ * It is used by the drawing layer implementations to create undo actions.
+ * It can be used by applications to create application specific undo actions.
+ */
class SVX_DLLPUBLIC SdrUndoFactory
{
public:
- // shapes
+ // Shapes
virtual ~SdrUndoFactory();
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject );
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const
Size& rDist );
@@ -834,18 +755,18 @@ public:
String sOldStr,
String sNewStr );
- // layer
+ // Layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoDeleteLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
- // page
+ // Page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16
nOldPageNum1, sal_uInt16 nNewPageNum1);
- // master page
+ // Master page
virtual SdrUndoAction* CreateUndoPageRemoveMasterPage(SdrPage&
rChangedPage);
virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage&
rChangedPage);
};
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 71799c6..e43ecc1 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -35,51 +35,57 @@ class SvxNumBulletItem;
class SfxItemPool;
class String;
-/** creates a StarOffice API wrapper with the given type and inventor
- Deprecated: This will be replaced with a function returning XShape.
-*/
+/**
+ * Creates a StarOffice API wrapper with the given type and inventor
+ * Deprecated: This will be replaced with a function returning XShape.
+ */
SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor( sal_uInt16 nType,
sal_uInt32 nInventor ) throw();
-/** returns a StarOffice API wrapper for the given SdrObject */
+/** Returns a StarOffice API wrapper for the given SdrObject */
SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj )
throw ();
-/** returns the SdrObject from the given StarOffice API wrapper */
+/** Returns the SdrObject from the given StarOffice API wrapper */
SVX_DLLPUBLIC SdrObject* GetSdrObjectFromXShape(
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape )
throw() ;
-/** returns a StarOffice API wrapper for the given SdrPage */
+/** Returns a StarOffice API wrapper for the given SdrPage */
SVX_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage )
throw ();
-/** returns the SdrPage from the given StarOffice API wrapper */
+/** Returns the SdrPage from the given StarOffice API wrapper */
SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage(
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
xDrawPage ) throw() ;
-/** returns the SvxNumBulletItem with the given name from the pool or a null
if there is no item
- with that name
-*/
+/**
+ * Returns the SvxNumBulletItem with the given name from the pool or a null if
there is no item with that name
+ */
SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const
OUString& aName ) throw();
-/** maps the vcl MapUnit enum to a API constant MeasureUnit.
- Returns false if conversion is not supported.
-*/
+/**
+ * Maps the vcl MapUnit enum to a API constant MeasureUnit.
+ * Returns false if conversion is not supported.
+ */
SVX_DLLPUBLIC sal_Bool SvxMapUnitToMeasureUnit( const short nVcl, short& eApi
) throw();
-/** maps the API constant MeasureUnit to a vcl MapUnit enum.
- Returns false if conversion is not supported.
-*/
+/**
+ * Maps the API constant MeasureUnit to a vcl MapUnit enum.
+ * Returns false if conversion is not supported.
+ */
SVX_DLLPUBLIC sal_Bool SvxMeasureUnitToFieldUnit( const short eApi, short&
nVcl ) throw();
-/** maps the vcl MapUnit enum to a API constant MeasureUnit.
- Returns false if conversion is not supported.
-*/
+/**
+ * Maps the vcl MapUnit enum to a API constant MeasureUnit.
+ * Returns false if conversion is not supported.
+ */
SVX_DLLPUBLIC sal_Bool SvxFieldUnitToMeasureUnit( const short nVcl, short&
eApi ) throw();
-/** if the given name is a predefined name for the current language it is
replaced by
- the corresponding api name.
+/**
+ * If the given name is a predefined name for the current language it is
replaced by
+ * the corresponding API name.
*/
SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString&
rInternalName) throw();
-/** if the given name is a predefined api name it is replaced by the
predefined name
- for the current language.
+/**
+ * If the given name is a predefined API name it is replaced by the predefined
name
+ * for the current language.
*/
SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString&
rApiName) throw();
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 68150af..40684a4 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -49,15 +49,12 @@ class SvxShape;
class SvxShapeGroup;
class SvxShapeConnector;
-/***********************************************************************
-* Macros fuer Umrechnung Twips<->100tel mm *
-***********************************************************************/
+/**
+* Macros to convert Twips<->100tel mm
+*/
#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
-/***********************************************************************
-* *
-***********************************************************************/
class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5<
::com::sun::star::drawing::XDrawPage,
::com::sun::star::drawing::XShapeGrouper,
::com::sun::star::lang::XServiceInfo,
@@ -86,22 +83,20 @@ class SVX_DLLPUBLIC SvxDrawPage : public
::cppu::WeakAggImplHelper5< ::com::sun:
SdrPage* GetSdrPage() const { return mpPage; }
void ChangeModel( SdrModel* pNewModel );
- // Erzeugen eines SdrObjects und Einfugen in die SdrPage
+ // Creation of a SdrObject and insertion into the SdrPage
SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape ) throw();
- // Typ und Inventor bestimmen
+ // Determine Type and Inventor
void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const
OUString& aName ) const throw();
- // Erzeugen eines SdrObjects anhand einer Description. Kann von
- // abgeleiteten Klassen dazu benutzt werden, eigene Shapes zu
- // unterstuetzen (z.B. Controls)
+ // Creating a SdrObject using it's Description.
+ // Can be used by derived classes to support their owen Shapes (e.g.
Controls).
virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
throw();
static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType,
sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL )
throw();
- // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt
- // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder
- // ein ein SvxShape aggregierenden Objekt anlegen.
+ // The following method is called if a SvxShape object is to be created.
+ // Derived classes can create a derivation or an SvxShape aggregating
object.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
throw();
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 0414e12..3674593 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -28,9 +28,9 @@
class SvxItemPropertySet;
class SfxItemPool;
-/***********************************************************************
-* class UHashMap *
-***********************************************************************/
+/**
+ * class UHashMap
+ */
#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0)
class UHashMap
@@ -42,9 +42,9 @@ public:
static ::com::sun::star::uno::Sequence< OUString > getServiceNames();
};
-/***********************************************************************
-* Soriterer *
-***********************************************************************/
+/**
+ * Sorter
+ */
#define SVXMAP_SHAPE 0
#define SVXMAP_CONNECTOR 1
@@ -73,9 +73,11 @@ public:
#define SVXMAP_TABLE 24
#define SVXMAP_PAGE 25
#define SVXMAP_END 26 // last+1 !
-/***********************************************************************
-* SvxUnoPropertyMapProvider *
-***********************************************************************/
+
+/**
+ * SvxUnoPropertyMapProvider
+ */
+
class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
{
SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
@@ -87,9 +89,9 @@ public:
const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId,
SfxItemPool& rPool);
};
-/***********************************************************************
-* Globals *
-***********************************************************************/
+/**
+ * Globals
+ */
const sal_Int16 OBJ_OLE2_APPLET = 100;
const sal_Int16 OBJ_OLE2_PLUGIN = 101;
@@ -98,9 +100,9 @@ const sal_Int16 OBJ_OLE2_PLUGIN = 101;
#include <editeng/unoipset.hxx>
-/***********************************************************************
-* class SvxPropertySetInfoPool *
-***********************************************************************/
+/**
+ * class SvxPropertySetInfoPool
+ */
const sal_Int32 SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS = 0;
const sal_Int32 SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER = 1;
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 7f4d523..70da2bc 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -26,39 +26,37 @@
#include <basegfx/point/b2dpoint.hxx>
#include "svx/svxdllapi.h"
-//************************************************************
-// Vorausdeklarationen
-//************************************************************
+/*
+ * Forward declarations
+ */
class E3dObject;
class E3dScene;
class Impl3DMirrorConstructOverlay;
-/*************************************************************************
-|*
-|* Ableitung von SdrView zur Bearbeitung von 3D-Objekten
-|*
-\************************************************************************/
+/**
+ * Derived class of SdrView to edit 3D objects.
+ */
class SVX_DLLPUBLIC E3dView : public SdrView
{
protected:
E3dDefaultAttributes a3DDefaultAttr;
- MouseEvent aMouseEvent; // Die
Parameter der letzten Events (Mouse, Keyboard)
- Color aDefaultLightColor; // dito mit
den Farben
+ MouseEvent aMouseEvent; // The
parameters of the last Events (Mouse, Keyboard)
+ Color aDefaultLightColor; // The
paramaters for the last colors
Color aDefaultAmbientColor;
- double fDefaultScaleX; // Verzerrungen
+ double fDefaultScaleX; // Scaling
double fDefaultScaleY;
double fDefaultScaleZ;
- double fDefaultRotateX; // und
Drehungen
+ double fDefaultRotateX; // and Rotation
double fDefaultRotateY;
double fDefaultRotateZ;
- double fDefaultExtrusionDeepth; //
Extrusionstiefe
- double fDefaultLightIntensity; //
Intensitaeten der beiden (notwendigen) Licht-
- double fDefaultAmbientIntensity; // quellen
- long nHDefaultSegments; // wieviele
HSegmente braucht mein Lathe-Ojekt
- long nVDefaultSegments; // wieviele
VSegmente braucht mein Lathe-Ojekt
+ double fDefaultExtrusionDeepth; // Extrusion
depth
+ double fDefaultLightIntensity; // Intensity
of the two (necessary) light sources.
+ double fDefaultAmbientIntensity;
+ long nHDefaultSegments; // Amount of
HSegments required by the Lathe object
+ long nVDefaultSegments; // Amount of
VSegments required by the Lathe object
E3dDragConstraint eDragConstraint;
@@ -83,24 +81,22 @@ public:
E3dView(SdrModel* pModel, OutputDevice* pOut = 0L);
virtual ~E3dView();
- // Alle markierten Objekte auf dem angegebenen OutputDevice ausgeben.
+ // Output all marked Objects on the given OutputDevice.
virtual void DrawMarkedObj(OutputDevice& rOut) const;
- // Zugriff auf die Default-Attribute
+ // Access to the default attributes.
E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL,
SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
virtual void CheckPossibilities();
- // Event setzen/rausruecken
+ // Get/Set Event
void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; }
const MouseEvent& GetMouseEvent() { return aMouseEvent; }
- // Model holen ueberladen, da bei einzelnen 3D Objekten noch eine Szene
- // untergeschoben werden muss
+ // Override getting the model, as we need to supply a Scene together with
individual 3D Objects.
virtual SdrModel* GetMarkedObjModel() const;
- // Bei Paste muss - falls in eine Scene eingefuegt wird - die
- // Objekte der Szene eingefuegt werden, die Szene selbst aber nicht
+ // On Paste: We need to insert the objects of the Scene, but not the Scene
itself
using SdrView::Paste;
virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos,
SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
@@ -110,14 +106,13 @@ public:
bool IsConvertTo3DObjPossible() const;
void ConvertMarkedObjTo3D(bool bExtrude=true, basegfx::B2DPoint aPnt1 =
basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0,
1.0));
- // Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer
- // bestimmten Tiefensortierung anzulegen
+ // Means to create all Extrudes in a certain depth order.
void DoDepthArrange(E3dScene* pScene, double fDepth);
void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation();
- // migration of overlay
+ // Migration of overlay
bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
virtual void MovAction(const Point& rPnt);
@@ -261,6 +256,6 @@ public:
void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL,
sal_Bool bOnly3DAttr=sal_False);
};
-#endif // _E3D_VIEW3D_HXX
+#endif // _E3D_VIEW3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
