mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Translate German comments, fix some WS

Browse Source 
Conflicts:
	include/svx/unoapi.hxx

Change-Id: Icd0adbe98727a83fae3822863f7c6395f7474882
This commit is contained in:
Philipp Weissenbacher
2013-07-31 22:21:55 +02:00
committed by Miklos Vajna
parent 389bdc1624
commit 51f9af747f
9 changed files with 259 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/svx/svddef.hxx
View File

@@ -24,24 +24,24 @@
/*************************************************************************/ /*************************************************************************/
// SdrItemPool V2, 09-11-1995: // SdrItemPool V2, 09-11-1995:
// 7 neue Items fuer XLineAttrSetItem // 7 new Items for XLineAttrSetItem
// 7 neue Items fuer XFillAttrSetItem // 7 new Items for XFillAttrSetItem
// 8 neue Items fuer SdrShadowSetItem // 8 new Items for SdrShadowSetItem
// 5 neue Items fuer SdrCaptionSetItem // 5 new Items for SdrCaptionSetItem
// 25 neue Items fuer SdrMiscSetItem // 25 new Items for SdrMiscSetItem
// 6 neue Items fuer SdrNotPersist // 6 new Items for SdrNotPersist
// SdrItemPool V3, 29-02-1996 // SdrItemPool V3, 29-02-1996
// 17 neue Items fuer XFillAttrSetItem (Bitmapfuellungen) (von KA) // 17 new Items for XFillAttrSetItem (Bitmapfill)
// SdrItemPool V4, 10-08-1996 // 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 // SdrItemPool V4+, 18-10-1996
// 8 neue Items fuer CircItems // 8 new Items for CircItems
// 18 neue Items fuer NotPersist+Umbau dort // 18 new Items for NotPersist + Refactoring there
// SdrItemPool V4++, 13-11-1996 // SdrItemPool V4++, 13-11-1996
// 2 neue Items fuer NotPersist+(MoveX/Y) // 2 new Items for NotPersist+(MoveX/Y)
// SdrItemPool V4+++, 07-06-1999 // SdrItemPool V4+++, 07-06-1999
// 15 neue Items fuer NotPersist (Reserve) // 15 new Items for NotPersist (Reserve)
// 15 neue Items fuer GrafItems // 15 new Items for GrafItems
// //
// WhichMapping: // WhichMapping:
// V1 Range = 1000..1065 (66) // V1 Range = 1000..1065 (66)
@@ -50,7 +50,7 @@
// V4 Range = 1000..1185 (186) (45 neue Whiches) // V4 Range = 1000..1185 (186) (45 neue Whiches)
// Map V2: 10 6 20 4 11 6 9 // Map V2: 10 6 20 4 11 6 9
// V1: 1000..1009, 1010..1015, 1016..1035, 1036..1039, 1040..1050, 1051..1056 1057..1065 // 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 -----------> // |<------------ XOut ------------>| |<----------- SvDraw ----------->
// Map V3: // Map V3:
// V2: 1000..1029, 1030..1123 // V2: 1000..1029, 1030..1123
@@ -145,10 +145,10 @@
#define SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13) /* 1160 */ /* Pool V4 */ #define SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13) /* 1160 */ /* Pool V4 */
#define SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14) /* 1161 */ /* Pool V4 */ #define SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14) /* 1161 */ /* Pool V4 */
#define SDRATTR_MEASUREFORMATSTRING (SDRATTR_MEASURE_FIRST+15) /* 1162 */ /* 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_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16) /* 1163 */ /* Pool V4, Correction 25-9-1996 */
#define SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17) /* 1164 */ /* Pool V4, Nachtrag 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, Nachtrag 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, Nachtrag 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_MEASUREDECIMALPLACES (SDRATTR_MEASURE_FIRST+20) /* 1167 */ /* Pool V4 */
#define SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES) /* 1170 */ /* Pool V4 */ #define SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES) /* 1170 */ /* Pool V4 */

23
include/svx/svddrag.hxx
View File

@@ -41,19 +41,19 @@ struct SVX_DLLPUBLIC SdrDragStatUserData
class SVX_DLLPUBLIC SdrDragStat { class SVX_DLLPUBLIC SdrDragStat {
protected: protected:
SdrHdl* pHdl; // Der Handle an dem der User zottelt SdrHdl* pHdl; // The Handle for the User
SdrView* pView; SdrView* pView;
SdrPageView* pPageView; SdrPageView* pPageView;
std::vector<Point*> aPnts; // Alle bisherigen Punkte: [0]=Start, [Count()-2]=Prev std::vector<Point*> aPnts; // All previous Points: [0]=Start, [Count()-2]=Prev
Point aRef1; // Referenzpunkt: Resize-Fixpunkt, (Drehachse, Point aRef1; // Referencepoint: Resize fixed point, (axis of rotation,
Point aRef2; // Spiegelachse, ...) Point aRef2; // axis of reflection, ...)
Point aPos0; // Position beim letzten Event Point aPos0; // Position at the last Event
Point aRealPos0; // Position beim letzten Event Point aRealPos0; // Position at the last Event
Point aRealNow; // Aktuelle Dragposition ohne Snap, Ortho und Limit Point aRealNow; // Current dragging position without Snap, Ortho and Limit
Point aRealLast; // RealPos des letzten Punkts (fuer MinMoved) Point aRealLast; // RealPos of the last Point (for MinMoved)
Rectangle aActionRect; Rectangle aActionRect;
// Reserve fuer kompatible Erweiterungen, die sonst inkompatibel wuerden. // Backup for compatible extensions which otherwise would become incompatible
Point aReservePoint1; Point aReservePoint1;
Point aReservePoint2; Point aReservePoint2;
Point aReservePoint3; Point aReservePoint3;
@@ -139,8 +139,7 @@ public:
bool IsNoSnap() const { return bWantNoSnap; } bool IsNoSnap() const { return bWantNoSnap; }
void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; } void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; }
// And here the Obj say which Ortho (if there is one) // And here the Obj say which Ortho (if there is one) can be usefully applied to him.
// can be usefully applied to him.
// Ortho4 means Ortho in four directions (for Rect and CIRT) // Ortho4 means Ortho in four directions (for Rect and CIRT)
bool IsOrtho4Possible() const { return bOrtho4; } bool IsOrtho4Possible() const { return bOrtho4; }
void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; } void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; }
@@ -175,7 +174,7 @@ public:
const Rectangle& GetActionRect() const { return aActionRect; } const Rectangle& GetActionRect() const { return aActionRect; }
void SetActionRect(const Rectangle& rR) { aActionRect=rR; } void SetActionRect(const Rectangle& rR) { aActionRect=rR; }
// also considering 1stPointAsCenter // Also considering 1stPointAsCenter
void TakeCreateRect(Rectangle& rRect) const; void TakeCreateRect(Rectangle& rRect) const;
}; };

24
include/svx/svdmark.hxx
View File

@@ -37,25 +37,25 @@ class SdrPageView;
typedef std::set<sal_uInt16> SdrUShortCont; 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 class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser
{ {
protected: protected:
SdrObject* mpSelectedSdrObject; // the seleceted object SdrObject* mpSelectedSdrObject; // the selected object
SdrPageView* mpPageView; SdrPageView* mpPageView;
SdrUShortCont* mpPoints; // Markierte Punkte SdrUShortCont* mpPoints; // Selected Points
SdrUShortCont* mpLines; // Markierte Linienabschnitte SdrUShortCont* mpLines; // Selected Line
SdrUShortCont* mpGluePoints; // Markierte Klebepunkte (deren Id's) SdrUShortCont* mpGluePoints; // Selected Gluepoints (their Id's)
sal_Bool mbCon1; // fuer Connectoren sal_Bool mbCon1; // for Connectors
sal_Bool mbCon2; // fuer Connectoren sal_Bool mbCon2; // for Connectors
sal_uInt16 mnUser; // z.B. fuer CopyObjects, mitkopieren von Edges sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges
public: public:
explicit SdrMark(SdrObject* pNewObj = 0L, SdrPageView* pNewPageView = 0L); explicit SdrMark(SdrObject* pNewObj = 0L, SdrPageView* pNewPageView = 0L);
SdrMark(const SdrMark& rMark); SdrMark(const SdrMark& rMark);
virtual ~SdrMark(); virtual ~SdrMark();
// derived from ObjectUser // Derived from ObjectUser
virtual void ObjectInDestruction(const SdrObject& rObject); virtual void ObjectInDestruction(const SdrObject& rObject);
SdrMark& operator=(const SdrMark& rMark); SdrMark& operator=(const SdrMark& rMark);
@@ -233,8 +233,8 @@ public:
mbGluePointNameOk = sal_False; mbGluePointNameOk = sal_False;
} }
// Eine verbale Beschreibung der markierten Objekte z.B.: // A verbal description of selected objects e.g.:
// "27 Linien", "12 Objekte", "Polygon" oder auch "Kein Objekt" // "27 Lines", "12 Objects", "Polygon" or even "Not an object"
const String& GetMarkDescription() const; const String& GetMarkDescription() const;
const String& GetPointMarkDescription() const const String& GetPointMarkDescription() const
{ {
@@ -246,7 +246,7 @@ public:
return GetPointMarkDescription(sal_True); 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 TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const;
sal_Bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; sal_Bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const;

14
include/svx/svdoole2.hxx
View File

@@ -62,7 +62,7 @@ protected:
Graphic* pGraphic; Graphic* pGraphic;
String aProgName; String aProgName;
// wg. Kompatibilitaet erstmal am SdrTextObj // Due to compatibility at SdrTextObj for now
bool bFrame:1; bool bFrame:1;
bool bInDestruction:1; bool bInDestruction:1;
// #i118524# // #i118524#
@@ -94,13 +94,13 @@ public:
bool isUiActive() const; bool isUiActive() const;
void SetAspect( sal_Int64 nAspect ); void SetAspect( sal_Int64 nAspect );
// Ein OLE-Zeichenobjekt kann eine StarView-Grafik beinhalten. // An OLE graphic object can contain a StarView graphic,
// Diese wird angezeigt, wenn das OLE-Objekt leer ist. // which will be displayed if the OLE object is empty.
void SetGraphic(const Graphic* pGrf); void SetGraphic(const Graphic* pGrf);
const Graphic* GetGraphic() const; const Graphic* GetGraphic() const;
void GetNewReplacement(); 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 // no conversion is done if no target mode is provided
Size GetOrigObjSize( MapMode* pTargetMapMode = NULL ) const; Size GetOrigObjSize( MapMode* pTargetMapMode = NULL ) const;
@@ -113,8 +113,8 @@ public:
String GetPersistName() const; String GetPersistName() const;
void SetPersistName( const String& rPersistName ); void SetPersistName( const String& rPersistName );
// Einem SdrOle2Obj kann man ein Applikationsnamen verpassen, den man // One can add an application name to a SdrOle2Obj, which can be queried for
// spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte). // later on (SD needs this for presentation objects).
void SetProgName(const String& rNam) { aProgName=rNam; } void SetProgName(const String& rNam) { aProgName=rNam; }
const String& GetProgName() const { return aProgName; } const String& GetProgName() const { return aProgName; }
bool IsEmpty() const; bool IsEmpty() const;

345
include/svx/svdundo.hxx
View File

@@ -41,12 +41,9 @@ class SdrLayerAdmin;
class SdrObjGeoData; class SdrObjGeoData;
class OutlinerParaObject; class OutlinerParaObject;
//************************************************************ /**
// SdrUndoAction * Abstract base class (ABC) for all UndoActions of DrawingEngine
// */
// Abstrakte Basisklasse fuer alle UndoActions der DrawingEngine
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoAction : public SfxUndoAction class SVX_DLLPUBLIC SdrUndoAction : public SfxUndoAction
{ {
@@ -72,22 +69,19 @@ public:
virtual void SdrRepeat(SdrView& rView); virtual void SdrRepeat(SdrView& rView);
}; };
//************************************************************ /**
// SdrUndoGroup * Aggregation of arbitrarily many UndoActions to a single UndoAction.
// * Undo() executes the single UndoActions backwards (LIFO, first the last
// Zusammenfassung beliebig vieler einzelner UndoActions zu einer einzigen * ones attached), Redo() executes the UndoActions in the order they were
// UndoAction. Beim Undo() werden die Einzelactions rueckwaets aufgerufen * added (FIFO).
// (die zuletzt angehaengte zuerst...), beim Redo() dagegen entspricht die */
// Aufrufreihenfolge der Einfuegereihenfolge.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoGroup : public SdrUndoAction class SVX_DLLPUBLIC SdrUndoGroup : public SdrUndoAction
{ {
protected: protected:
std::vector<SdrUndoAction*> aBuf; std::vector<SdrUndoAction*> aBuf;
// Beschreibung der Action, nicht expandiert (beinhaltet %O) // No expanded description of the Action (contains %O)
OUString aComment; OUString aComment;
OUString aObjDescription; OUString aObjDescription;
@@ -116,12 +110,9 @@ public:
SdrRepeatFunc GetRepeatFunction() const { return eFunction; } SdrRepeatFunc GetRepeatFunction() const { return eFunction; }
}; };
//************************************************************ /**
// SdrUndoObj * Abstract base class for all UndoActions that handle objects.
// */
// Abstrakte Basisklasse fuer alle UndoActions die mit Objekten zu tun haben.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoObj : public SdrUndoAction class SVX_DLLPUBLIC SdrUndoObj : public SdrUndoAction
{ {
@@ -139,14 +130,11 @@ protected:
void ImpShowPageOfThisObject(); void ImpShowPageOfThisObject();
}; };
//************************************************************ /**
// SdrUndoAttrObj * Changing the object attributes.
// * Create Action right before setting the new attributes.
// Aenderung der Objektattribute. * Also for StyleSheets.
// Action direkt vor dem Setzen der neuen Attribute konstruieren. */
// Auch fuer StyleSheets
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj class SVX_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj
{ {
@@ -155,22 +143,22 @@ protected:
SfxItemSet* pRedoSet; SfxItemSet* pRedoSet;
SfxItemSet* pRepeatSet; SfxItemSet* pRepeatSet;
// oder besser den StyleSheetNamen merken? // FIXME: Or should we better remember the StyleSheetNames?
rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet; rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet; rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet;
bool bStyleSheet; bool bStyleSheet;
bool bHaveToTakeRedoSet; bool bHaveToTakeRedoSet;
// Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text: // When assigning TextItems to a drawing object with text:
OutlinerParaObject* pTextUndo; OutlinerParaObject* pTextUndo;
// #i8508# // #i8508#
// The text rescue mechanism needs also to be implemented for redo actions. // The text rescue mechanism needs also to be implemented for redo actions.
OutlinerParaObject* pTextRedo; OutlinerParaObject* pTextRedo;
// Wenn sich um ein Gruppenobjekt handelt: // If we have a group object:
SdrUndoGroup* pUndoGroup; 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); void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet);
public: public:
@@ -186,18 +174,15 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const;
}; };
//************************************************************ /**
// SdrUndoMoveObj * Only moving of an object.
// * Create Action right before moving.
// Blosses verschieben eines Objektes. */
// Action direkt vor dem Verschieben konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoMoveObj : public SdrUndoObj class SVX_DLLPUBLIC SdrUndoMoveObj : public SdrUndoObj
{ {
protected: protected:
Size aDistance; // Entfernung, um die verschoben wird Size aDistance; // Distance by which we move
public: public:
SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {} SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {}
@@ -217,20 +202,17 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const;
}; };
//************************************************************ /**
// SdrUndoGeoObj * Changing the geometry of an object.
// * Create Action right before the geometric transformation.
// Aenderung der Geometrie eines Objektes. */
// Action direkt vor der geometrischen Transformation konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
{ {
protected: protected:
SdrObjGeoData* pUndoGeo; SdrObjGeoData* pUndoGeo;
SdrObjGeoData* pRedoGeo; SdrObjGeoData* pRedoGeo;
// Wenn sich um ein Gruppenobjekt handelt: // If we have a group object:
SdrUndoGroup* pUndoGroup; SdrUndoGroup* pUndoGroup;
public: public:
@@ -243,13 +225,10 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************ /**
// SdrUndoObjList * Manipulation of an ObjList: New Object, DeleteObj, SetObjZLevel, Grouping, ...
// * Abstract base class.
// Manipulationen an einer ObjList: Neues Obj, DeleteObj, SetObjZLevel, Grouping, ... */
// Abstrakte Basisklasse.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj { class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
class ObjListListener; class ObjListListener;
@@ -260,11 +239,11 @@ private:
protected: protected:
SdrObjList* pObjList; SdrObjList* pObjList;
SdrView* pView; // um bei ObjDel, Undo die SdrView* pView; // To be able to re-create the selection for a
SdrPageView* pPageView; // Selektion widerherstellen zu koennen SdrPageView* pPageView; // for a ObjDel, Undo
sal_uInt32 nOrdNum; sal_uInt32 nOrdNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes // It's possible that the object is re-assigned during a Undo/Redo.
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE // The object is deleted in the dtor, if bOwner==TRUE
ObjListListener* m_pListener; ObjListListener* m_pListener;
protected: protected:
@@ -280,14 +259,12 @@ private:
void SetOrdNum(sal_uInt32 nOrdNum_); void SetOrdNum(sal_uInt32 nOrdNum_);
}; };
//************************************************************ /**
// SdrUndoRemoveObj * Removing an Object from an ObjectList.
// * To be used with corresponding Inserts within a UndoGroup.
// Entfernen Objekts aus einer Objektliste. Innerhalb einer UndoGroup *
// mit korrospondierenden Inserts zu verwenden. * Create Action before removing from the ObjList.
// Action vor dem entfernen aus der ObjList konstruieren. */
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList
{ {
@@ -299,14 +276,11 @@ public:
virtual void Redo(); virtual void Redo();
}; };
//************************************************************ /**
// SdrUndoInsertObj * Inserting Objects into a ObjectList.
// * Use with corresponding Removes within an UndoGroup.
// Einfuegen Objekts in eine Objektliste. Innerhalb einer UndoGroup * Create Action before removal from ObjList.
// mit korrospondierenden Removes zu verwenden. */
// Action vor dem entfernen aus der ObjList konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList
{ {
@@ -318,13 +292,10 @@ public:
virtual void Redo(); virtual void Redo();
}; };
//************************************************************ /**
// SdrUndoDelObj * Deleting an Object.
// * Create Action before removing from ObjList.
// Loeschen eines Objekts. */
// Action vor dem entfernen aus der ObjList konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
{ {
@@ -342,13 +313,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const;
}; };
//************************************************************ /**
// SdrUndoNewObj * Inserting a NEW Object.
// * Create Actio after insertion into the ObjList.
// Einfuegen eines neuen Objektes. */
// Action nach dem einfuegen in die ObjList konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj
{ {
@@ -364,13 +332,10 @@ public:
static OUString GetComment(const SdrObject& _rForObject); static OUString GetComment(const SdrObject& _rForObject);
}; };
//************************************************************ /**
// SdrUndoReplaceObj * Replacing an Object.
// * Create Action before Replace in ObjList.
// Austausch eines Objektes. */
// Action vor dem Replace an der ObjList konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
{ {
@@ -396,13 +361,10 @@ public:
void SetOldOwner(bool bNew); void SetOldOwner(bool bNew);
}; };
//************************************************************ /**
// SdrUndoCopyObj * Copying an Object.
// * Create Action before inserting into the ObjList.
// Kopieren eines Objekts */
// Action nach dem einfuegen in die ObjList konstruieren.
//
//************************************************************
class SdrUndoCopyObj : public SdrUndoNewObj class SdrUndoCopyObj : public SdrUndoNewObj
{ {
@@ -413,10 +375,6 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************
// SdrUndoObjOrdNum
//************************************************************
class SdrUndoObjOrdNum : public SdrUndoObj class SdrUndoObjOrdNum : public SdrUndoObj
{ {
protected: protected:
@@ -448,10 +406,6 @@ public:
virtual void Redo(); virtual void Redo();
}; };
//************************************************************
// SdrUndoObjSetText
//************************************************************
class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj
{ {
protected: protected:
@@ -478,7 +432,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; 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 class SdrUndoObjStrAttr : public SdrUndoObj
{ {
public: public:
@@ -511,12 +468,9 @@ public:
* Layer * Layer
*/ */
//************************************************************ /**
// SdrUndoLayer * Abstract base class for all UndoActions that have something to do with SdrLayer.
// */
// Abstrakte Basisklasse fuer alle UndoActions die mit SdrLayer zu tun haben.
//
//************************************************************
class SdrUndoLayer : public SdrUndoAction class SdrUndoLayer : public SdrUndoAction
{ {
@@ -531,12 +485,10 @@ protected:
virtual ~SdrUndoLayer(); virtual ~SdrUndoLayer();
}; };
//************************************************************ /**
// SdrUndoNewLayer * Inserting a new Layer.
// * Create Action after Insertion.
// Einfuegen eines neuen Layer. Action nach dem Einfuegen konstruieren. */
//
//************************************************************
class SdrUndoNewLayer : public SdrUndoLayer class SdrUndoNewLayer : public SdrUndoLayer
{ {
@@ -550,12 +502,10 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************ /**
// SdrUndoDelLayer * Deleting a Layer.
// * Create Action before the Remove.
// Loeschen eines Layer. Action vor dem Remove konstruieren */
//
//************************************************************
class SdrUndoDelLayer : public SdrUndoLayer class SdrUndoDelLayer : public SdrUndoLayer
{ {
@@ -569,12 +519,10 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************ /**
// SdrUndoMoveLayer * Moving a Layer.
// * Create Action before the Move.
// Verschieben eines Layer. Action vor dem Verschieben konstruieren. */
//
//************************************************************
class SdrUndoMoveLayer : public SdrUndoLayer class SdrUndoMoveLayer : public SdrUndoLayer
{ {
@@ -595,12 +543,9 @@ public:
* Pages * Pages
*/ */
//************************************************************ /**
// SdrUndoPage * ABC for all UndoActions that have something to do with SdrPages.
// */
// Abstrakte Basisklasse fuer alle UndoActions die mit SdrPages zu tun haben.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoPage : public SdrUndoAction 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; void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const;
}; };
//************************************************************ /**
// SdrUndoPageList * ABC for manipulation of a PageList: New Page, DeletePage, MovePage (ChangePageNum).
// */
// Manipulationen an einer PageList: Neue Page, DeletePage, MovePage(ChangePageNum)
// Abstrakte Basisklasse.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
{ {
protected: protected:
sal_uInt16 nPageNum; sal_uInt16 nPageNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // It's possible that the object is re-assigned during a Undo/Redo.
// statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE // The Page is deleted in the dtor, if bItsMine==TRUE
bool bItsMine; bool bItsMine;
protected: protected:
@@ -640,18 +581,15 @@ protected:
virtual ~SdrUndoPageList(); virtual ~SdrUndoPageList();
}; };
//************************************************************ /**
// SdrUndoDelPage * Deleting a Page.
// * Create Action before removing from the List.
// Loeschen einer Page. */
// Action vor dem entfernen aus der List konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
{ {
// Beim loeschen einer MasterPage merke ich mir in dieser UndoGroup // When deleting a MasterPage, we remember all relations of the
// alle Beziehungen der Zeichenseiten zu der geloeschten MasterPage // Character Page with the MasterPage in this UndoGroup.
SdrUndoGroup* pUndoGroup; SdrUndoGroup* pUndoGroup;
public: public:
@@ -668,13 +606,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const;
}; };
//************************************************************ /**
// SdrUndoNewPage * Inserting a new Page.
// * Create Action after inserting into the List.
// Einfuegen einer neuen Page. */
// Action nach dem einfuegen in die Liste konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList
{ {
@@ -687,13 +622,10 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************ /**
// SdrUndoCopyPage * Copying a Page.
// * Create Action after inserting into the List.
// Kopieren einer Page */
// Action nach dem einfuegen in die Liste konstruieren.
//
//************************************************************
class SdrUndoCopyPage : public SdrUndoNewPage class SdrUndoCopyPage : public SdrUndoNewPage
{ {
@@ -707,13 +639,10 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const;
}; };
//************************************************************ /**
// SdrUndoSetPageNum * Moving a Page within the List.
// * Create Action before moving the Page.
// Verschieben der Page innerhalb der Liste */
// Action vor dem Verschieben der Page konstruieren.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage
{ {
@@ -736,13 +665,10 @@ public:
* Masterpages * Masterpages
*/ */
//************************************************************ /**
// SdrUndoPageMasterPage * ABC for all UndoActions that have something to do with
// * MasterPage relationships.
// Abstrakte Basisklasse fuer alle UndoActions die mit */
// MasterPage-Beziehungen zu tun haben.
//
//************************************************************
class SdrUndoPageMasterPage : public SdrUndoPage class SdrUndoPageMasterPage : public SdrUndoPage
{ {
@@ -758,13 +684,10 @@ public:
SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage(); SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage();
}; };
//************************************************************ /**
// SdrUndoPageRemoveMasterPage * Removal of a MasterPage from a Character Page.
// * Create Action before removing the MasterPageDescriptor.
// Entfernen einer MasterPage von einer Zeichenseite. */
// Action vor dem Entfernen des MasterPageDescriptors erzeugen.
//
//************************************************************
class SdrUndoPageRemoveMasterPage : public SdrUndoPageMasterPage class SdrUndoPageRemoveMasterPage : public SdrUndoPageMasterPage
{ {
@@ -777,13 +700,10 @@ public:
virtual OUString GetComment() const; virtual OUString GetComment() const;
}; };
//************************************************************ /**
// SdrUndoPageChangeMasterPage * Changing the MasterPageDescriptor (e.g. change of the VisibleLayer).
// * Create Action before changing the MasterPageDescriptors.
// Aenderung des MasterPageDescriptors (z.B. Aendern der VisibleLayer). */
// Action vor der Aenderung am MasterPageDescriptor erzeugen.
//
//************************************************************
class SVX_DLLPUBLIC SdrUndoPageChangeMasterPage : public SdrUndoPageMasterPage 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. * The SdrUndoFactory can be set and retrieved from the SdrModel.
It can be used by applications to create application specific undo actions. * 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 class SVX_DLLPUBLIC SdrUndoFactory
{ {
public: public:
// shapes // Shapes
virtual ~SdrUndoFactory(); virtual ~SdrUndoFactory();
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject ); virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject );
virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ); virtual SdrUndoAction* CreateUndoMoveObject( SdrObject& rObject, const Size& rDist );
@@ -834,18 +755,18 @@ public:
String sOldStr, String sOldStr,
String sNewStr ); String sNewStr );
// layer // Layer
virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual SdrUndoAction* CreateUndoDeleteLayer(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); virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
// page // Page
virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1);
// master page // Master page
virtual SdrUndoAction* CreateUndoPageRemoveMasterPage(SdrPage& rChangedPage); virtual SdrUndoAction* CreateUndoPageRemoveMasterPage(SdrPage& rChangedPage);
virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage& rChangedPage); virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage& rChangedPage);
}; };

52
include/svx/unoapi.hxx
View File

@@ -35,51 +35,57 @@ class SvxNumBulletItem;
class SfxItemPool; class SfxItemPool;
class String; 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(); 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 (); 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() ; 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 (); 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() ; 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(); 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(); 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(); 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(); 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 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(); 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 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(); SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw();

23
include/svx/unopage.hxx
View File

@@ -49,15 +49,12 @@ class SvxShape;
class SvxShapeGroup; class SvxShapeGroup;
class SvxShapeConnector; class SvxShapeConnector;
/*********************************************************************** /**
* Macros fuer Umrechnung Twips<->100tel mm * * Macros to convert Twips<->100tel mm
***********************************************************************/ */
#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) #define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
/***********************************************************************
* *
***********************************************************************/
class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun::star::drawing::XDrawPage, class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun::star::drawing::XDrawPage,
::com::sun::star::drawing::XShapeGrouper, ::com::sun::star::drawing::XShapeGrouper,
::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XServiceInfo,
@@ -86,22 +83,20 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun:
SdrPage* GetSdrPage() const { return mpPage; } SdrPage* GetSdrPage() const { return mpPage; }
void ChangeModel( SdrModel* pNewModel ); 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(); 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(); void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw();
// Erzeugen eines SdrObjects anhand einer Description. Kann von // Creating a SdrObject using it's Description.
// abgeleiteten Klassen dazu benutzt werden, eigene Shapes zu // Can be used by derived classes to support their owen Shapes (e.g. Controls).
// unterstuetzen (z.B. Controls)
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); 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(); 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 // The following method is called if a SvxShape object is to be created.
// werden soll. abgeleitete Klassen koennen hier eine Ableitung oder // Derived classes can create a derivation or an SvxShape aggregating object.
// ein ein SvxShape aggregierenden Objekt anlegen.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw();
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage ) UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )

32
include/svx/unoprov.hxx
View File

@@ -28,9 +28,9 @@
class SvxItemPropertySet; class SvxItemPropertySet;
class SfxItemPool; class SfxItemPool;
/*********************************************************************** /**
* class UHashMap * * class UHashMap
***********************************************************************/ */
#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0) #define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0)
class UHashMap class UHashMap
@@ -42,9 +42,9 @@ public:
static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); static ::com::sun::star::uno::Sequence< OUString > getServiceNames();
}; };
/*********************************************************************** /**
* Soriterer * * Sorter
***********************************************************************/ */
#define SVXMAP_SHAPE 0 #define SVXMAP_SHAPE 0
#define SVXMAP_CONNECTOR 1 #define SVXMAP_CONNECTOR 1
@@ -73,9 +73,11 @@ public:
#define SVXMAP_TABLE 24 #define SVXMAP_TABLE 24
#define SVXMAP_PAGE 25 #define SVXMAP_PAGE 25
#define SVXMAP_END 26 // last+1 ! #define SVXMAP_END 26 // last+1 !
/***********************************************************************
* SvxUnoPropertyMapProvider * /**
***********************************************************************/ * SvxUnoPropertyMapProvider
*/
class SVX_DLLPUBLIC SvxUnoPropertyMapProvider class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
{ {
SfxItemPropertyMapEntry* aMapArr[SVXMAP_END]; SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
@@ -87,9 +89,9 @@ public:
const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool); const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool);
}; };
/*********************************************************************** /**
* Globals * * Globals
***********************************************************************/ */
const sal_Int16 OBJ_OLE2_APPLET = 100; const sal_Int16 OBJ_OLE2_APPLET = 100;
const sal_Int16 OBJ_OLE2_PLUGIN = 101; const sal_Int16 OBJ_OLE2_PLUGIN = 101;
@@ -98,9 +100,9 @@ const sal_Int16 OBJ_OLE2_PLUGIN = 101;
#include <editeng/unoipset.hxx> #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 = 0;
const sal_Int32 SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER = 1; const sal_Int32 SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER = 1;

51
include/svx/view3d.hxx
View File

@@ -26,39 +26,37 @@
#include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2dpoint.hxx>
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
//************************************************************ /*
// Vorausdeklarationen * Forward declarations
//************************************************************ */
class E3dObject; class E3dObject;
class E3dScene; class E3dScene;
class Impl3DMirrorConstructOverlay; class Impl3DMirrorConstructOverlay;
/************************************************************************* /**
|* * Derived class of SdrView to edit 3D objects.
|* Ableitung von SdrView zur Bearbeitung von 3D-Objekten */
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dView : public SdrView class SVX_DLLPUBLIC E3dView : public SdrView
{ {
protected: protected:
E3dDefaultAttributes a3DDefaultAttr; E3dDefaultAttributes a3DDefaultAttr;
MouseEvent aMouseEvent; // Die Parameter der letzten Events (Mouse, Keyboard) MouseEvent aMouseEvent; // The parameters of the last Events (Mouse, Keyboard)
Color aDefaultLightColor; // dito mit den Farben Color aDefaultLightColor; // The paramaters for the last colors
Color aDefaultAmbientColor; Color aDefaultAmbientColor;
double fDefaultScaleX; // Verzerrungen double fDefaultScaleX; // Scaling
double fDefaultScaleY; double fDefaultScaleY;
double fDefaultScaleZ; double fDefaultScaleZ;
double fDefaultRotateX; // und Drehungen double fDefaultRotateX; // and Rotation
double fDefaultRotateY; double fDefaultRotateY;
double fDefaultRotateZ; double fDefaultRotateZ;
double fDefaultExtrusionDeepth; // Extrusionstiefe double fDefaultExtrusionDeepth; // Extrusion depth
double fDefaultLightIntensity; // Intensitaeten der beiden (notwendigen) Licht- double fDefaultLightIntensity; // Intensity of the two (necessary) light sources.
double fDefaultAmbientIntensity; // quellen double fDefaultAmbientIntensity;
long nHDefaultSegments; // wieviele HSegmente braucht mein Lathe-Ojekt long nHDefaultSegments; // Amount of HSegments required by the Lathe object
long nVDefaultSegments; // wieviele VSegmente braucht mein Lathe-Ojekt long nVDefaultSegments; // Amount of VSegments required by the Lathe object
E3dDragConstraint eDragConstraint; E3dDragConstraint eDragConstraint;
@@ -83,24 +81,22 @@ public:
E3dView(SdrModel* pModel, OutputDevice* pOut = 0L); E3dView(SdrModel* pModel, OutputDevice* pOut = 0L);
virtual ~E3dView(); virtual ~E3dView();
// Alle markierten Objekte auf dem angegebenen OutputDevice ausgeben. // Output all marked Objects on the given OutputDevice.
virtual void DrawMarkedObj(OutputDevice& rOut) const; virtual void DrawMarkedObj(OutputDevice& rOut) const;
// Zugriff auf die Default-Attribute // Access to the default attributes.
E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
virtual void CheckPossibilities(); virtual void CheckPossibilities();
// Event setzen/rausruecken // Get/Set Event
void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; } void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; }
const MouseEvent& GetMouseEvent() { return aMouseEvent; } const MouseEvent& GetMouseEvent() { return aMouseEvent; }
// Model holen ueberladen, da bei einzelnen 3D Objekten noch eine Szene // Override getting the model, as we need to supply a Scene together with individual 3D Objects.
// untergeschoben werden muss
virtual SdrModel* GetMarkedObjModel() const; virtual SdrModel* GetMarkedObjModel() const;
// Bei Paste muss - falls in eine Scene eingefuegt wird - die // On Paste: We need to insert the objects of the Scene, but not the Scene itself
// Objekte der Szene eingefuegt werden, die Szene selbst aber nicht
using SdrView::Paste; using SdrView::Paste;
virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); 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; 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)); 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 // Means to create all Extrudes in a certain depth order.
// bestimmten Tiefensortierung anzulegen
void DoDepthArrange(E3dScene* pScene, double fDepth); void DoDepthArrange(E3dScene* pScene, double fDepth);
void ConvertMarkedToPolyObj(sal_Bool bLineToArea); void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
E3dScene* SetCurrent3DObj(E3dObject* p3DObj); E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation(); void Start3DCreation();
// migration of overlay // Migration of overlay
bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
virtual void MovAction(const Point& rPnt); virtual void MovAction(const Point& rPnt);
@@ -261,6 +256,6 @@ public:
void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False); 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */