diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-10-24 15:23:58 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-04 12:30:38 -0500 |
| commit | bd84b356d4d817a933985e891112b62ca6815212 (patch) | |
| tree | a67e1dcada8ae73a3bd18871993825fabf1ab708 | |
| parent | 3f1b1f7f08effe21a5b7443ab19c5f19fb660ed8 (diff) | |
Make this member private. Nobody accesses it directly.
Change-Id: Id00917198bda71eb80768526375eb83ba46dba11
| -rw-r--r-- | include/svx/sdr/properties/properties.hxx | 11 | ||||
| -rw-r--r-- | svx/source/sdr/properties/properties.cxx | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index 56d8c2522c3d..511b74956acc 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -50,19 +50,20 @@ namespace sdr { class SVX_DLLPUBLIC BaseProperties { - protected: + private: // the owner of this Properties. Set from constructor and not // to be changed in any way. SdrObject& mrObject; + protected: + // create a new object specific itemset with object specific ranges. virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) = 0; // internal access to SdrObject - SdrObject& GetSdrObject() const - { - return mrObject; - } + const SdrObject& GetSdrObject() const; + + SdrObject& GetSdrObject(); // Test changeability for a single item. If a implementation wants to prevent // changing an item this method may be overloaded. diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 9b8670f7030d..f4fd9c881b23 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -44,6 +44,16 @@ namespace sdr { } + const SdrObject& BaseProperties::GetSdrObject() const + { + return mrObject; + } + + SdrObject& BaseProperties::GetSdrObject() + { + return mrObject; + } + const SfxItemSet& BaseProperties::GetMergedItemSet() const { // default implementation falls back to GetObjectItemSet() |