diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-12 09:46:46 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-12 09:46:46 +0200 |
commit | 5a2cfa677356f77cda15365dd9107ce503e11dd4 (patch) | |
tree | 8c6c2dab7dbde2ee766e2869cbeb1062d0d88d1a /sc/source | |
parent | 3ce934bfc910af626baa985fa37f9a7ee08ad473 (diff) |
Abbreviate Rectangle as Rect, not Rec
Change-Id: If38a5d23150bcd19a6eb6024c2ef1eea826898f5
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/navipi.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/tphfedit.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/navipi/scenwnd.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin2.cxx | 8 |
9 files changed, 25 insertions, 25 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 0e6e3f26dcdb..7d7be795696d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3137,14 +3137,14 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) if( rMyCell.bHasShape && !rMyCell.aShapeList.empty() && pDoc ) { awt::Point aPoint; - Rectangle aRec = pDoc->GetMMRect(static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), + Rectangle aRect = pDoc->GetMMRect(static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), static_cast<SCTAB>(rMyCell.aCellAddress.Sheet)); bool bNegativePage(pDoc->IsNegativePage(rMyCell.aCellAddress.Sheet)); if (bNegativePage) - aPoint.X = aRec.Right(); + aPoint.X = aRect.Right(); else - aPoint.X = aRec.Left(); - aPoint.Y = aRec.Top(); + aPoint.X = aRect.Left(); + aPoint.Y = aRect.Top(); ScMyShapeList::const_iterator aItr = rMyCell.aShapeList.begin(); ScMyShapeList::const_iterator aEndItr(rMyCell.aShapeList.end()); while (aItr != aEndItr) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index fb85f3d18265..6ada63d7fdff 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1149,7 +1149,7 @@ ScMultiTextWnd::~ScMultiTextWnd() { } -void ScMultiTextWnd::Paint( const Rectangle& rRec ) +void ScMultiTextWnd::Paint( const Rectangle& rRect ) { EditView* pView = GetEditView(); if ( pView ) @@ -1159,7 +1159,7 @@ void ScMultiTextWnd::Paint( const Rectangle& rRec ) pView->Invalidate(); mbInvalidate = false; } - pEditView->Paint( rRec ); + pEditView->Paint( rRect ); } } @@ -1483,10 +1483,10 @@ ScTextWnd::~ScTextWnd() delete pEditEngine; } -void ScTextWnd::Paint( const Rectangle& rRec ) +void ScTextWnd::Paint( const Rectangle& rRect ) { if (pEditView) - pEditView->Paint( rRec ); + pEditView->Paint( rRect ); else { SetFont( aTextFont ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index cec8377d8f66..8cd54f5ed0b2 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -90,7 +90,7 @@ public: DECL_LINK( NotifyHdl, void* ); protected: - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRect ); virtual void Resize(); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -187,7 +187,7 @@ protected: void SetScrollBarRange(); void InitEditEngine(); - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRect ); DECL_LINK( NotifyHdl, EENotify* ); DECL_LINK( ModifyHdl, EENotify* ); private: @@ -207,7 +207,7 @@ public: virtual ~ScInputBarGroup(); virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); -// virtual void Paint(const Rectangle& rRec ); +// virtual void Paint(const Rectangle& rRect ); void SetTextString( const String& rString ); void StartEditEngine(); EditView* GetEditView(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 9f45d2fd44d4..41eba6064a0b 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -111,7 +111,7 @@ public: protected: - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRect ); private: ScScenarioListBox aLbScenario; @@ -315,7 +315,7 @@ private: protected: virtual void Resize(); - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRect ); virtual void Resizing( Size& rSize ); public: diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index eade33bd2ad3..79a38c5f29de 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -73,7 +73,7 @@ public: inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;} protected: - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRect ); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index b5379a423523..43ab289aee08 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -768,7 +768,7 @@ void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? -void ScNavigatorDlg::Paint( const Rectangle& rRec ) +void ScNavigatorDlg::Paint( const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetFaceColor(); @@ -778,7 +778,7 @@ void ScNavigatorDlg::Paint( const Rectangle& rRec ) aFtCol.SetBackground( aBack ); aFtRow.SetBackground( aBack ); - Window::Paint( rRec ); + Window::Paint( rRect ); } void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index b2197b8278dd..4ecce70c33cd 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -233,14 +233,14 @@ ScScenarioWindow::~ScScenarioWindow() { } -void ScScenarioWindow::Paint( const Rectangle& rRec ) +void ScScenarioWindow::Paint( const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetFaceColor(); SetBackground( aBgColor ); - Window::Paint( rRec ); + Window::Paint( rRect ); } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index e7a9e3ac27cb..0ae46f3a905f 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -221,7 +221,7 @@ void ScEditWindow::SetCharAttriutes() // ----------------------------------------------------------------------- -void ScEditWindow::Paint( const Rectangle& rRec ) +void ScEditWindow::Paint( const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetWindowColor(); @@ -230,9 +230,9 @@ void ScEditWindow::Paint( const Rectangle& rRec ) SetBackground( aBgColor ); - Control::Paint( rRec ); + Control::Paint( rRect ); - pEdView->Paint( rRec ); + pEdView->Paint( rRect ); } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 79f2f081d0ef..150d3858392b 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -136,8 +136,8 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& Point aPopupPos; Size aPopupSize; mpFilterButton->getPopupBoundingBox(aPopupPos, aPopupSize); - Rectangle aRec(aPopupPos, aPopupSize); - if (aRec.IsInside(rMEvt.GetPosPixel())) + Rectangle aRect(aPopupPos, aPopupSize); + if (aRect.IsInside(rMEvt.GetPosPixel())) { if ( DoPageFieldSelection( nCol, nRow ) ) return true; @@ -374,8 +374,8 @@ bool ScGridWindow::DPTestFieldPopupArrow( Point aPopupPos; Size aPopupSize; aBtn.getPopupBoundingBox(aPopupPos, aPopupSize); - Rectangle aRec(aPopupPos, aPopupSize); - if (aRec.IsInside(rMEvt.GetPosPixel())) + Rectangle aRect(aPopupPos, aPopupSize); + if (aRect.IsInside(rMEvt.GetPosPixel())) { // Mouse cursor inside the popup arrow box. Launch the field menu. DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, rDimPos, pDPObj); |