[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - chart2/source cui/source dbaccess/source extensions/source framework/source reportdesign/source sc/source sd/source slideshow/source svtools/inc svtools/source svx/source sw/source toolkit/source vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 24 04:35:57 PDT 2012
chart2/source/controller/main/ChartController_Window.cxx | 4 -
cui/source/tabpages/autocdlg.cxx | 2
dbaccess/source/ui/control/VertSplitView.cxx | 4 -
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/inc/TableWindow.hxx | 3 -
extensions/source/propctrlr/standardcontrol.cxx | 6 +-
framework/source/helper/vclstatusindicator.cxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 12 ++---
reportdesign/source/ui/dlg/Condition.cxx | 24 +++++-----
sc/source/ui/dbgui/csvruler.cxx | 4 -
sc/source/ui/dbgui/csvtablebox.cxx | 12 ++---
sc/source/ui/inc/csvruler.hxx | 3 -
sc/source/ui/navipi/navipi.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 4 -
sd/source/ui/annotations/annotationwindow.cxx | 8 +--
sd/source/ui/dlg/navigatr.cxx | 4 -
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 2
svtools/inc/svtools/fileview.hxx | 1
svtools/source/control/calendar.cxx | 2
svtools/source/control/filectrl.cxx | 4 -
svtools/source/control/tabbar.cxx | 2
svtools/source/control/valueset.cxx | 2
svtools/source/dialogs/wizdlg.cxx | 4 -
svtools/source/edit/svmedit.cxx | 8 +--
svtools/source/hatchwindow/hatchwindow.cxx | 2
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/docrecovery.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 2
sw/source/ui/docvw/SidebarWin.cxx | 14 ++---
sw/source/ui/inc/scroll.hxx | 1
sw/source/ui/utlui/navipi.cxx | 6 +-
sw/source/ui/utlui/textcontrolcombo.cxx | 4 -
toolkit/source/awt/vclxwindow.cxx | 2
vcl/inc/ilstbox.hxx | 2
vcl/inc/vcl/combobox.hxx | 4 -
vcl/inc/vcl/dialog.hxx | 11 ----
vcl/inc/vcl/dockwin.hxx | 4 -
vcl/inc/vcl/layout.hxx | 1
vcl/inc/vcl/lstbox.hxx | 4 -
vcl/inc/vcl/tabctrl.hxx | 4 -
vcl/inc/vcl/tabpage.hxx | 5 +-
vcl/inc/vcl/window.hxx | 4 -
vcl/source/control/button.cxx | 6 +-
vcl/source/control/combobox.cxx | 10 ++--
vcl/source/control/ilstbox.cxx | 4 -
vcl/source/control/lstbox.cxx | 10 ++--
vcl/source/control/tabctrl.cxx | 7 ++
vcl/source/window/brdwin.cxx | 6 +-
vcl/source/window/dialog.cxx | 19 ++++---
vcl/source/window/dockmgr.cxx | 15 ++----
vcl/source/window/dockwin.cxx | 10 ++--
vcl/source/window/menu.cxx | 10 ++--
vcl/source/window/syswin.cxx | 2
vcl/source/window/tabdlg.cxx | 2
vcl/source/window/tabpage.cxx | 14 +++++
vcl/source/window/window.cxx | 4 -
vcl/source/window/window2.cxx | 6 +-
57 files changed, 163 insertions(+), 157 deletions(-)
New commits:
commit eed7fc996718326cd34ace39baec094011888f69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 24 12:34:22 2012 +0100
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
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 0b7a23a..387ad84 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -265,7 +265,7 @@ const short HITPIX=2; //hit-tolerance in pixel
, Fraction(nScaleXNumerator,nScaleXDenominator)
, Fraction(nScaleYNumerator,nScaleYDenominator) );
m_pChartWindow->SetMapMode(aNewMapMode);
- m_pChartWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
+ m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
//#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY );
@@ -294,7 +294,7 @@ const short HITPIX=2; //hit-tolerance in pixel
{
//change visarea
ChartModelHelper::setPageSize( awt::Size( aLogicSize.Width(), aLogicSize.Height() ), getModel() );
- m_pChartWindow->SetPosSizePixel( X, Y, Width, Height, Flags );
+ m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );
}
m_pChartWindow->Invalidate();
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c459791..2b84808 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -155,7 +155,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
Size aMinSize(aLanguageFT.CalcMinimumSize());
//reserve some extra space for CJK accelerators that are possible inserted
//later (like '(A)')
- aLanguageFT.SetPosSizePixel( 0, 0, aMinSize.Width() + 20, 0, WINDOW_POSSIZE_WIDTH );
+ aLanguageFT.setPosSizePixel( 0, 0, aMinSize.Width() + 20, 0, WINDOW_POSSIZE_WIDTH );
if ( bOpenSmartTagOptions )
SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS );
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 9a377a5..13e6905 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -179,10 +179,10 @@ void OSplitterView::Resize()
if ( m_pRight )
{
if ( m_bVertical )
- m_pRight->SetPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(),
+ m_pRight->setPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(),
aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height());
else
- m_pRight->SetPosSizePixel( aSplitPos.X(), aPlaygroundPos.Y() + aSplitPos.Y() + aSplitSize.Height(),
+ m_pRight->setPosSizePixel( aSplitPos.X(), aPlaygroundPos.Y() + aSplitPos.Y() + aSplitSize.Height(),
aPlaygroundSize.Width() , aPlaygroundSize.Height() - aSplitSize.Height() - aSplitPos.Y());
}
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 0e2d480..f0e4af3 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -328,7 +328,7 @@ namespace dbaui
const Size aMinSize( io_button.CalcMinimumSize() );
if ( aMinSize.Width() > aOldSize.Width() )
{
- io_button.SetPosSizePixel(
+ io_button.setPosSizePixel(
aOldPos.X() + aOldSize.Width() - aMinSize.Width(),
0,
aMinSize.Width(),
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index c51fa02..ecdfcae 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -191,9 +191,6 @@ namespace dbaui
/** clears the listbox inside. Must be called be the dtor is called.
*/
void clearListBox();
-
- protected:
- using Window::SetPosSizePixel;
};
}
#endif //DBAUI_TABLEWINDOW_HXX
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 0a42576..14ed883 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1101,11 +1101,11 @@ namespace pcr
{
long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
nSBWidth = CalcZoom( nSBWidth );
- m_pImplEdit->SetPosSizePixel( 0, 1, aOutSz.Width() - nSBWidth, aOutSz.Height()-2 );
- m_pDropdownButton->SetPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() );
+ m_pImplEdit->setPosSizePixel( 0, 1, aOutSz.Width() - nSBWidth, aOutSz.Height()-2 );
+ m_pDropdownButton->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() );
}
else
- m_pImplEdit->SetPosSizePixel( 0, 1, aOutSz.Width(), aOutSz.Height()-2 );
+ m_pImplEdit->setPosSizePixel( 0, 1, aOutSz.Width(), aOutSz.Height()-2 );
}
//------------------------------------------------------------------
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 277e60f..ccfab3a 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -221,7 +221,7 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar ,
return;
Size aParentSize = pParentWindow->GetSizePixel();
- pStatusBar->SetPosSizePixel(0,
+ pStatusBar->setPosSizePixel(0,
0,
aParentSize.Width(),
aParentSize.Height());
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 0a7c337..19ddb97 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -183,7 +183,7 @@ namespace rptui
pCon->setCondition( xCond );
m_aConditions.insert( m_aConditions.begin() + _nNewCondIndex, pCon );
- pCon->SetPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH );
+ pCon->setPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH );
}
catch( const Exception& )
{
@@ -341,7 +341,7 @@ namespace rptui
++cond
)
{
- (*cond)->SetPosSizePixel( aConditionPos.X(), aConditionPos.Y(), nConditionWidth, nConditionHeight );
+ (*cond)->setPosSizePixel( aConditionPos.X(), aConditionPos.Y(), nConditionWidth, nConditionHeight );
aConditionPos.Move( 0, nConditionHeight );
}
}
@@ -354,24 +354,24 @@ namespace rptui
impl_layoutConditions( aPos );
// scrollbar size and visibility
- m_aCondScroll.SetPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT );
+ m_aCondScroll.setPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT );
if ( !impl_needScrollBar() )
// normalize the position, so it can, in all situations, be used as top index
m_aCondScroll.SetThumbPos( 0 );
// the separator and the buttons below it
aPos += LogicToPixel( Point( 0 , RELATED_CONTROLS ), MAP_APPFONT );
- m_aSeparator.SetPosSizePixel( 0, aPos.Y(), 0, 0, WINDOW_POSSIZE_Y );
+ m_aSeparator.setPosSizePixel( 0, aPos.Y(), 0, 0, WINDOW_POSSIZE_Y );
aPos += LogicToPixel( Point( 0 , UNRELATED_CONTROLS ), MAP_APPFONT );
Window* pWindows[] = { &m_aPB_OK, &m_aPB_CANCEL, &m_aPB_Help };
for ( size_t i= 0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i )
{
- pWindows[i]->SetPosSizePixel( 0, aPos.Y(), 0, 0, WINDOW_POSSIZE_Y );
+ pWindows[i]->setPosSizePixel( 0, aPos.Y(), 0, 0, WINDOW_POSSIZE_Y );
}
aPos += LogicToPixel( Point( 0, BUTTON_HEIGHT + RELATED_CONTROLS ), MAP_APPFONT );
- SetPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT );
+ setPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT );
}
// -----------------------------------------------------------------------------
void ConditionalFormattingDialog::impl_initializeConditions()
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index bbe7e3b..f288365 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -297,12 +297,12 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp
Size aRelatedControls( LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ) );
Point aToolbarPos( m_aActions.GetPosPixel() );
Size aToolbarSize( m_aActions.GetSizePixel() );
- m_aPreview.SetPosSizePixel( aToolbarPos.X() + aToolbarSize.Width() + 2 * aRelatedControls.Width(),
+ m_aPreview.setPosSizePixel( aToolbarPos.X() + aToolbarSize.Width() + 2 * aRelatedControls.Width(),
0, 0, 0, WINDOW_POSSIZE_X );
// ensure the toolbar is vertically centered, relative to the preview
Size aPreviewSize( m_aPreview.GetSizePixel() );
- m_aActions.SetPosSizePixel( 0, aToolbarPos.Y() + ( aPreviewSize.Height() - aToolbarSize.Height() ) / 2, 0, 0, WINDOW_POSSIZE_Y );
+ m_aActions.setPosSizePixel( 0, aToolbarPos.Y() + ( aPreviewSize.Height() - aToolbarSize.Height() ) / 2, 0, 0, WINDOW_POSSIZE_Y );
m_pBtnUpdaterBackgroundColor = new ::svx::ToolboxButtonColorUpdater(
SID_BACKGROUND_COLOR, SID_BACKGROUND_COLOR, &m_aActions );
@@ -490,27 +490,27 @@ void Condition::impl_layoutAll()
const Point aRow3( LogicToPixel( Point( 0, ROW_3_POS ), MAP_APPFONT ) );
// resize the header line
- m_aHeader.SetPosSizePixel( 0, 0, aSize.Width() - 2 * aRelatedControls.Width(), 0, WINDOW_POSSIZE_WIDTH );
+ m_aHeader.setPosSizePixel( 0, 0, aSize.Width() - 2 * aRelatedControls.Width(), 0, WINDOW_POSSIZE_WIDTH );
// position the up/down buttons
const Size aButtonSize( LogicToPixel( Size( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ), MAP_APPFONT ) );
Point aButtonPos( aSize.Width() - aUnrelatedControls.Width() - aButtonSize.Width(), aRow1.Y() );
- m_aMoveUp.SetPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
+ m_aMoveUp.setPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
aButtonPos.Move( 0, aButtonSize.Height() + aRelatedControls.Height() );
- m_aMoveDown.SetPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
+ m_aMoveDown.setPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
// resize the preview
const long nNewPreviewRight = aButtonPos.X() - aRelatedControls.Width();
const Point aPreviewPos( m_aPreview.GetPosPixel() );
OSL_ENSURE( aPreviewPos.X() < nNewPreviewRight, "Condition::impl_layoutAll: being *that* small should not be allowed!" );
- m_aPreview.SetPosSizePixel( 0, 0, nNewPreviewRight - aPreviewPos.X(), 0, WINDOW_POSSIZE_WIDTH );
+ m_aPreview.setPosSizePixel( 0, 0, nNewPreviewRight - aPreviewPos.X(), 0, WINDOW_POSSIZE_WIDTH );
// position the add/remove buttons
aButtonPos = Point( nNewPreviewRight - aButtonSize.Width(), aRow3.Y() );
- m_aRemoveCondition.SetPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
+ m_aRemoveCondition.setPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
aButtonPos.Move( -( aButtonSize.Width() + aRelatedControls.Width() ), 0 );
- m_aAddCondition.SetPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
+ m_aAddCondition.setPosSizePixel( aButtonPos.X(), aButtonPos.Y(), aButtonSize.Width(), aButtonSize.Height() );
// layout the operands input controls
impl_layoutOperands();
@@ -551,7 +551,7 @@ void Condition::impl_layoutOperands()
const Rectangle aCondTypeRect( m_aConditionType.GetPosPixel(), m_aConditionType.GetSizePixel() );
const Point aOpListPos( aCondTypeRect.Right() + aRelatedControls.Width(), aCondTypeRect.Top() );
const Size aOpListSize( LogicToPixel( Size( COND_OP_WIDTH, 60 ), MAP_APPFONT ) );
- m_aOperationList.SetPosSizePixel( aOpListPos.X(), aOpListPos.Y(),aOpListSize.Width(), aOpListSize.Height() );
+ m_aOperationList.setPosSizePixel( aOpListPos.X(), aOpListPos.Y(),aOpListSize.Width(), aOpListSize.Height() );
m_aOperationList.Show( !bIsExpression );
// the LHS input field
@@ -561,19 +561,19 @@ void Condition::impl_layoutOperands()
Size aLHSSize( LogicToPixel( Size( EDIT_WIDTH, EDIT_HEIGHT ), MAP_APPFONT ) );
if ( !bHaveRHS )
aLHSSize.Width() = aPreviewRect.Right() - aLHSPos.X();
- m_aCondLHS.SetPosSizePixel( aLHSPos.X(), aLHSPos.Y(), aLHSSize.Width(), aLHSSize.Height() );
+ m_aCondLHS.setPosSizePixel( aLHSPos.X(), aLHSPos.Y(), aLHSSize.Width(), aLHSSize.Height() );
if ( bHaveRHS )
{
// the "and" text being the glue between LHS and RHS
const Point aOpGluePos( aLHSPos.X() + aLHSSize.Width() + aRelatedControls.Width(), aLHSPos.Y() );
const Size aOpGlueSize( m_aOperandGlue.GetTextWidth( m_aOperandGlue.GetText() ) + aRelatedControls.Width(), aLHSSize.Height() );
- m_aOperandGlue.SetPosSizePixel( aOpGluePos.X(), aOpGluePos.Y(), aOpGlueSize.Width(), aOpGlueSize.Height() );
+ m_aOperandGlue.setPosSizePixel( aOpGluePos.X(), aOpGluePos.Y(), aOpGlueSize.Width(), aOpGlueSize.Height() );
// the RHS input field
const Point aRHSPos( aOpGluePos.X() + aOpGlueSize.Width() + aRelatedControls.Width(), aOpGluePos.Y() );
const Size aRHSSize( aPreviewRect.Right() - aRHSPos.X(), aLHSSize.Height() );
- m_aCondRHS.SetPosSizePixel( aRHSPos.X(), aRHSPos.Y(), aRHSSize.Width(), aRHSSize.Height() );
+ m_aCondRHS.setPosSizePixel( aRHSPos.X(), aRHSPos.Y(), aRHSSize.Width(), aRHSSize.Height() );
}
m_aOperandGlue.Show( bHaveRHS );
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 2032cd4..90c4043 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -124,12 +124,12 @@ ScCsvRuler::~ScCsvRuler()
// common ruler handling ------------------------------------------------------
-void ScCsvRuler::SetPosSizePixel(
+void ScCsvRuler::setPosSizePixel(
long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
{
if( nFlags & WINDOW_POSSIZE_HEIGHT )
nHeight = GetTextHeight() + mnSplitSize + 2;
- ScCsvControl::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ ScCsvControl::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
void ScCsvRuler::ApplyLayout( const ScCsvLayoutData& rOldData )
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 389ec74..d43a8ed 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -127,29 +127,29 @@ void ScCsvTableBox::InitControls()
if( mbFixedMode )
{
// ruler sets height internally
- maRuler.SetPosSizePixel( 0, 0, nDataWidth, 0 );
+ maRuler.setPosSizePixel( 0, 0, nDataWidth, 0 );
sal_Int32 nY = maRuler.GetSizePixel().Height();
maData.mnWinHeight -= nY;
- maGrid.SetPosSizePixel( 0, nY, nDataWidth, maData.mnWinHeight );
+ maGrid.setPosSizePixel( 0, nY, nDataWidth, maData.mnWinHeight );
}
else
- maGrid.SetPosSizePixel( 0, 0, nDataWidth, nDataHeight );
+ maGrid.setPosSizePixel( 0, 0, nDataWidth, nDataHeight );
maGrid.Show();
maRuler.Show( mbFixedMode );
// scrollbars always visible
- maHScroll.SetPosSizePixel( 0, nDataHeight, nDataWidth, nScrollBarSize );
+ maHScroll.setPosSizePixel( 0, nDataHeight, nDataWidth, nScrollBarSize );
InitHScrollBar();
maHScroll.Show();
// scrollbars always visible
- maVScroll.SetPosSizePixel( nDataWidth, 0, nScrollBarSize, nDataHeight );
+ maVScroll.setPosSizePixel( nDataWidth, 0, nScrollBarSize, nDataHeight );
InitVScrollBar();
maVScroll.Show();
bool bScrBox = maHScroll.IsVisible() && maVScroll.IsVisible();
if( bScrBox )
- maScrollBox.SetPosSizePixel( nDataWidth, nDataHeight, nScrollBarSize, nScrollBarSize );
+ maScrollBox.setPosSizePixel( nDataWidth, nDataHeight, nScrollBarSize, nScrollBarSize );
maScrollBox.Show( bScrBox );
// let the controls self-adjust to visible area
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index 2a73bea..dcd2faf 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -64,9 +64,8 @@ public:
// common ruler handling --------------------------------------------------
public:
- using Window::SetPosSizePixel;
/** Sets position and size of the ruler. The height is calculated internally. */
- virtual void SetPosSizePixel(
+ virtual void setPosSizePixel(
long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 654b836..e57f901 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -675,7 +675,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
long nListboxYPos =
Max( aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height(),
aEdRow.GetPosPixel().Y() + aEdRow.GetSizePixel().Height() ) + 4;
- aLbEntries.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y);
+ aLbEntries.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y);
nBorderOffset = aLbEntries.GetPosPixel().X();
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 049fa9f..f062039 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 6d8a311..172a36f 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 7a06ae4..fb7fc9f 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;
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index b82f41c..3cef9c9 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -589,7 +589,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
return false;
awt::Rectangle aCanvasArea = mxView->getCanvasArea();
- pWindow->SetPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height);
+ pWindow->setPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height);
GLWin.Width = aCanvasArea.Width;
GLWin.Height = aCanvasArea.Height;
OSL_TRACE("canvas area: %d,%d - %dx%d", aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height);
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index 4778bd9..00e8cd9 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 6da6386..5aa3feb 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2382,7 +2382,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 ddf8fdd..cd47e51 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -174,8 +174,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 a922241..4657e31 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2330,7 +2330,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 95d5e6b..f8327bb 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 66e7c73..82ded06 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/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index beb2153..7a4a8cc 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -454,22 +454,22 @@ void ImpSvMEdit::Resize()
if ( !mpHScrollBar )
mpTextWindow->GetTextEngine()->SetMaxTextWidth( aSz.Width() );
else
- mpHScrollBar->SetPosSizePixel( 0, aEditSize.Height()-nSBWidth, aSz.Width(), nSBWidth );
+ mpHScrollBar->setPosSizePixel( 0, aEditSize.Height()-nSBWidth, aSz.Width(), nSBWidth );
Point aTextWindowPos( maTextWindowOffset );
if ( mpVScrollBar )
{
if( Application::GetSettings().GetLayoutRTL() )
{
- mpVScrollBar->SetPosSizePixel( 0, 0, nSBWidth, aSz.Height() );
+ mpVScrollBar->setPosSizePixel( 0, 0, nSBWidth, aSz.Height() );
aTextWindowPos.X() += nSBWidth;
}
else
- mpVScrollBar->SetPosSizePixel( aEditSize.Width()-nSBWidth, 0, nSBWidth, aSz.Height() );
+ mpVScrollBar->setPosSizePixel( aEditSize.Width()-nSBWidth, 0, nSBWidth, aSz.Height() );
}
if ( mpScrollBox )
- mpScrollBox->SetPosSizePixel( aSz.Width(), aSz.Height(), nSBWidth, nSBWidth );
+ mpScrollBox->setPosSizePixel( aSz.Width(), aSz.Height(), nSBWidth, nSBWidth );
Size aTextWindowSize( aSz );
aTextWindowSize.Width() -= maTextWindowOffset.X();
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 4f24e4e..fd026b7 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 ) );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 4ba87f3..409d5cb 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -494,7 +494,7 @@ void SvxShowCharSet::SetFont( const Font& rFont )
if( bNeedVscroll)
{
- aVscrollSB.SetPosSizePixel( nX * COLUMN_COUNT, 0, SBWIDTH, nY * ROW_COUNT );
+ aVscrollSB.setPosSizePixel( nX * COLUMN_COUNT, 0, SBWIDTH, nY * ROW_COUNT );
aVscrollSB.SetRangeMin( 0 );
int nLastRow = (maFontCharMap.GetCharCount() - 1 + COLUMN_COUNT) / COLUMN_COUNT;
aVscrollSB.SetRangeMax( nLastRow );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 32685fa..75368e5 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -634,7 +634,7 @@ PluginProgressWindow::PluginProgressWindow( Window*
Show();
Size aParentSize = pParent->GetSizePixel();
// align the progressbar to its parent
- SetPosSizePixel( -9, 0, aParentSize.Width() + 15, aParentSize.Height() - 4 );
+ setPosSizePixel( -9, 0, aParentSize.Width() + 15, aParentSize.Height() - 4 );
}
//===============================================
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4ad989c..04cc179 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1334,7 +1334,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame
{
}
- m_aLineStyleLb.SetPosSizePixel( 2, 2, 110, 140 );
+ m_aLineStyleLb.setPosSizePixel( 2, 2, 110, 140 );
SetOutputSizePixel( Size( 114, 144 ) );
m_aLineStyleLb.SetSourceUnit( FUNIT_TWIP );
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index fb9d0c9..9997a31 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -602,11 +602,11 @@ void SwSidebarWin::DoResize()
{
const Size aSizeOfMetadataControls( GetSizePixel().Width() - GetMetaButtonAreaWidth(),
GetMetaHeight()/2 );
- mpMetadataAuthor->SetPosSizePixel( 0,
+ mpMetadataAuthor->setPosSizePixel( 0,
aHeight,
aSizeOfMetadataControls.Width(),
aSizeOfMetadataControls.Height() );
- mpMetadataDate->SetPosSizePixel( 0,
+ mpMetadataDate->setPosSizePixel( 0,
aHeight + aSizeOfMetadataControls.Height(),
aSizeOfMetadataControls.Width(),
aSizeOfMetadataControls.Height() );
@@ -621,15 +621,15 @@ void SwSidebarWin::DoResize()
if (!Application::GetSettings().GetLayoutRTL())
{
- mpSidebarTxtControl->SetPosSizePixel(0, 0, aWidth, aHeight);
- mpVScrollbar->SetPosSizePixel( aWidth, 0, GetScrollbarWidth(), aHeight);
+ mpSidebarTxtControl->setPosSizePixel(0, 0, aWidth, aHeight);
+ mpVScrollbar->setPosSizePixel( aWidth, 0, GetScrollbarWidth(), aHeight);
}
else
{
- mpSidebarTxtControl->SetPosSizePixel( ( (aTextHeight > aHeight) && !IsPreview()
+ mpSidebarTxtControl->setPosSizePixel( ( (aTextHeight > aHeight) && !IsPreview()
? GetScrollbarWidth() : 0 ) , 0,
aWidth, aHeight);
- mpVScrollbar->SetPosSizePixel( 0, 0, GetScrollbarWidth(), aHeight);
+ mpVScrollbar->setPosSizePixel( 0, 0, GetScrollbarWidth(), aHeight);
}
mpVScrollbar->SetVisibleSize( PixelToLogic(Size(0,aHeight)).Height() );
@@ -663,7 +663,7 @@ void SwSidebarWin::DoResize()
{
const Rectangle aRectMetaButtonPixel( LogicToPixel( aRectMetaButton ) );
- mpMenuButton->SetPosSizePixel( aRectMetaButtonPixel.Left(),
+ mpMenuButton->setPosSizePixel( aRectMetaButtonPixel.Left(),
aRectMetaButtonPixel.Top(),
aRectMetaButtonPixel.GetWidth(),
aRectMetaButtonPixel.GetHeight() );
diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx
index 2bc813a..c73f9f7 100644
--- a/sw/source/ui/inc/scroll.hxx
+++ b/sw/source/ui/inc/scroll.hxx
@@ -40,7 +40,6 @@ class SwScrollbar: public ScrollBar
void AutoShow();
using Window::Hide;
- using Window::SetPosSizePixel;
using Window::IsVisible;
public:
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 827b47e..0196bb8 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -691,7 +691,7 @@ void SwNavigationPI::Resize()
// GlobalTree faengt weiter oben an und reicht bis ganz unten
aNewSize.Height() += (nDist + nDocLBIniHeight + aPos.Y() - aGlobalTree.GetPosPixel().Y());
aGlobalTree.SetSizePixel(aNewSize);
- aDocListBox.SetPosSizePixel( aLBPos.X(), aLBPos.Y(),
+ aDocListBox.setPosSizePixel( aLBPos.X(), aLBPos.Y(),
aDocLBSz.Width(), aDocLBSz.Height(),
WINDOW_POSSIZE_X|WINDOW_POSSIZE_Y|WINDOW_POSSIZE_WIDTH);
@@ -809,7 +809,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
)
((SfxDockingWindow*)pParent)->SetOutputSizePixel(aMinSize);
- aContentTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
+ aContentTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
aContentTree.SetStyle( aContentTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aContentTree.SetSpaceBetweenEntries(3);
@@ -822,7 +822,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, sal_True);
// TreeListBox fuer Globaldokument
- aGlobalTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
+ aGlobalTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION );
aGlobalTree.SetStyle( aGlobalTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
WB_CLIPCHILDREN|WB_HSCROLL );
diff --git a/sw/source/ui/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx
index 3293b25..7b2de85 100644
--- a/sw/source/ui/utlui/textcontrolcombo.cxx
+++ b/sw/source/ui/utlui/textcontrolcombo.cxx
@@ -75,7 +75,7 @@ void TextControlCombo::Arrange( FixedText& _rFTcomplete, sal_Bool /*bShow*/ )
long nWidth = GetTextWidth( aTxtBefore );
mrFTbefore.SetText( aTxtBefore );
- mrFTbefore.SetPosSizePixel( nX, nYFT, nWidth, nTextHeight );
+ mrFTbefore.setPosSizePixel( nX, nYFT, nWidth, nTextHeight );
nX += nWidth;
nX += aMetricVals.Width();
@@ -84,7 +84,7 @@ void TextControlCombo::Arrange( FixedText& _rFTcomplete, sal_Bool /*bShow*/ )
nX += mrCtrl.GetSizePixel().Width();
nX += aMetricVals.Width();
mrFTafter.SetText( aTxtAfter );
- mrFTafter.SetPosSizePixel( nX, nYFT, GetTextWidth( aTxtAfter ), nTextHeight );
+ mrFTafter.setPosSizePixel( nX, nYFT, GetTextWidth( aTxtAfter ), nTextHeight );
_rFTcomplete.Hide();
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index a2092ea..309d7f6 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1011,7 +1011,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
if( Window::GetDockingManager()->IsDockable( GetWindow() ) )
Window::GetDockingManager()->SetPosSizePixel( GetWindow() , X, Y, Width, Height, Flags );
else
- GetWindow()->SetPosSizePixel( X, Y, Width, Height, Flags );
+ GetWindow()->setPosSizePixel( X, Y, Width, Height, Flags );
}
}
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 34eb6ef..ba2ba82 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 85d4e20..78fd8a8 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 5f24ee8..a56f12b 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -59,7 +59,6 @@ private:
sal_Bool mbInClose;
sal_Bool mbModalMode;
sal_Int8 mnCancelClose; //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event
- int m_nBorderWidth;
Timer maLayoutTimer;
SAL_DLLPRIVATE void ImplInitDialogData();
@@ -104,16 +103,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 7726e9f..5b16b84 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 1d1653a..9c89ce9 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 ba5ef31..314f8d7 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 c8c92c6..b974302 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -199,9 +199,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 ceac501..088ef04 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 8ef3ce4..653bf7d 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)
@@ -843,7 +843,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 );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d806063..abe52a3 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1172,7 +1172,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet )
ImplGetButtonState() &= ~BUTTON_DRAW_DEFAULT;
}
if( bSetPos )
- SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+ setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
Invalidate();
}
@@ -3707,7 +3707,7 @@ void CheckBox::GetFocus()
aPos.Move(-1,-1);
aSize.Height() += 2;
aSize.Width() += 2;
- SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+ setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
ImplDrawCheckBox();
}
else
@@ -3739,7 +3739,7 @@ void CheckBox::LoseFocus()
aPos.Move(1,1);
aSize.Height() -= 2;
aSize.Width() -= 2;
- SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
+ setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height(), WINDOW_POSSIZE_ALL );
ImplDrawCheckBox();
}
}
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 09c27e3..b62d553 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -578,7 +578,7 @@ sal_uInt16 ComboBox::GetDropDownLineCount() const
// -----------------------------------------------------------------------
-void ComboBox::SetPosSizePixel( long nX, long nY, long nWidth, long nHeight,
+void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags )
{
if( IsDropDownBox() && ( nFlags & WINDOW_POSSIZE_SIZE ) )
@@ -594,7 +594,7 @@ void ComboBox::SetPosSizePixel( long nX, long nY, long nWidth, long nHeight,
nHeight = mnDDHeight;
}
- Edit::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ Edit::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
// -----------------------------------------------------------------------
@@ -624,7 +624,7 @@ void ComboBox::Resize()
aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) );
aContent.Move(-aPoint.X(), -aPoint.Y());
- mpBtn->SetPosSizePixel( aContent.Left(), nTop, aContent.getWidth(), (nBottom-nTop) );
+ mpBtn->setPosSizePixel( aContent.Left(), nTop, aContent.getWidth(), (nBottom-nTop) );
// adjust the size of the edit field
if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT,
@@ -648,13 +648,13 @@ void ComboBox::Resize()
long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
nSBWidth = CalcZoom( nSBWidth );
mpSubEdit->SetPosSizePixel( Point( 0, 0 ), Size( aOutSz.Width() - nSBWidth, aOutSz.Height() ) );
- mpBtn->SetPosSizePixel( aOutSz.Width() - nSBWidth, nTop, nSBWidth, (nBottom-nTop) );
+ mpBtn->setPosSizePixel( aOutSz.Width() - nSBWidth, nTop, nSBWidth, (nBottom-nTop) );
}
}
else
{
mpSubEdit->SetSizePixel( Size( aOutSz.Width(), mnDDHeight ) );
- mpImplLB->SetPosSizePixel( 0, mnDDHeight, aOutSz.Width(), aOutSz.Height() - mnDDHeight );
+ mpImplLB->setPosSizePixel( 0, mnDDHeight, aOutSz.Width(), aOutSz.Height() - mnDDHeight );
if ( GetText().Len() )
ImplUpdateFloatSelection();
}
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 425fcdd..1d0c146 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3141,9 +3141,9 @@ long ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
// -----------------------------------------------------------------------
-void ImplListBoxFloatingWindow::SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
+void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
{
- FloatingWindow::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
// Fix #60890# ( MBA ): um auch im aufgeklappten Zustand der Listbox die Gr"o\se einfach zu einen
// Aufruf von Resize() "andern zu k"onnen, wird die Position hier ggf. angepa\t
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 8a24b9f..8befa6f 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -652,7 +652,7 @@ sal_uInt16 ListBox::GetDropDownLineCount() const
// -----------------------------------------------------------------------
-void ListBox::SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
+void ListBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
{
if( IsDropDownBox() && ( nFlags & WINDOW_POSSIZE_SIZE ) )
{
@@ -667,7 +667,7 @@ void ListBox::SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_
nHeight = mnDDHeight;
}
- Control::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ Control::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
// -----------------------------------------------------------------------
@@ -700,7 +700,7 @@ void ListBox::Resize()
// use the themes drop down size for the button
aOutSz.Width() = aContent.Left();
- mpBtn->SetPosSizePixel( aContent.Left(), nTop, aContent.Right(), (nBottom-nTop) );
+ mpBtn->setPosSizePixel( aContent.Left(), nTop, aContent.Right(), (nBottom-nTop) );
// adjust the size of the edit field
if ( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT,
@@ -729,8 +729,8 @@ void ListBox::Resize()
else
{
nSBWidth = CalcZoom( nSBWidth );
- mpImplWin->SetPosSizePixel( 0, 0, aOutSz.Width() - nSBWidth, aOutSz.Height() );
- mpBtn->SetPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() );
+ mpImplWin->setPosSizePixel( 0, 0, aOutSz.Width() - nSBWidth, aOutSz.Height() );
+ mpBtn->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() );
}
}
else
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 9a3e2f9..07ddec6 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1317,6 +1317,13 @@ void TabControl::SetSizePixel(const Size& rNewSize)
setAllocation(rNewSize);
}
+void TabControl::SetPosPixel(const Point& rPos)
+{
+ Window::SetPosPixel(rPos);
+ if (mbLayoutDirty)
+ setAllocation(GetOutputSizePixel());
+}
+
void TabControl::Resize()
{
setAllocation(Control::GetOutputSizePixel());
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index d5df2af..79e20d1 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -904,10 +904,10 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
{
// no move (only resize) if position did not change
if( aOldPos != aNewRect.TopLeft() )
- pBorderWindow->SetPosSizePixel( aNewRect.Left(), aNewRect.Top(),
+ pBorderWindow->setPosSizePixel( aNewRect.Left(), aNewRect.Top(),
aNewRect.GetWidth(), aNewRect.GetHeight(), WINDOW_POSSIZE_POSSIZE );
else
- pBorderWindow->SetPosSizePixel( aNewRect.Left(), aNewRect.Top(),
+ pBorderWindow->setPosSizePixel( aNewRect.Left(), aNewRect.Top(),
aNewRect.GetWidth(), aNewRect.GetHeight(), WINDOW_POSSIZE_SIZE );
pBorderWindow->ImplUpdateAll();
@@ -2066,7 +2066,7 @@ void ImplBorderWindow::Resize()
nMenuHeight = mnOrgMenuHeight;
}
mpBorderView->GetBorder( nLeftBorder, nTopBorder, nRightBorder, nBottomBorder );
- mpMenuBarWindow->SetPosSizePixel( nLeftBorder,
+ mpMenuBarWindow->setPosSizePixel( nLeftBorder,
nTopBorder,
aSize.Width()-nLeftBorder-nRightBorder,
nMenuHeight,
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3574af1..72e3af2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -354,7 +354,6 @@ void Dialog::ImplInitDialogData()
mbInClose = sal_False;
mbModalMode = sal_False;
mnMousePositioned = 0;
- m_nBorderWidth = 0;
mpDialogImpl = new DialogImpl;
//To-Do, reuse maResizeTimer
@@ -1171,7 +1170,7 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal
{
ImplBorderWindow aImplWin( this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP );
aImplWin.SetText( GetText() );
- aImplWin.SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() );
+ aImplWin.setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() );
aImplWin.SetDisplayActive( sal_True );
aImplWin.InitView();
@@ -1195,23 +1194,27 @@ Size Dialog::GetOptimalSize(WindowSizeType eType) const
Size aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType);
+ sal_Int32 nBorderWidth = get_border_width();
+
aSize.Height() += mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
- + 2*m_nBorderWidth;
+ + 2*nBorderWidth;
aSize.Width() += mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
- + 2*m_nBorderWidth;
+ + 2*nBorderWidth;
return Window::CalcWindowSize(aSize);
}
void Dialog::setPosSizeOnContainee(Size aSize, VclContainer &rBox)
{
+ sal_Int32 nBorderWidth = get_border_width();
+
aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
- + 2 * m_nBorderWidth;
+ + 2 * nBorderWidth;
aSize.Height() -= mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
- + 2 * m_nBorderWidth;
+ + 2 * nBorderWidth;
- Point aPos(mpWindowImpl->mnLeftBorder + m_nBorderWidth,
- mpWindowImpl->mnTopBorder + m_nBorderWidth);
+ Point aPos(mpWindowImpl->mnLeftBorder + nBorderWidth,
+ mpWindowImpl->mnTopBorder + nBorderWidth);
rBox.SetPosSizePixel(aPos, aSize);
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 2fd7193..ac7ed59 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -82,8 +82,7 @@ public:
virtual void PopupModeEnd();
virtual void Resizing( Size& rSize );
virtual sal_Bool Close();
- using Window::SetPosSizePixel;
- virtual void SetPosSizePixel( long nX, long nY,
+ virtual void setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
@@ -286,11 +285,11 @@ void ImplDockFloatWin2::Resize()
}
}
-void ImplDockFloatWin2::SetPosSizePixel( long nX, long nY,
+void ImplDockFloatWin2::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags )
{
- FloatingWindow::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
// -----------------------------------------------------------------------
@@ -491,7 +490,7 @@ void DockingManager::SetPosSizePixel( Window *pWindow, long nX, long nY,
{
ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
if( pWrapper )
- pWrapper->SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ pWrapper->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
Rectangle DockingManager::GetPosSizePixel( const Window *pWindow )
@@ -1436,14 +1435,14 @@ WinBits ImplDockingWindowWrapper::GetFloatStyle() const
// -----------------------------------------------------------------------
-void ImplDockingWindowWrapper::SetPosSizePixel( long nX, long nY,
+void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags )
{
if ( mpFloatWin )
- mpFloatWin->SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ mpFloatWin->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
else
- GetWindow()->SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ GetWindow()->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index a98b994..e5a7c6c 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -919,7 +919,7 @@ WinBits DockingWindow::GetFloatStyle() const
// -----------------------------------------------------------------------
-void DockingWindow::SetPosSizePixel( long nX, long nY,
+void DockingWindow::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight,
sal_uInt16 nFlags )
{
@@ -927,16 +927,16 @@ void DockingWindow::SetPosSizePixel( long nX, long nY,
if( pWrapper )
{
if ( pWrapper->mpFloatWin )
- pWrapper->mpFloatWin->SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ pWrapper->mpFloatWin->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
else
- Window::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ Window::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
return;
}
if ( mpFloatWin )
- mpFloatWin->SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ mpFloatWin->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
else
- Window::SetPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
+ Window::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3b4ac0d..8ccca60 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3311,7 +3311,7 @@ Window* MenuBar::ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu )
( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
nHeight = 0;
- pWindow->SetPosSizePixel( 0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT );
+ pWindow->setPosSizePixel( 0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT );
return pWindow;
}
@@ -5815,19 +5815,19 @@ void MenuBarWindow::Resize()
Size aTbxSize( aCloser.CalcWindowSizePixel() );
nX -= aTbxSize.Width();
long nTbxY = (aOutSz.Height() - aTbxSize.Height())/2;
- aCloser.SetPosSizePixel( nX, nTbxY, aTbxSize.Width(), aTbxSize.Height() );
+ aCloser.setPosSizePixel( nX, nTbxY, aTbxSize.Width(), aTbxSize.Height() );
nX -= 3;
aCloser.Show();
}
if ( aFloatBtn.IsVisible() )
{
nX -= n;
- aFloatBtn.SetPosSizePixel( nX, nY, n, n );
+ aFloatBtn.setPosSizePixel( nX, nY, n, n );
}
if ( aHideBtn.IsVisible() )
{
nX -= n;
- aHideBtn.SetPosSizePixel( nX, nY, n, n );
+ aHideBtn.setPosSizePixel( nX, nY, n, n );
}
aFloatBtn.SetSymbol( SYMBOL_FLOAT );
@@ -5897,7 +5897,7 @@ void MenuBarWindow::ImplLayoutChanged()
( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
nHeight = 0;
- SetPosSizePixel( 0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT );
+ setPosSizePixel( 0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT );
GetParent()->Resize();
Invalidate();
Resize();
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a7a8ce0..4fe682a 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -805,7 +805,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
nY = 0;
if( nY + nHeight > (long) rGeom.nHeight )
nY = rGeom.nHeight - nHeight;
- SetPosSizePixel( nX, nY, nWidth, nHeight, nPosSize );
+ setPosSizePixel( nX, nY, nWidth, nHeight, nPosSize );
maOrgSize = Size( nWidth, nHeight );
// 91625 - ignore Minimize
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 6a04f6e..e2efaea 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -149,7 +149,7 @@ void TabDialog::ImplPosControls()
nBtnEx = aViewSize.Width()+IMPL_DIALOG_OFFSET;
}
- mpViewWindow->SetPosSizePixel( nViewOffX, nViewOffY,
+ mpViewWindow->setPosSizePixel( nViewOffX, nViewOffY,
nViewWidth, nViewHeight,
nViewPosFlags );
}
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index c9f5fff..d3395fd 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -237,4 +237,18 @@ void TabPage::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation)
GetWindow(WINDOW_FIRSTCHILD)->SetPosSizePixel(Point(0, 0), rAllocation);
}
+void TabPage::SetSizePixel(const Size& rAllocation)
+{
+ Window::SetSizePixel(rAllocation);
+ if (isLayoutEnabled())
+ GetWindow(WINDOW_FIRSTCHILD)->SetPosSizePixel(Point(0, 0), rAllocation);
+}
+
+void TabPage::SetPosPixel(const Point& rAllocPos)
+{
+ Window::SetPosPixel(rAllocPos);
+ if (isLayoutEnabled())
+ GetWindow(WINDOW_FIRSTCHILD)->SetPosSizePixel(Point(0, 0), GetOutputSizePixel());
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8fc4948..89470d3 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5510,7 +5510,7 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
// set us to the position and size of our previous border
Point aBorderPos( pBorderWin->GetPosPixel() );
Size aBorderSize( pBorderWin->GetSizePixel() );
- SetPosSizePixel( aBorderPos.X(), aBorderPos.Y(), aBorderSize.Width(), aBorderSize.Height() );
+ setPosSizePixel( aBorderPos.X(), aBorderPos.Y(), aBorderSize.Width(), aBorderSize.Height() );
// release border window
delete pBorderWin;
@@ -7066,7 +7066,7 @@ void Window::EnableAlwaysOnTop( sal_Bool bEnable )
// -----------------------------------------------------------------------
-void Window::SetPosSizePixel( long nX, long nY,
+void Window::setPosSizePixel( long nX, long nY,
long nWidth, long nHeight, sal_uInt16 nFlags )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 4ebad1f..bb7aa5a 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1719,18 +1719,18 @@ VCLXWindow* Window::GetWindowPeer() const
void Window::SetPosPixel( const Point& rNewPos )
{
- SetPosSizePixel( rNewPos.X(), rNewPos.Y(), 0, 0, WINDOW_POSSIZE_POS );
+ setPosSizePixel( rNewPos.X(), rNewPos.Y(), 0, 0, WINDOW_POSSIZE_POS );
}
void Window::SetSizePixel( const Size& rNewSize )
{
- SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(),
+ setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(),
WINDOW_POSSIZE_SIZE );
}
void Window::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
{
- SetPosSizePixel( rNewPos.X(), rNewPos.Y(),
+ setPosSizePixel( rNewPos.X(), rNewPos.Y(),
rNewSize.Width(), rNewSize.Height(),
WINDOW_POSSIZE_POSSIZE );
}
More information about the Libreoffice-commits
mailing list