summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /svx/source/fmcomp
parent17d821af6bb9df93569836a92f6bed975587fc6c (diff)
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle" Except some modules have their own foo::tools namespace, so there have to use ::tools::Rectangle. This commit just moves the class from the global namespace, it does not update pre/postwin.h yet. Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2 Reviewed-on: https://gerrit.libreoffice.org/35923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'svx/source/fmcomp')
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx4
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx18
-rw-r--r--svx/source/fmcomp/gridctrl.cxx12
4 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 1c08880b0ef8..8a40701f5bea 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -180,7 +180,7 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt )
{
if ( rHEvt.GetMode() & (HelpEventMode::QUICK | HelpEventMode::BALLOON) )
{
- Rectangle aItemRect = GetItemRect( nItemId );
+ tools::Rectangle aItemRect = GetItemRect( nItemId );
Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );
aItemRect.Left() = aPt.X();
aItemRect.Top() = aPt.Y();
@@ -1058,7 +1058,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
{
sal_uInt16 nSelId = GetColumnId(
sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
- ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
+ ::tools::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
pMyHeader->triggerColumnContextMenu(aRelativePos);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 36b5bf9ee82e..3a8b87f7d5f5 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1464,7 +1464,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt)
if (bWasEditing)
pGrid->DeactivateCell();
- ::Rectangle aColRect = pGrid->GetFieldRect(nId);
+ ::tools::Rectangle aColRect = pGrid->GetFieldRect(nId);
aColRect.Top() = 0;
aColRect.Bottom() = pGrid->GetSizePixel().Height();
pGrid->Invalidate(aColRect);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index a2a8960146dd..a6485c72fd0a 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -450,7 +450,7 @@ Reference< css::sdb::XColumn > DbGridColumn::GetCurrentFieldValue() const
void DbGridColumn::Paint(OutputDevice& rDev,
- const Rectangle& rRect,
+ const tools::Rectangle& rRect,
const DbGridRow* pRow,
const Reference< XNumberFormatter >& xFormatter)
{
@@ -951,7 +951,7 @@ void DbCellControl::AlignControl(sal_Int16 nAlignment)
}
-void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
+void DbCellControl::PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect )
{
if ( m_pPainter->GetParent() == &_rDev )
{
@@ -978,7 +978,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
}
-void DbCellControl::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
+void DbCellControl::PaintFieldToCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
{
m_pPainter->SetText( GetFormatText( _rxField, _rxFormatter ) );
PaintCell( _rDev, _rRect );
@@ -1141,7 +1141,7 @@ CellControllerRef DbTextField::CreateController() const
}
-void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
+void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
{
if ( m_pPainterImplementation )
m_pPainterImplementation->SetText( GetFormatText( _rxField, _rxFormatter ) );
@@ -1680,7 +1680,7 @@ void DbCheckBox::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField,
}
-void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
+void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rRect,
const Reference< css::sdb::XColumn >& _rxField,
const Reference< XNumberFormatter >& xFormatter)
{
@@ -2677,7 +2677,7 @@ DbFilterField::~DbFilterField()
}
-void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
+void DbFilterField::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect)
{
static const DrawTextFlags nStyle = DrawTextFlags::Clip | DrawTextFlags::VCenter | DrawTextFlags::Left;
switch (m_nControlClass)
@@ -3486,7 +3486,7 @@ void FmXGridCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window&
}
-void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
+void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rRect,
const Reference< css::sdb::XColumn >& _rxField,
const Reference< XNumberFormatter >& xFormatter)
{
@@ -3510,7 +3510,7 @@ FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl )
void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
- const Rectangle& rRect,
+ const tools::Rectangle& rRect,
const Reference< css::sdb::XColumn >& _rxField,
const Reference< XNumberFormatter >& xFormatter)
{
@@ -4563,7 +4563,7 @@ const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId()
}
-void FmXFilterCell::PaintCell( OutputDevice& rDev, const Rectangle& rRect )
+void FmXFilterCell::PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect )
{
static_cast< DbFilterField* >( m_pCellControl )->PaintCell( rDev, rRect );
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e04a5499c314..0dc400b43024 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -424,7 +424,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
{
// positioning of the controls
// calculate base size
- Rectangle aRect(static_cast<DbGridControl*>(GetParent())->GetControlArea());
+ tools::Rectangle aRect(static_cast<DbGridControl*>(GetParent())->GetControlArea());
long nH = aRect.GetSize().Height();
long nW = GetParent()->GetOutputSizePixel().Width();
Size aBorder = LogicToPixel(Size(2, 2),MapUnit::MapAppFont);
@@ -770,7 +770,7 @@ void DbGridControl::NavigationBar::Resize()
ArrangeControls();
}
-void DbGridControl::NavigationBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void DbGridControl::NavigationBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
Control::Paint(rRenderContext, rRect);
Point aAbsolutePos = m_aAbsolute->GetPosPixel();
@@ -1198,7 +1198,7 @@ void DbGridControl::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY)
// positioning of the controls
if (m_bNavigationBar)
{
- Rectangle aRect(GetControlArea());
+ tools::Rectangle aRect(GetControlArea());
m_aBar->SetPosSizePixel(Point(0, nY + 1), Size(aRect.GetSize().Width(), aRect.GetSize().Height() - 1));
nX = m_aBar->ArrangeControls();
}
@@ -2034,7 +2034,7 @@ svt::EditBrowseBox::RowStatus DbGridControl::GetRowStatus(long nRow) const
return EditBrowseBox::CLEAN;
}
-void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
+void DbGridControl::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const
{
if (!IsValid(m_xPaintRow))
return;
@@ -2043,7 +2043,7 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI
DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
if (pColumn)
{
- Rectangle aArea(rRect);
+ tools::Rectangle aArea(rRect);
if ((GetMode() & BrowserMode::CURSOR_WO_FOCUS) == BrowserMode::CURSOR_WO_FOCUS)
{
aArea.Top() += 1;
@@ -2850,7 +2850,7 @@ void DbGridControl::Command(const CommandEvent& rEvt)
{
long nRow = FirstSelectedRow( );
- ::Rectangle aRowRect( GetRowRectPixel( nRow ) );
+ ::tools::Rectangle aRowRect( GetRowRectPixel( nRow ) );
executeRowContextMenu( nRow, aRowRect.LeftCenter() );
// handled