diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-12-20 12:30:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-20 16:52:57 +0000 |
| commit | c38a1de224b911387fba74ae3039d634509085fb (patch) | |
| tree | 2930f54003741c67e4c985d936f936aa547b06fe /svx | |
| parent | 2ecf108c23c041619bb8b25338dca84ff89fe8eb (diff) | |
convert columns dialog (and sections/frame/page tab page) to .ui
Change-Id: I7ce64b63acba1581754e5a75ea48e3df654973ae
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/pagectrl.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/pagectrl.cxx | 47 |
2 files changed, 50 insertions, 0 deletions
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index cc941e1c7795..252d3ae5de44 100644 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -79,6 +79,7 @@ protected: public: SvxPageWindow( Window* pParent, const ResId& rId ); + SvxPageWindow( Window* pParent ); ~SvxPageWindow(); void SetWidth( long nW ) { aSize.Width() = nW; } @@ -153,6 +154,8 @@ public: void SetFrameDirection(sal_Int32 nFrameDirection); void ResetBackground(); + + virtual Size GetOptimalSize(WindowSizeType eType) const; }; #endif // #ifndef _SVX_PAGECTRL_HXX diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 1d6b759e0268..0fadd16e876b 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -97,6 +97,46 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) : SetBackground(); } +SvxPageWindow::SvxPageWindow( Window* pParent ) : + + Window( pParent ), + + nTop ( 0 ), + nBottom ( 0 ), + nLeft ( 0 ), + nRight ( 0 ), + aColor ( COL_TRANSPARENT ), + nHdLeft ( 0 ), + nHdRight ( 0 ), + nHdDist ( 0 ), + nHdHeight ( 0 ), + aHdColor ( COL_TRANSPARENT ), + pHdBorder ( 0 ), + nFtLeft ( 0 ), + nFtRight ( 0 ), + nFtDist ( 0 ), + nFtHeight ( 0 ), + aFtColor ( COL_TRANSPARENT ), + pFtBorder ( 0 ), + bFooter ( sal_False ), + bHeader ( sal_False ), + bTable ( sal_False ), + bHorz ( sal_False ), + bVert ( sal_False ), + eUsage ( SVX_PAGE_ALL ) +{ + pImpl = new PageWindow_Impl; + + // Count in Twips by default + SetMapMode( MapMode( MAP_TWIP ) ); + aWinSize = GetOptimalSize(WINDOWSIZE_PREFERRED); + aWinSize.Height() -= 4; + aWinSize.Width() -= 4; + + aWinSize = PixelToLogic( aWinSize ); + SetBackground(); +} + // ----------------------------------------------------------------------- SvxPageWindow::~SvxPageWindow() @@ -397,4 +437,11 @@ void SvxPageWindow::ResetBackground() pImpl->bResetBackground = sal_True; } +Size SvxPageWindow::GetOptimalSize(WindowSizeType eType) const +{ + if (eType == WINDOWSIZE_PREFERRED) + return LogicToPixel(Size(75, 46), MapMode(MAP_APPFONT)); + return Window::GetOptimalSize(eType); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |