diff options
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 4 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 0060110aabac..51a5620875e3 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -75,7 +75,7 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) get(m_pMtrFldBottom,"MTR_FLD_BOTTOM"); get(m_pFlPosition,"FL_POSITION"); get(m_pCtlPosition,"CTL_POSITION"); -// RP_MM, 240, 100 ), + m_pCtlPosition->SetControlSettings(RP_MM, 240, 100), get(m_pTsbFullWidth,"TSB_FULL_WIDTH"); @@ -92,8 +92,6 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) m_pTsbContour->SetClickHdl( aLink ); m_pTsbFullWidth->SetClickHdl(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) ); - -// aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition ); } /************************************************************************* diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 8bc51422c183..5c62e18be231 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -102,6 +102,8 @@ public: sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); + void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, + sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT); virtual ~SvxRectCtl(); virtual void Paint( const Rectangle& rRect ); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 5d592967e7fb..af07280643fb 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -96,6 +96,15 @@ SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt, Resize_Impl(); } +void SvxRectCtl::SetControlSettings(RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) +{ + nBorderWidth = nBorder; + nRadius = nCircle; + eDefRP = eRpt; + eCS = eStyle; + Resize_Impl(); +} + Size SvxRectCtl::GetOptimalSize() const { return LogicToPixel(Size(39, 39), MAP_APPFONT); |