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 /reportdesign | |
parent | add left/right/top/bottom margin support (diff) | |
download | core-2f002e3a49da3fb797d564864acb34f6dc61f9de.tar.gz core-2f002e3a49da3fb797d564864acb34f6dc61f9de.zip |
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 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 0942580540c1..ec341d1c1c3b 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -181,7 +181,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& ) { @@ -339,7 +339,7 @@ namespace rptui ++cond ) { - (*cond)->SetPosSizePixel( aConditionPos.X(), aConditionPos.Y(), nConditionWidth, nConditionHeight ); + (*cond)->setPosSizePixel( aConditionPos.X(), aConditionPos.Y(), nConditionWidth, nConditionHeight ); aConditionPos.Move( 0, nConditionHeight ); } } @@ -352,24 +352,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 bbe7e3b29ca2..f2883654ef63 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 ); |