diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-08 22:28:09 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-08 23:23:33 -0500 |
| commit | 1f1aee5fbd034c5f7c967e19631b6507408ec00f (patch) | |
| tree | 8efa1dff1452b4b92d82b97dec081bf16e065d9e /include | |
| parent | 822b3482414fe9be0e271727d58581a1df1d3b83 (diff) | |
Move these to Impl and remove boost::optional include.
Change-Id: I394d164c4d3f26d906204e2ed89efeef597ba810
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdobj.hxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 02d98bc0fbfd..21789af47db2 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -39,8 +39,6 @@ #include <vcl/mapmod.hxx> #include <vcl/timer.hxx> -#include <boost/optional.hpp> - // forward declarations class SfxBroadcaster; @@ -358,20 +356,17 @@ protected: // global static ItemPool for not-yet-inserted items private: static SdrItemPool* mpGlobalItemPool; - boost::optional<double> mnRelativeWidth; - sal_Int16 meRelativeWidthRelation; - boost::optional<double> mnRelativeHeight; - sal_Int16 meRelativeHeightRelation; + public: static SdrItemPool& GetGlobalDrawObjectItemPool(); - void SetRelativeWidth( double nValue ) { mnRelativeWidth.reset( nValue ); } - void SetRelativeWidthRelation( sal_Int16 eValue ) { meRelativeWidthRelation = eValue; } - void SetRelativeHeight( double nValue ) { mnRelativeHeight.reset( nValue ); } - void SetRelativeHeightRelation( sal_Int16 eValue ) { meRelativeHeightRelation = eValue; } - boost::optional<double> GetRelativeWidth( ) const { return mnRelativeWidth; } - sal_Int16 GetRelativeWidthRelation() const { return meRelativeWidthRelation; } - boost::optional<double> GetRelativeHeight( ) const { return mnRelativeHeight; } - sal_Int16 GetRelativeHeightRelation() const { return meRelativeHeightRelation; } + void SetRelativeWidth( double nValue ); + void SetRelativeWidthRelation( sal_Int16 eValue ); + void SetRelativeHeight( double nValue ); + void SetRelativeHeightRelation( sal_Int16 eValue ); + const double* GetRelativeWidth() const; + sal_Int16 GetRelativeWidthRelation() const; + const double* GetRelativeHeight() const; + sal_Int16 GetRelativeHeightRelation() const; // evil calc grid/shape drawlayer syncing Point GetGridOffset() const { return aGridOffset; } void SetGridOffset( const Point& rGridOffset ){ aGridOffset = rGridOffset; } |