diff options
author | Philipp Weissenbacher <p.weissenbacher@gmail.com> | 2015-11-29 21:11:21 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-01-06 15:06:46 +0100 |
commit | da952d821dcc08b017bdef8f7b06f60befd2effa (patch) | |
tree | 723ec9139bc0a4023e7aeee3c7f1c7b15216a22f /include/svx | |
parent | 33455023a9c1e33591d97116ac2e400362f87fbb (diff) |
tdf#39468 Translate German comments - include/svx
Change-Id: I5344af095e52efb1f1569d2b67ee3cc6b449dd22
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/svdlayer.hxx | 80 | ||||
-rw-r--r-- | include/svx/svdorect.hxx | 27 | ||||
-rw-r--r-- | include/svx/svdotable.hxx | 54 | ||||
-rw-r--r-- | include/svx/svdouno.hxx | 15 | ||||
-rw-r--r-- | include/svx/svdovirt.hxx | 19 | ||||
-rw-r--r-- | include/svx/svdsnpv.hxx | 86 | ||||
-rw-r--r-- | include/svx/sxcllitm.hxx | 21 |
7 files changed, 139 insertions, 163 deletions
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 1150e2e3e7d2..d412c13cbadf 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -26,6 +26,33 @@ #include <algorithm> #include <vector> +/** + * Note on the layer mix with symbolic/ID-based interface: + * You create a new layer with + * pLayerAdmin->NewLayer("A new layer"); + * This layer is automatically appended to the end of the list. + * + * The same holds true for layer sets. + * + * The interface for SdrLayerSet is based on LayerIDs. The app must get + * an ID for it at the SdrLayerAdmin, like so: + * SdrLayerID nLayerID=pLayerAdmin->GetLayerID("A new layer"); + * + * If the layer cannot be found, SDRLAYER_NOTFOUND is returned. + * The methods with the ID interface usually handle that error in a + * meaningful way. + * If you not only got a name, but even a SdrLayer*, you can get the ID + * much faster via the layer directly. + * + * @param bInherited: + * TRUE If the layer/layer set cannot be found, we examine the parent layer admin, + * whether there's a corresponding definition + * FALSE We only search this layer admin + * + * Every page's layer admin has a parent layer admin (the model's). The model + * itself does not have a parent. + */ + class SdrModel; class SVX_DLLPUBLIC SdrLayer @@ -35,15 +62,15 @@ class SVX_DLLPUBLIC SdrLayer OUString maName; OUString maTitle; OUString maDescription; - SdrModel* pModel; // zum Broadcasten - sal_uInt16 nType; // 0=Userdefined,1=Standardlayer + SdrModel* pModel; // For broadcasting + sal_uInt16 nType; // 0= userdefined, 1= default layer SdrLayerID nID; SdrLayer(SdrLayerID nNewID, const OUString& rNewName); public: - bool operator==(const SdrLayer& rCmpLayer) const; - bool operator!=(const SdrLayer& rCmpLayer) const { return !operator==(rCmpLayer); } + bool operator==(const SdrLayer& rCmpLayer) const; + bool operator!=(const SdrLayer& rCmpLayer) const { return !operator==(rCmpLayer); } void SetName(const OUString& rNewName); const OUString& GetName() const { return maName; } @@ -62,8 +89,7 @@ public: void SetStandardLayer(bool bStd = true); }; -// When Changing the layer data you currently have to set the Modify-Flag -// manually +// When Changing the layer data you currently have to set the Modify flag manually #define SDRLAYER_MAXCOUNT 255 class SVX_DLLPUBLIC SdrLayerAdmin { friend class SdrView; @@ -72,14 +98,14 @@ friend class SdrPage; protected: std::vector<SdrLayer*> aLayer; - SdrLayerAdmin* pParent; // Der Admin der Seite kennt den Admin des Docs - SdrModel* pModel; // for broadcasting - OUString maControlLayerName; + SdrLayerAdmin* pParent; // The page's admin knows the doc's admin + SdrModel* pModel; // For broadcasting + OUString maControlLayerName; protected: - // Eine noch nicht verwendete LayerID raussuchen. Sind bereits alle - // verbraucht, so gibt's 'ne 0. Wer sicher gehen will, muss vorher - // GetLayerCount()<SDRLAYER_MAXCOUNT abfragen, denn sonst sind alle - // vergeben. + // Find a LayerID which is not in use yet. If all have been used up, + // we return 0. + // If you want to play safe, check GetLayerCount()<SDRLAYER_MAXCOUNT + // first, else all are given away already. SdrLayerID GetUniqueLayerID() const; void Broadcast() const; public: @@ -101,15 +127,19 @@ public: Broadcast(); } SdrLayer* RemoveLayer(sal_uInt16 nPos); + // Delete the entire layer void ClearLayer(); + // New layer is created and inserted SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); + // New layer, name is retrieved from the resource SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF); // Iterate over all layers sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.size()); } + SdrLayer* GetLayer(sal_uInt16 i) { return aLayer[i]; } const SdrLayer* GetLayer(sal_uInt16 i) const { return aLayer[i]; } @@ -118,35 +148,13 @@ public: SdrLayer* GetLayer(const OUString& rName, bool bInherited); const SdrLayer* GetLayer(const OUString& rName, bool bInherited) const; SdrLayerID GetLayerID(const OUString& rName, bool bInherited) const; - SdrLayer* GetLayerPerID(sal_uInt16 nID) { return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayerPerID(nID)); } + SdrLayer* GetLayerPerID(sal_uInt16 nID) { return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayerPerID(nID)); } const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; void SetControlLayerName(const OUString& rNewName); const OUString& GetControlLayerName() const { return maControlLayerName; } }; -/* -Anmerkung zu den Layer - Gemischt symbolisch/ID-basierendes Interface - Einen neuen Layer macht man sich mit: - pLayerAdmin->NewLayer("Der neue Layer"); - Der Layer wird dann automatisch an das Ende der Liste angehaengt. - Entsprechdes gilt fuer Layersets gleichermassen. - Das Interface am SdrLayerSet basiert auf LayerID's. Die App muss sich - dafuer am SdrLayerAdmin eine ID abholen: - SdrLayerID nLayerID=pLayerAdmin->GetLayerID("Der neue Layer"); - Wird der Layer nicht gefunden, so liefert die Methode SDRLAYER_NOTFOUND - zurueck. Die Methoden mit ID-Interface fangen diesen Wert jedoch i.d.R - sinnvoll ab. - Hat man nicht nur den Namen, sondern gar einen SdrLayer*, so kann man - sich die ID natuerlich wesentlich schneller direkt vom Layer abholen. -bInherited: - TRUE: Wird der Layer/LayerSet nicht gefunden, so wird im Parent-LayerAdmin - nachgesehen, ob es dort einen entsprechende Definition gibt. - FALSE: Es wird nur dieser LayerAdmin durchsucht. - Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, n?mlich den des - Model. Das Model selbst hat keinen Parent. -*/ - #endif // INCLUDED_SVX_SVDLAYER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 1fc0a5a32663..e7e4c734715a 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -24,9 +24,7 @@ #include <svx/svxdllapi.h> -// Vorausdeklarationen - - +// Forward declaration class XPolygon; namespace sdr { namespace properties { @@ -36,22 +34,19 @@ namespace sdr { namespace properties { // SdrRectObj -// Rechteck-Objekte (Rechteck,Kreis,...) - - - +/// Rectangle objects (rectangle, circle, ...) class SVX_DLLPUBLIC SdrRectObj : public SdrTextObj { private: // to allow sdr::properties::RectangleProperties access to SetXPolyDirty() friend class sdr::properties::RectangleProperties; - friend class SdrTextObj; // wg SetXPolyDirty bei GrowAdjust + friend class SdrTextObj; // Due to SetXPolyDirty for GrowAdjust protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; - XPolygon* mpXPoly; + XPolygon* mpXPoly; protected: XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; @@ -64,16 +59,18 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo) override; public: - // Der Eckenradius-Parameter fliegt irgendwann raus. Der Eckenradius - // ist dann (spaeter) ueber SfxItems einzustellen (SetAttributes()). - // Konstruktion eines Rechteck-Zeichenobjekts - + /** + * The corner radius parameter is dropped at some point. + * We need to set the corner radius via SfxItems later on, using SetAttributes() + * + * Constructor of a rectangular drawing object + */ SdrRectObj(); SdrRectObj(const Rectangle& rRect); SdrRectObj& operator=(const SdrRectObj& rCopy); - // Konstruktion eines Textrahmens + // Constructor of a text frame SdrRectObj(SdrObjKind eNewTextKind); SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); virtual ~SdrRectObj(); @@ -94,7 +91,7 @@ public: virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; - // special drag methods + // Special drag methods virtual bool hasSpecialDrag() const override; virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; virtual bool applySpecialDrag(SdrDragStat& rDrag) override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 78a7e53c4133..a10447d4922d 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -47,9 +47,7 @@ struct ImplTableShadowPaintInfo; #endif -// SdrTableHitKind - - +/// SdrTableHitKind enum TableHitKind { SDRTABLEHIT_NONE, @@ -74,9 +72,7 @@ struct CellPos }; -// TableStyleSettings - - +/// TableStyleSettings struct SVX_DLLPUBLIC TableStyleSettings { bool mbUseFirstRow; @@ -94,9 +90,7 @@ struct SVX_DLLPUBLIC TableStyleSettings }; -// SdrTableObj - - +/// SdrTableObj class SdrTableObjImpl; class SVX_DLLPUBLIC SdrTableObj : public ::SdrTextObj @@ -110,8 +104,7 @@ public: virtual ~SdrTableObj(); - // table stuff - + // Table stuff SdrTableObj* CloneRange( const CellPos& rStartPos, const CellPos& rEndPos ); void DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn ); void DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow ); @@ -140,7 +133,7 @@ public: void uno_lock(); void uno_unlock(); - /** the active table has the focus or is currently edited */ + /** The active table has the focus or is currently edited */ const sdr::table::CellRef& getActiveCell() const; void setActiveCell( const sdr::table::CellPos& rPos ); @@ -153,21 +146,21 @@ public: void setTableStyle( const css::uno::Reference< css::container::XIndexAccess >& xAutoFormatStyle ); const css::uno::Reference< css::container::XIndexAccess >& getTableStyle() const; - // text stuff + // Text stuff - /** returns the currently active text. */ + /** Returns the currently active text */ virtual SdrText* getActiveText() const override; - /** returns the nth available text. */ + /** Returns the nth available text */ virtual SdrText* getText( sal_Int32 nIndex ) const override; - /** returns the number of texts available for this object. */ + /** Returns the number of texts available for this object */ virtual sal_Int32 getTextCount() const override; - /** changes the current active text */ + /** Changes the current active text */ virtual void setActiveText( sal_Int32 nIndex ) override; - /** returns the index of the text that contains the given point or -1 */ + /** Returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const override; // #i121917# @@ -176,11 +169,12 @@ public: bool IsTextEditActive() const { return (pEdtOutl != nullptr); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); - /** returns true only if we are in edit mode and the user actually changed anything */ + /** Returns true only if we are in edit mode and the user actually changed anything */ virtual bool IsReallyEdited() const override; - // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. - // der des EditOutliners) und die PaperSize gesetzt. + /** At the same time, we set the text in the outliner (if applicable the EditOutliners') + * as well as the PaperSize + */ void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override; void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; @@ -220,7 +214,7 @@ public: virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual void AddToHdlList(SdrHdlList& rHdlList) const override; - // special drag methods + // Special drag methods virtual bool hasSpecialDrag() const override; virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; virtual bool applySpecialDrag(SdrDragStat& rDrag) override; @@ -259,20 +253,16 @@ public: virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; - - - - // transformation interface for StarOfficeAPI. This implements support for - // homogen 3x3 matrices containing the transformation of the SdrObject. At the + // Transformation interface for StarOfficeAPI. This implements support for + // homogenous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - - // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon + // Gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override; - // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. + // Sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; @@ -282,7 +272,7 @@ public: // given vector // virtual void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ); - /** hack for clipboard with calc and writer, export and import table content as rtf table */ + /** Hack for clipboard with calc and writer, export and import table content as rtf table */ static void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); static void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); @@ -301,7 +291,7 @@ private: SdrOutliner* GetCellTextEditOutliner( const sdr::table::Cell& rCell ) const; private: - // for the ViewContactOfTableObj to build the primitive representation, it is necessary to access the + // For the ViewContactOfTableObj to build the primitive representation, it is necessary to access the // TableLayouter for position and attribute information friend class sdr::contact::ViewContactOfTableObj; const TableLayouter& getTableLayouter() const; diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 73f086486755..6e0e7b88a878 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -28,9 +28,7 @@ #include <svx/svdorect.hxx> -// Vorausdeklarationen - - +// Forward declaration class SdrView; class SdrPageWindow; class SdrControlEventListenerImpl; @@ -40,9 +38,7 @@ namespace sdr { namespace contact { }} -// SdrUnoObj - - +// SdrUnoObj struct SdrUnoObjDataHolder; class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj { @@ -55,7 +51,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj OUString aUnoControlTypeName; protected: - css::uno::Reference< css::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden + css::uno::Reference< css::awt::XControlModel > xUnoControlModel; // Can also be set from outside private: SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName); @@ -95,7 +91,7 @@ public: css::uno::Reference< css::awt::XControlModel > GetUnoControlModel() const {return xUnoControlModel;} css::uno::Reference< css::awt::XControl > GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const; - /** retrieves a temporary XControl instance for a given output device + /** Retrieves a temporary XControl instance for a given output device The method GetUnoControl, used to retrieve the XControl whose parent is a given device, only works if the SdrUnoObj has already been painted at least once onto this device. However, there are valid @@ -134,7 +130,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; private: - /** retrieves the typed ViewContact for the object + /** Retrieves the typed ViewContact for the object @param _out_rpContact Upon successful return, ->_out_rpContact contains the ViewContact. @return @@ -145,7 +141,6 @@ private: SVX_DLLPRIVATE bool impl_getViewContact( sdr::contact::ViewContactOfUnoControl*& _out_rpContact ) const; }; - #endif // INCLUDED_SVX_SVDOUNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 3a23e73e381a..7ee8c6f2fa47 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -23,16 +23,10 @@ #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> - - -// SdrVirtObj - -// Achtung! Das virtuelle Objekt ist noch nicht bis in alle Feinheiten -// durchprogrammiert und getestet. Z.Zt. kommt es nur in abgeleiteter -// beim Writer zum Einsatz. - - - +/** + * FIXME: The virtual object is not yet fully implemented and tested. + * At the moment we only use it in a derived class in Writer. + */ class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { SdrVirtObj( const SdrVirtObj& ) = delete; @@ -42,7 +36,7 @@ public: protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; - SdrObject& rRefObj; // Referenziertes Zeichenobjekt + SdrObject& rRefObj; // Referenced drawing object Rectangle aSnapRect; protected: @@ -145,13 +139,10 @@ public: virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override; virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const override; - // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0) // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0) virtual const Point GetOffset() const; }; - - #endif // INCLUDED_SVX_SVDOVIRT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index e041b7e0bdb6..d0f7fca9a7ff 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -25,8 +25,49 @@ #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +/** + * Definition: + * - snap something means e.g. the mouse pointer or some marked objects in drag can be snapped + * - snap on something means you can e.g. snap on the grid or on auxiliary lines + * + * + * Basically, we only catch visible elements (borders, helper lines, connectors), + * with the exception of the grid. Likewise, we can only catch visible elements (i.e. connectors). + * We only catch on the grid, if nothing else is close by (magnetic behaviour). + * + * The cursor which is used during creation of objects, while dragging polygon points + * etc. (i.e. the mouse cursor) is always caught on all enabled catch alternatives (max 6). + * + * This is different, when moving selected objects. Instead of one mouse cursor, there are + * four alternatives, which can be caught at the selected objects: + * 1. the logically enclosing frame of every single object + * 2. the logically enclosing frame of all selected objects + * 3. highlighted points of all selected objects (polygon points, ...) + * 4. the connectors of the selected objects + * + * As the first and second case exclude each other (the second is a refinement of the first one) + * three alternatives remain, which are independent from each other. For 6 possible values for the + * caught ones, we would end up with max. 18 different possible combinations! + * + * Therefore, we introduce the following simplifications: + * 1. Connectors only catch on connectors + * + * Only max. 2*5+1 = 11 combinations remain for MoveDrag: + * 1-3. enclosing frame on grid/border/helper lines + * 4. enclosing frame on highlighted object points + * 5. enclosing frame on enclosing frame + * 6-8. highlighted points on grid/border/helper lines + * 7. highlighted points on highlighted object points + * 8-10. highlighted points on enclosing frame + * 11. connectors on connectors + * + * We test for all of these possible 11 combinations in the MouseMove event in the DragMove + * and those with the least need of correction are carried out. + * + * In the Resize() etc. methods we only catch the logically enclosing frame of the highlighted objects. + */ -/** return value for SnapPos() method */ +/** Return value for SnapPos() method */ enum class SdrSnap { NOTSNAPPED = 0x00, @@ -242,49 +283,6 @@ public: long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; -// definition: -// - snap something= e.g. the mouse pointer or some marked objects in drag can be snapped -// - snap on sth.= you can e.g. snap on the grid or on auxiliary lines. -// -// -// Grundsaetzlich wird nur gefangen auf sichtbare Elemente (-> Border, -// Hilfslinien, Konnektoren; Ausnahme: Grid). Ebenso koennen nur sichtbare -// Elemente gefangen werden (->Konnektoren). -// -// Auf's Grid wird immer erst dann gefangen, wenn nix Anderes in der Naehe -// (->Magnetic) ist. -// -// Der "Cursor" (also der Mauszeiger) beim Erzeugen von Objekten, beim Draggen -// von Polygonpunkten, ... wird immer auf allen eingeschalteten Fangalternativen -// gefangen (max 6). -// -// Beim Verschieben markierter Objekte ist das etwas anders. Statt des einen -// Mauscursors gibt es hier 4 Alternativen an den markierten Objekten, die -// gefangen werden koennen: -// 1. die logisch-umschliessenden Rahmen der einzelnen Objekte -// 2. der logisch-umschliessende Rahmen aller markierten Objekte -// 3. ausgezeichnete Punkte der markierten Objekte (Polygonpunkte, ...) -// 4. die Konnektoren der markierten Objekte -// Da 1. und 2. einander ausschliessen (2. ist eine Verfeinerung von 1.) -// bleiben 3 voneinander unabhaengige Alternativen. Bei 6. Moeglichkeiten auf -// die gefangen werden kann kaeme man auf max. 18 Kombinationsmoeglichkeiten! -// Deshalb werden folgende Vereinfachungen festgelegt: -// 1. Konnektoren fangen sich nur auf Konnektoren. -// Verbleiben also nun noch max. 2x5+1=11 Fangkombinationen beim MoveDrag: -// 1-3. umschliessende(r) Rahmen auf Grid/Border/Hilfslinien -// 4. umschliessende(r) Rahmen auf ausgezeichnete Objektpunkte -// 5. umschliessende(r) Rahmen auf umschliessenden Rahmen -// 6-8. ausgezeichnete Punkte auf Grid/Border/Hilfslinien -// 7. ausgezeichnete Punkte auf ausgezeichnete Objektpunkte -// 8-10. ausgezeichnete Punkte auf umschliessenden Rahmen -// 11. Konnektoren auf Konnektoren -// Beim MouseMove-Event im DragMove werden also diese bis zu max. 11 moeglichen -// Alternativen durchgetestet und die mit dem gerigsten Korrekturaufwand -// vollzogen. -// -// Beim Resize, ... wird immer nur der logisch-umschliessende Rahmen der -// markierten Objekte gefangen. - #endif // INCLUDED_SVX_SVDSNPV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 224b181cfc65..7fd5e754a3da 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -23,12 +23,11 @@ #include <svx/sdynitm.hxx> #include <svx/sdmetitm.hxx> - -// class SdrCaptionLineLenItem -// Laenge der ersten Austrittslinie -// Nur bei Type3 und Type4 -// Nur relevant, wenn SdrCaptionFitLineLenItem=FALSE - +/** + * Length of the first caption line + * Only for Type3 and Type4 + * Only relevant, if SdrCaptionFitLineLenItem = false + */ class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} @@ -37,12 +36,10 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; - -// class SdrCaptionFitLineLenItem -// Laenge der ersten Austrittslinie automatisch berechnen oder -// Vorgabe (SdrCaptionLineLenItem) verwenden. -// Nur bei Type3 und Type4 - +/** + * The length of the first caption line is either automatically + * calculated or the default setting is used (SdrCaptionLineLenItem) + */ class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} |