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

9 files changed, 14 insertions, 25 deletions

diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 3743a3c7309d..5cd3a973c0ba 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -556,7 +556,7 @@ public:
     Size            CalcFloatSize();
     void            StartFloat( sal_Bool bStartTracking );
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void    setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); }
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 85d4e20cc71a..78fd8a83c12e 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -105,11 +105,11 @@ public:
 
     virtual const Wallpaper& GetDisplayBackground() const;
 
-    virtual void    SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
+    virtual void    setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { Edit::SetPosSizePixel( rNewPos, rNewSize ); }
     void            SetDropDownSizePixel( const Size& rNewSize )
-    { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
+    { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
 
     Rectangle       GetDropDownPosSizePixel() const;
 
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 70a43c3a6c2d..20ffd5550039 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -58,7 +58,6 @@ private:
     sal_Bool            mbOldSaveBack;
     sal_Bool            mbInClose;
     sal_Bool            mbModalMode;
-    int             m_nBorderWidth;
     Timer           maLayoutTimer;
 
     SAL_DLLPRIVATE void    ImplInitDialogData();
@@ -103,16 +102,6 @@ public:
     void            setInitialLayoutSize();
     virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
 
-    void set_border_width(int nBorderWidth)
-    {
-        m_nBorderWidth = nBorderWidth;
-    }
-    int get_border_width() const
-    {
-        return m_nBorderWidth;
-    }
-
-
     virtual sal_Bool    Close();
 
     virtual short   Execute();
diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx
index 7726e9fb70c9..5b16b84fe033 100644
--- a/vcl/inc/vcl/dockwin.hxx
+++ b/vcl/inc/vcl/dockwin.hxx
@@ -183,7 +183,7 @@ public:
     void            SetFloatStyle( WinBits nWinStyle );
     WinBits         GetFloatStyle() const;
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void    setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
                                      sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     void            SetPosSizePixel( const Point& rNewPos,
@@ -340,7 +340,7 @@ public:
     void            SetFloatStyle( WinBits nWinStyle );
     WinBits         GetFloatStyle() const;
 
-    virtual void    SetPosSizePixel( long nX, long nY,
+    virtual void    setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
                                      sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     void            SetPosSizePixel( const Point& rNewPos,
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 1d1653aeb71f..9c89ce98efd0 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -38,7 +38,6 @@ class VCL_DLLPUBLIC VclContainer : public Window
 public:
     VclContainer(Window *pParent);
     virtual Size GetOptimalSize(WindowSizeType eType) const;
-    using Window::SetPosSizePixel;
     virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
     virtual void SetPosPixel(const Point& rAllocPos);
     virtual void SetSizePixel(const Size& rAllocation);
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index ba5ef311d6b9..314f8d78a3a9 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -101,12 +101,12 @@ public:
 
     virtual const Wallpaper& GetDisplayBackground() const;
 
-    virtual void        SetPosSizePixel( long nX, long nY,
+    virtual void        setPosSizePixel( long nX, long nY,
                                          long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     void                SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
                         { Control::SetPosSizePixel( rNewPos, rNewSize ); }
     void                SetDropDownSizePixel( const Size& rNewSize )
-    { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
+    { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
 
     Rectangle           GetDropDownPosSizePixel() const;
 
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index cc3d78b1124e..c10f0361e126 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -197,9 +197,9 @@ public:
     // rename nOldId to nNewId);
     void ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId);
 
-    using Control::SetPosSizePixel;
-    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
+    virtual void SetPosPixel(const Point& rPos);
     virtual void SetSizePixel(const Size& rNewSize);
+    virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 
     Size calculateRequisition() const;
     void setAllocation(const Size &rAllocation);
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index ceac5014bc0d..088ef0472c08 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -62,9 +62,10 @@ public:
     virtual void    ActivatePage();
     virtual void    DeactivatePage();
 
-    //To-Do, inherit from VclContainer
-    using Window::SetPosSizePixel;
+    //To-Do, consider inheriting from VclContainer
     virtual void    SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
+    virtual void    SetPosPixel(const Point& rNewPos);
+    virtual void    SetSizePixel(const Size& rNewSize);
     virtual Size    GetOptimalSize(WindowSizeType eType) const;
 };
 
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index d5924d0da759..0de41b613404 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -155,7 +155,7 @@ namespace svt { class PopupWindowControllerImpl; }
 #define WINDOW_PREVTOPWINDOWSIBLING     ((sal_uInt16)15)
 #define WINDOW_NEXTTOPWINDOWSIBLING     ((sal_uInt16)16)
 
-// Flags for SetPosSizePixel()
+// Flags for setPosSizePixel()
 #define WINDOW_POSSIZE_X                ((sal_uInt16)0x0001)
 #define WINDOW_POSSIZE_Y                ((sal_uInt16)0x0002)
 #define WINDOW_POSSIZE_WIDTH            ((sal_uInt16)0x0004)
@@ -841,7 +841,7 @@ public:
     void                EnableAlwaysOnTop( sal_Bool bEnable = sal_True );
     sal_Bool                IsAlwaysOnTopEnabled() const;
 
-    virtual void        SetPosSizePixel( long nX, long nY,
+    virtual void        setPosSizePixel( long nX, long nY,
                                          long nWidth, long nHeight,
                                          sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
     virtual void        SetPosPixel( const Point& rNewPos );