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

7 files changed, 8 insertions, 9 deletions

diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index 4778bd9a6e0f..00e8cd99273e 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -103,7 +103,6 @@ public:
     void                    SetHelpId( const rtl::OString& rHelpId );
     const rtl::OString&     GetHelpId( ) const;
     void                    SetSizePixel( const Size& rNewSize );
-    using Window::SetPosSizePixel;
     virtual void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
     void                    SetSortColumn( sal_Bool bValue ) { bSortColumn = bValue; }
     sal_Bool                GetSortColumn() { return bSortColumn; }
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index c985e6406767..c5a7514e6cf0 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2381,7 +2381,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
             mpFixedLine->Show();
         }
         long nLineWidth = aOutSize.Width()-(CALFIELD_BORDERLINE_X*2);
-        mpFixedLine->SetPosSizePixel( (aOutSize.Width()-nLineWidth)/2, aOutSize.Height()+((CALFIELD_BORDER_YTOP-2)/2),
+        mpFixedLine->setPosSizePixel( (aOutSize.Width()-nLineWidth)/2, aOutSize.Height()+((CALFIELD_BORDER_YTOP-2)/2),
                                       nLineWidth, 2, WINDOW_POSSIZE_POSSIZE );
         aOutSize.Height() += nBtnHeight + (CALFIELD_BORDER_Y*2) + CALFIELD_BORDER_YTOP;
         SetOutputSizePixel( aOutSize );
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 5af9c8037f35..734b6842f374 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -172,8 +172,8 @@ void FileControl::Resize()
     }
 
     long nButtonWidth = nButtonTextWidth+ButtonBorder;
-    maEdit.SetPosSizePixel( 0, 0, aOutSz.Width()-nButtonWidth, aOutSz.Height() );
-    maButton.SetPosSizePixel( aOutSz.Width()-nButtonWidth, 0, nButtonWidth, aOutSz.Height() );
+    maEdit.setPosSizePixel( 0, 0, aOutSz.Width()-nButtonWidth, aOutSz.Height() );
+    maButton.setPosSizePixel( aOutSz.Width()-nButtonWidth, 0, nButtonWidth, aOutSz.Height() );
 
     mnInternalFlags &= ~FILECTRL_INRESIZE; //InResize = sal_False
 }
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index c09656386208..0cbaa997536e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2334,7 +2334,7 @@ sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId )
             nWidth = aRect.GetWidth();
         }
         mpEdit->SetText( GetPageText( mnEditId ) );
-        mpEdit->SetPosSizePixel( nX, aRect.Top()+mnOffY+1, nWidth, aRect.GetHeight()-3 );
+        mpEdit->setPosSizePixel( nX, aRect.Top()+mnOffY+1, nWidth, aRect.GetHeight()-3 );
         Font    aFont = GetPointFont();
         Color   aForegroundColor;
         Color   aBackgroundColor;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 95d5e6b6d889..f8327bbf2bda 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -215,7 +215,7 @@ void ValueSet::ImplInitScrollBar()
         {
             // adapt the width because of the changed settings
             long nScrBarWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
-            mpScrBar->SetPosSizePixel( 0, 0, nScrBarWidth, 0, WINDOW_POSSIZE_WIDTH );
+            mpScrBar->setPosSizePixel( 0, 0, nScrBarWidth, 0, WINDOW_POSSIZE_WIDTH );
         }
     }
 }
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 66e7c73e9b19..82ded06268bb 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -184,7 +184,7 @@ void WizardDialog::ImplPosCtrls()
     if ( mpFixedLine && mpFixedLine->IsVisible() )
     {
         nOffY -= mpFixedLine->GetSizePixel().Height();
-        mpFixedLine->SetPosSizePixel( 0, nOffY, aDlgSize.Width(), 0,
+        mpFixedLine->setPosSizePixel( 0, nOffY, aDlgSize.Width(), 0,
                                       WINDOW_POSSIZE_POS | WINDOW_POSSIZE_WIDTH );
     }
 
@@ -233,7 +233,7 @@ void WizardDialog::ImplPosCtrls()
             nViewHeight     = nDlgHeight-(WIZARDDIALOG_VIEW_DLGOFFSET_Y*2);
             nViewPosFlags  |= WINDOW_POSSIZE_HEIGHT;
         }
-        mpViewWindow->SetPosSizePixel( nViewOffX, nViewOffY,
+        mpViewWindow->setPosSizePixel( nViewOffX, nViewOffY,
                                        nViewWidth, nViewHeight,
                                        nViewPosFlags );
     }
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 4f24e4e2e6c8..fd026b7eba8b 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -64,7 +64,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer >
         throw lang::IllegalArgumentException(); // TODO
 
     pHatchWindow = new SvResizeWindow( pParent, this );
-    pHatchWindow->SetPosSizePixel( aBounds.X, aBounds.Y, aBounds.Width, aBounds.Height );
+    pHatchWindow->setPosSizePixel( aBounds.X, aBounds.Y, aBounds.Width, aBounds.Height );
     aHatchBorderSize = aSize;
     pHatchWindow->SetHatchBorderPixel( Size( aSize.Width, aSize.Height ) );