diff options
| -rw-r--r-- | cui/source/inc/border.hxx | 7 | ||||
| -rw-r--r-- | cui/source/tabpages/border.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/borderconn.cxx | 16 |
3 files changed, 15 insertions, 10 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index fda7e139a49e..d23ff427a357 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -41,7 +41,10 @@ // forward --------------------------------------------------------------- -class SvxBorderLine; +namespace editeng +{ + class SvxBorderLine; +} class XColorTable; #include <svx/flagsdef.hxx> @@ -150,7 +153,7 @@ private: // share for individual Frame-/Core-Line void ResetFrameLine_Impl( svx::FrameBorderType eBorder, - const SvxBorderLine* pCurLine, + const editeng::SvxBorderLine* pCurLine, bool bValid ); #endif }; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 4a78212f0752..73b5cb20aeba 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -56,6 +56,8 @@ #include <sal/macros.h> #include "borderconn.hxx" +using namespace ::editeng; + // ----------------------------------------------------------------------- /* diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 04ecaa58e3da..263eb95c487c 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -46,20 +46,20 @@ of the tab page. // 1st: item wrappers --------------------------------------------------------- -class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const SvxBorderLine* > +class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const editeng::SvxBorderLine* > { public: inline explicit LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {} - virtual const SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const + virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const { return rItem.GetLine(); } - virtual void SetItemValue( SvxLineItem& rItem, const SvxBorderLine* pLine ) const + virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const { rItem.SetLine( pLine ); } }; // 2nd: control wrappers ------------------------------------------------------ -class FrameSelectorWrapper : public sfx::SingleControlWrapper< FrameSelector, const SvxBorderLine* > +class FrameSelectorWrapper : public sfx::SingleControlWrapper< FrameSelector, const editeng::SvxBorderLine* > { public: inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : @@ -68,8 +68,8 @@ public: virtual bool IsControlDontKnow() const; virtual void SetControlDontKnow( bool bSet ); - virtual const SvxBorderLine* GetControlValue() const; - virtual void SetControlValue( const SvxBorderLine* pLine ); + virtual const editeng::SvxBorderLine* GetControlValue() const; + virtual void SetControlValue( const editeng::SvxBorderLine* pLine ); private: FrameBorderType meBorder; /// The line this wrapper works with. @@ -86,12 +86,12 @@ void FrameSelectorWrapper::SetControlDontKnow( bool bSet ) GetControl().SetBorderDontCare( meBorder ); } -const SvxBorderLine* FrameSelectorWrapper::GetControlValue() const +const editeng::SvxBorderLine* FrameSelectorWrapper::GetControlValue() const { return GetControl().GetFrameBorderStyle( meBorder ); } -void FrameSelectorWrapper::SetControlValue( const SvxBorderLine* pLine ) +void FrameSelectorWrapper::SetControlValue( const editeng::SvxBorderLine* pLine ) { GetControl().ShowBorder( meBorder, pLine ); } |