diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign')
13 files changed, 46 insertions, 46 deletions
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index a14d86e50c7d..8745e1c67714 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -38,21 +38,21 @@ namespace @param _rBase the base point @param _aVector the vector which will be added */ - inline Rectangle calcRect(const Point& _rBase,const Point& _aVector) + inline tools::Rectangle calcRect(const Point& _rBase,const Point& _aVector) { - return Rectangle( _rBase - _aVector, _rBase + _aVector ); + return tools::Rectangle( _rBase - _aVector, _rBase + _aVector ); } /** GetTextPos calculate the rectangle for the connection to be drawn @param _pWin the table window where to draw it @param _aConnPos the connection point @param _aDescrLinePos the description line pos */ - Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) + tools::Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) { VclPtr<OTableWindowListBox> pListBox = _pWin ? _pWin->GetListBox() : nullptr; OSL_ENSURE(_pWin && pListBox, "OConnectionLine::GetSourceTextPos : invalid call !"); - Rectangle aReturn; + tools::Rectangle aReturn; if ( pListBox ) { const long nRowHeight = pListBox->GetEntryHeight(); @@ -145,10 +145,10 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine ) return *this; } -Rectangle OConnectionLine::GetBoundingRect() +tools::Rectangle OConnectionLine::GetBoundingRect() { // determine surrounding rectangle - Rectangle aBoundingRect( Point(0,0), Point(0,0) ); + tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) ); if( !IsValid() ) return aBoundingRect; @@ -186,7 +186,7 @@ Rectangle OConnectionLine::GetBoundingRect() aBottomRight.X() += DESCRIPT_LINE_WIDTH; } - aBoundingRect = Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) ); + aBoundingRect = tools::Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) ); return aBoundingRect; } @@ -323,12 +323,12 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const return false; } -Rectangle OConnectionLine::GetSourceTextPos() const +tools::Rectangle OConnectionLine::GetSourceTextPos() const { return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); } -Rectangle OConnectionLine::GetDestTextPos() const +tools::Rectangle OConnectionLine::GetDestTextPos() const { return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); } diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 40e54d0b801e..8621f30311f1 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -108,7 +108,7 @@ namespace dbaui awt::Rectangle SAL_CALL OConnectionLineAccess::getBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); - Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : Rectangle()); + tools::Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : tools::Rectangle()); return awt::Rectangle(aRect.getX(),aRect.getY(),aRect.getWidth(),aRect.getHeight()); } awt::Point SAL_CALL OConnectionLineAccess::getLocation( ) diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 81564fb9f9bb..f8573dcec78b 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -86,7 +86,7 @@ void OJoinDesignView::initialize() { } -void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground) +void OJoinDesignView::resizeDocumentView(tools::Rectangle& _rPlayground) { m_pScrollWindow->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 6f383c341841..0c8fedfc97f9 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -531,7 +531,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) aNewPos.Y() = (nRow+1) * TABWIN_SPACING_Y; // determine rectangle for the corresponding line - Rectangle aRowRect( Point(0,0), aOutSize ); + tools::Rectangle aRowRect( Point(0,0), aOutSize ); aRowRect.Top() = nRow * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ); aRowRect.Bottom() = (nRow+1) * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD ); @@ -541,7 +541,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) for(;aIter != aEnd;++aIter) { OTableWindow* pOtherTabWin = aIter->second; - Rectangle aOtherTabWinRect( pOtherTabWin->GetPosPixel(), pOtherTabWin->GetSizePixel() ); + tools::Rectangle aOtherTabWinRect( pOtherTabWin->GetPosPixel(), pOtherTabWin->GetSizePixel() ); if( ( (aOtherTabWinRect.Top()>aRowRect.Top()) && (aOtherTabWinRect.Top()<aRowRect.Bottom()) ) || @@ -933,7 +933,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) } } -void OJoinTableView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void OJoinTableView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { DrawConnections(rRenderContext, rRect); } @@ -945,7 +945,7 @@ void OJoinTableView::InvalidateConnections() conn->InvalidateConnection(); } -void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { // draw Joins for(const auto& connection : m_vTableConnection) @@ -1068,7 +1068,7 @@ void OJoinTableView::ScrollWhileDragging() } // redraw DraggingRect - m_aDragRect = Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel()); + m_aDragRect = tools::Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel()); Update(); ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow ); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index fadd63dcd72e..85acecdb4700 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2526,7 +2526,7 @@ void OQueryDesignView::initialize() reset(); } -void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) +void OQueryDesignView::resizeDocumentView(tools::Rectangle& _rPlayground) { Point aPlaygroundPos( _rPlayground.TopLeft() ); Size aPlaygroundSize( _rPlayground.GetSize() ); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 27222c9f7fd3..496ced84a687 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1206,7 +1206,7 @@ bool OSelectionBrowseBox::SeekRow(long nRow) return nRow < m_nVisibleCount; } -void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const +void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const { rDev.SetClipRegion(vcl::Region(rRect)); @@ -1227,9 +1227,9 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, rDev.SetClipRegion( ); } -void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const +void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const { - Rectangle aRect(rRect); + tools::Rectangle aRect(rRect); aRect.TopLeft().Y() -= 2; OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); @@ -1262,7 +1262,7 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId) InsertDataColumn( _nColumnId , OUString(), DEFAULT_SIZE ); // Neuzeichnen - Rectangle aInvalidRect = GetInvalidRect( _nColumnId ); + tools::Rectangle aInvalidRect = GetInvalidRect( _nColumnId ); Invalidate( aInvalidRect ); ActivateCell( nCurrentRow, nCurCol ); @@ -1458,13 +1458,13 @@ void OSelectionBrowseBox::SetColWidth(sal_uInt16 nColId, long nNewWidth) ActivateCell(GetCurRow(), GetCurColumnId()); } -Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId ) +tools::Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId ) { // The rectangle is the full output area of the window - Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() ); + tools::Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() ); // now update the left side - Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel + tools::Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel aInvalidRect.Left() = aFieldRect.Left(); return aInvalidRect; @@ -1523,7 +1523,7 @@ void OSelectionBrowseBox::InsertColumn(const OTableFieldDescRef& pEntry, sal_uIn SetColWidth(nColumnId,getDesignView()->getColWidth(GetColumnPos(nColumnId)-1)); // redraw - Rectangle aInvalidRect = GetInvalidRect( nColumnId ); + tools::Rectangle aInvalidRect = GetInvalidRect( nColumnId ); Invalidate( aInvalidRect ); ActivateCell( nCurrentRow, nCurCol ); @@ -1916,7 +1916,7 @@ void OSelectionBrowseBox::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 ) ); aMenuPos = aColRect.TopCenter(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 8fa74e9b6c49..f4cad626d5f7 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -182,8 +182,8 @@ namespace dbaui protected: virtual bool SeekRow( long nRow ) override; - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const override; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, + virtual void PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const override; + virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override; virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override; @@ -219,7 +219,7 @@ namespace dbaui // rCol contains the Nummer of the first empty column (in pOTableFieldDescList) void RemoveField( sal_uInt16 nId ); - Rectangle GetInvalidRect( sal_uInt16 nColId ); + tools::Rectangle GetInvalidRect( sal_uInt16 nColId ); long GetRealRow(long nRow) const; long GetBrowseRow(long nRowId) const; bool GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt); diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 606e9f10ba9b..d8c9859f8d0a 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -157,7 +157,7 @@ namespace dbaui void OTableConnection::InvalidateConnection() { - Rectangle rcBounding = GetBoundingRect(); + tools::Rectangle rcBounding = GetBoundingRect(); rcBounding.Bottom() += 1; rcBounding.Right() += 1; // I believe Invalidate and Draw(Rectangle) do not behave consistent: in any case it @@ -167,11 +167,11 @@ namespace dbaui m_pParent->Invalidate( rcBounding, InvalidateFlags::NoChildren ); } - Rectangle OTableConnection::GetBoundingRect() const + tools::Rectangle OTableConnection::GetBoundingRect() const { // determine all lines of the surrounding rectangle - Rectangle aBoundingRect( Point(0,0), Point(0,0) ); - Rectangle aTempRect; + tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) ); + tools::Rectangle aTempRect; std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end(); for(std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter) { @@ -190,7 +190,7 @@ namespace dbaui return aBoundingRect; } - void OTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) + void OTableConnection::Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { // Draw line for( const auto& pLine : m_vConnLine ) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index aad254bdb8b7..fc18fe0e166a 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -64,7 +64,7 @@ namespace DatabaseObject = css::sdb::application::DatabaseObject; namespace { -void Draw3DBorder(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void Draw3DBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { // Use the System Style-Settings for my colours const StyleSettings& aSystemStyle = Application::GetSettings().GetStyleSettings(); @@ -328,16 +328,16 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt) } } -void OTableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void OTableWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { - Rectangle aRect(Point(0,0), GetOutputSizePixel()); + tools::Rectangle aRect(Point(0,0), GetOutputSizePixel()); Window::Paint(rRenderContext, rRect); Draw3DBorder(rRenderContext, aRect); } -Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const +tools::Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const { - Rectangle aSizingRect = Rectangle( GetPosPixel(), GetSizePixel() ); + tools::Rectangle aSizingRect = tools::Rectangle( GetPosPixel(), GetSizePixel() ); if( m_nSizingFlags & SizingFlags::Top ) { diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 0a0c98cc3357..1998abcf86c7 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -152,7 +152,7 @@ namespace dbaui if(m_pTable && !m_pTable->IsDisposed()) { Point aPoint(_aPoint.X,_aPoint.Y); - Rectangle aRect(m_pTable->GetDesktopRectPixel()); + tools::Rectangle aRect(m_pTable->GetDesktopRectPixel()); if( aRect.IsInside(aPoint) ) aRet = this; else if( m_pTable->GetListBox()->GetDesktopRectPixel().IsInside(aPoint)) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index e45cccad0525..82aefa64fa4f 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -233,9 +233,9 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return DND_ACTION_NONE; // Scrolling Areas - Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA), + tools::Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); - Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); + tools::Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); // scroll up if the pointer is on the upper scroll area if( aBottomScrollArea.IsInside(m_aMousePos) ) diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index ac50e2a5aa75..71faa6c0d282 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -88,7 +88,7 @@ void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt ) if( !aHelpText.isEmpty()) { // show help - Rectangle aItemRect(Point(0,0),GetSizePixel()); + tools::Rectangle aItemRect(Point(0,0),GetSizePixel()); aItemRect = LogicToPixel( aItemRect ); Point aPt = OutputToScreenPixel( aItemRect.TopLeft() ); aItemRect.Left() = aPt.X(); diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 2118643b32e5..19912ac849d0 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -88,9 +88,9 @@ namespace dbaui return m_pViewSwitch->forceInitialView(); } - void OQueryContainerWindow::resizeAll( const Rectangle& _rPlayground ) + void OQueryContainerWindow::resizeAll( const tools::Rectangle& _rPlayground ) { - Rectangle aPlayground( _rPlayground ); + tools::Rectangle aPlayground( _rPlayground ); if ( m_pBeamer && m_pBeamer->IsVisible() ) { @@ -120,7 +120,7 @@ namespace dbaui ODataView::resizeAll( aPlayground ); } - void OQueryContainerWindow::resizeDocumentView( Rectangle& _rPlayground ) + void OQueryContainerWindow::resizeDocumentView( tools::Rectangle& _rPlayground ) { m_pViewSwitch->SetPosSizePixel( _rPlayground.TopLeft(), Size( _rPlayground.GetWidth(), _rPlayground.GetHeight() ) ); |