diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-08 10:25:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-08 11:22:58 +0000 |
| commit | 8bff616ae65f67f2eb2e6b81f1dbbbe2f9f7f5d9 (patch) | |
| tree | f64ce79243db7b919e46a7f0399dc94f09eb0eeb /include/svx | |
| parent | 1b277a37c5ad219d2e275df1289ccfbce27183ee (diff) | |
simplify mark points and gluepoints management
Change-Id: I52070cfe4909a13189d9c130114d98565ced9089
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdmark.hxx | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 077148963f53..39a5eb3f6c7a 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -48,8 +48,8 @@ protected: sal_Int64 mnTimeStamp; SdrObject* mpSelectedSdrObject; // the selected object SdrPageView* mpPageView; - SdrUShortCont* mpPoints; // Selected Points - SdrUShortCont* mpGluePoints; // Selected Gluepoints (their Id's) + SdrUShortCont maPoints; // Selected Points + SdrUShortCont maGluePoints; // Selected Gluepoints (their Id's) bool mbCon1; // for Connectors bool mbCon2; // for Connectors sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges @@ -107,40 +107,24 @@ public: return mnUser; } - const SdrUShortCont* GetMarkedPoints() const + const SdrUShortCont& GetMarkedPoints() const { - return mpPoints; + return maPoints; } - const SdrUShortCont* GetMarkedGluePoints() const + const SdrUShortCont& GetMarkedGluePoints() const { - return mpGluePoints; + return maGluePoints; } - SdrUShortCont* GetMarkedPoints() + SdrUShortCont& GetMarkedPoints() { - return mpPoints; + return maPoints; } - SdrUShortCont* GetMarkedGluePoints() + SdrUShortCont& GetMarkedGluePoints() { - return mpGluePoints; - } - - SdrUShortCont* ForceMarkedPoints() - { - if(!mpPoints) - mpPoints = new SdrUShortCont; - - return mpPoints; - } - - SdrUShortCont* ForceMarkedGluePoints() - { - if(!mpGluePoints) - mpGluePoints = new SdrUShortCont; - - return mpGluePoints; + return maGluePoints; } sal_Int64 getTimeStamp() const |