diff options
| -rw-r--r-- | svx/inc/svx/numvset.hxx | 9 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 38 | ||||
| -rw-r--r-- | sw/source/ui/inc/swvset.hxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/misc/insrule.cxx | 17 |
4 files changed, 52 insertions, 13 deletions
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index 546644490226..442addc79cc6 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -64,8 +64,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess> > aOutlineSettings; + + void init(sal_uInt16 nType); + public: SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ); + SvxNumValueSet( Window* pParent, sal_uInt16 nType ); ~SvxNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); @@ -92,6 +96,8 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer aFormatTimer; sal_Bool bGrfNotFound; + void init(); + protected: DECL_LINK(FormatHdl_Impl, void *); @@ -101,7 +107,8 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet( Window* pParent, const ResId& rResId); + SvxBmpNumValueSet(Window* pParent, const ResId& rResId); + SvxBmpNumValueSet(Window* pParent); ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 13a2e344bb44..741caf9c9c23 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -402,15 +402,25 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) : +SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) + : ValueSet( pParent, rResId ) +{ + init(nType); +} - ValueSet( pParent, rResId ), +SvxNumValueSet::SvxNumValueSet( Window* pParent, sal_uInt16 nType ) + : ValueSet( pParent ) +{ + init(nType); +} - aLineColor ( COL_LIGHTGRAY ), - nPageType ( nType ), - bHTMLMode ( sal_False ), - pVDev ( NULL ) +void SvxNumValueSet::init(sal_uInt16 nType) { + aLineColor = COL_LIGHTGRAY; + nPageType = nType; + bHTMLMode = sal_False; + pVDev = NULL; + SetColCount( 4 ); SetLineCount( 2 ); SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER ); @@ -465,12 +475,21 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) : +SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) + : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ) +{ + init(); +} - SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), - bGrfNotFound( sal_False ) +SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent ) + : SvxNumValueSet( pParent, NUM_PAGETYPE_BMP ) +{ + init(); +} +void SvxBmpNumValueSet::init() { + bGrfNotFound = sal_False; GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); SetStyle( GetStyle() | WB_VSCROLL ); SetLineCount( 3 ); @@ -478,6 +497,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) : aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl)); } + SvxBmpNumValueSet::~SvxBmpNumValueSet() { GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/ui/inc/swvset.hxx index f2c8725fbccc..a4c59fcb9dfb 100644 --- a/sw/source/ui/inc/swvset.hxx +++ b/sw/source/ui/inc/swvset.hxx @@ -25,6 +25,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet public: SwRulerValueSet( Window* pParent, const ResId& rResId ); + SwRulerValueSet( Window* pParent ); ~SwRulerValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index 4d865e6cdd7b..eecd57a9b977 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -100,10 +100,21 @@ IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS) return 0; } -SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId ) : - SvxBmpNumValueSet(pParent, rResId) +SwRulerValueSet::SwRulerValueSet( Window* pParent, const ResId& rResId ) + : SvxBmpNumValueSet(pParent, rResId) { - SetStyle( GetStyle() & ~WB_ITEMBORDER ); + SetStyle(GetStyle() & ~WB_ITEMBORDER); +} + +SwRulerValueSet::SwRulerValueSet(Window* pParent) + : SvxBmpNumValueSet(pParent) +{ + SetStyle(GetStyle() & ~WB_ITEMBORDER); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwRulerValueSet(Window *pParent, VclBuilder::stringmap &) +{ + return new SwRulerValueSet(pParent); } SwRulerValueSet::~SwRulerValueSet() |