diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-09-13 22:12:51 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-09-15 15:34:16 +0200 |
| commit | e0a43dff646515bbbcd2099b6fc095a7a89b84f9 (patch) | |
| tree | fedbbe646e98f278e588d46ca8751d69e60a59e1 /include | |
| parent | Fix ruler margin dragging in vertical mode (diff) | |
| download | core-e0a43dff646515bbbcd2099b6fc095a7a89b84f9.tar.gz core-e0a43dff646515bbbcd2099b6fc095a7a89b84f9.zip | |
Use vector instead of scoped_array to hold ruler items
Change-Id: I51f8d1d22da5f869e9937813de9649fddae1ffda
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/tstpitem.hxx | 5 | ||||
| -rw-r--r-- | include/svx/ruler.hxx | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 254105737573..ee6ef7f0539c 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -140,6 +140,11 @@ public: const SvxTabStop& operator[]( const sal_uInt16 nPos ) const { return maTabStops[nPos]; } + const SvxTabStop& At( const sal_uInt16 nPos ) const + { + return maTabStops[nPos]; + } + // "pure virtual Methods" from SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 55dea876a22e..09d59f085434 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -87,11 +87,11 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener sal_uInt16 nTabBufSize; long lDefTabDist; long lTabPos; - boost::scoped_array<RulerTab> mpTabs; // tab positions in pixel - boost::scoped_array<RulerIndent> mpIndents; // paragraph margins in pixel - boost::scoped_array<RulerBorder> mpBorders; - sal_uInt16 nBorderCount; - boost::scoped_array<RulerBorder> mpObjectBorders; + + std::vector<RulerTab> mpTabs; // tab positions in pixel + std::vector<RulerIndent> mpIndents; // paragraph margins in pixel + std::vector<RulerBorder> mpBorders; + std::vector<RulerBorder> mpObjectBorders; SfxBindings* pBindings; long nDragOffset; @@ -167,7 +167,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long GetRightIndent() const; long GetLogicRightIndent() const; - inline long GetLeftFrameMargin() const; + long GetLeftFrameMargin() const; long GetRightFrameMargin() const; void CalcMinMax(); |