diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-08-24 12:34:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:39 +0100 |
commit | 2f002e3a49da3fb797d564864acb34f6dc61f9de (patch) | |
tree | 5828accb6adfa4390d78c6cc5b9d2edd146cc61c /sd | |
parent | 8eaf8158156935a0e5b7ed2d1bf56e9f759629de (diff) |
having two SetPosSizePixel is a blasted nuisance
Lets rename the multiargument SetPosSizePixel to
setPosSizePixel drop the various using Window::SetPosSizePixel
and work towards de-virtualizing SetPosSizePixel/SetPosPixel and
SetSizePixel and doing the work in a virtual setPosSizePixel
Change-Id: I7057654168001b67becee1791e97f9e9dc01f7b8
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 5db3c269a050..2041e3733eda 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -415,8 +415,8 @@ void DropdownMenuBox::Resize() long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize(); nSBWidth = CalcZoom( nSBWidth ); - mpSubControl->SetPosSizePixel( 0, 1, aOutSz.Width() - nSBWidth, aOutSz.Height()-2 ); - mpDropdownButton->SetPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() ); + mpSubControl->setPosSizePixel( 0, 1, aOutSz.Width() - nSBWidth, aOutSz.Height()-2 ); + mpDropdownButton->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() ); } // -------------------------------------------------------------------- diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 7604ca4348ec..fea2e8f69aee 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -414,12 +414,12 @@ void AnnotationWindow::DoResize() mpVScrollbar->Hide(); } - mpTextWindow->SetPosSizePixel(0,0,aWidth, aHeight); + mpTextWindow->setPosSizePixel(0,0,aWidth, aHeight); if( mbReadonly ) - mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width(),POSTIT_META_HEIGHT); + mpMeta->setPosSizePixel(0,aHeight,GetSizePixel().Width(),POSTIT_META_HEIGHT); else - mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width()-METABUTTON_AREA_WIDTH,POSTIT_META_HEIGHT); + mpMeta->setPosSizePixel(0,aHeight,GetSizePixel().Width()-METABUTTON_AREA_WIDTH,POSTIT_META_HEIGHT); mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); @@ -427,7 +427,7 @@ void AnnotationWindow::DoResize() { // if we do not have a scrollbar anymore, we want to see the complete text mpOutlinerView->SetVisArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); } - mpVScrollbar->SetPosSizePixel( 0 + aWidth, 0, GetScrollbarWidth(), aHeight ); + mpVScrollbar->setPosSizePixel( 0 + aWidth, 0, GetScrollbarWidth(), aHeight ); mpVScrollbar->SetVisibleSize( PixelToLogic(Size(0,aHeight)).Height() ); mpVScrollbar->SetPageSize( PixelToLogic(Size(0,aHeight)).Height() * 8 / 10 ); mpVScrollbar->SetLineSize( mpOutliner->GetTextHeight() / 10 ); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index cda0fbd31a7c..e25fb1da37a0 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -110,7 +110,7 @@ SdNavigatorWin::SdNavigatorWin( // TreeListBox // set position below toolbox long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4; - maTlbObjects.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); + maTlbObjects.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); maTlbObjects.SetDoubleClickHdl( LINK( this, SdNavigatorWin, ClickObjectHdl ) ); maTlbObjects.SetSelectionMode( SINGLE_SELECTION ); // set focus to listbox, otherwise it is in the toolbox which is only useful @@ -121,7 +121,7 @@ SdNavigatorWin::SdNavigatorWin( maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) ); // set position below treelistbox nListboxYPos = maTlbObjects.GetPosPixel().Y() + maTlbObjects.GetSizePixel().Height() + 4; - maLbDocs.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); + maLbDocs.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); // set min outputsize after all sizes are known long nFullHeight = nListboxYPos + maLbDocs.GetSizePixel().Height() + 4; |