refactor dbacess classes to use RenderContext

Change-Id: I60e436ec1e6974e5fb8c6525552c6e172ceca0ca

dbaccess/source/ui/app/AppDetailPageHelper.cxx

@@ -1298,15 +1298,15 @@ void OPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&
 {
     Window::Paint(rRenderContext, rRect);
 
-    if( ImplGetGraphicCenterRect( m_aGraphicObj.GetGraphic(), m_aPreviewRect ) )
+    if (ImplGetGraphicCenterRect(m_aGraphicObj.GetGraphic(), m_aPreviewRect))
     {
-        const Point aPos( m_aPreviewRect.TopLeft() );
-        const Size  aSize( m_aPreviewRect.GetSize() );
+        const Point aPos(m_aPreviewRect.TopLeft());
+        const Size  aSize(m_aPreviewRect.GetSize());
 
-        if( m_aGraphicObj.IsAnimated() )
-            m_aGraphicObj.StartAnimation( this, aPos, aSize );
+        if (m_aGraphicObj.IsAnimated())
+            m_aGraphicObj.StartAnimation(&rRenderContext, aPos, aSize);
         else
-            m_aGraphicObj.Draw( this, aPos, aSize );
+            m_aGraphicObj.Draw(&rRenderContext, aPos, aSize);
     }
 }
 

dbaccess/source/ui/app/AppDetailView.cxx

@@ -87,15 +87,15 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
 
 void OCreationList::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect )
 {
-    if ( m_pMouseDownEntry )
-        m_aOriginalFont = GetFont();
+    if (m_pMouseDownEntry)
+        m_aOriginalFont = rRenderContext.GetFont();
 
-    m_aOriginalBackgroundColor = GetBackground().GetColor();
+    m_aOriginalBackgroundColor = rRenderContext.GetBackground().GetColor();
     SvTreeListBox::Paint(rRenderContext, _rRect);
-    SetBackground( m_aOriginalBackgroundColor );
+    rRenderContext.SetBackground(m_aOriginalBackgroundColor);
 
-    if ( m_pMouseDownEntry )
-        Control::SetFont( m_aOriginalFont );
+    if (m_pMouseDownEntry)
+        rRenderContext.SetFont(m_aOriginalFont);
 }
 
 void OCreationList::PreparePaint( SvTreeListEntry* _pEntry )

dbaccess/source/ui/browser/dataview.cxx

@@ -38,27 +38,6 @@ namespace dbaui
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::frame;
 
-    // ColorChanger
-    class ColorChanger
-    {
-    protected:
-        VclPtr<OutputDevice> m_pDev;
-
-    public:
-        ColorChanger( OutputDevice* _pDev, const ::Color& _rNewLineColor, const ::Color& _rNewFillColor )
-            :m_pDev( _pDev )
-        {
-            m_pDev->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR );
-            m_pDev->SetLineColor( _rNewLineColor );
-            m_pDev->SetFillColor( _rNewFillColor );
-        }
-
-        ~ColorChanger()
-        {
-            m_pDev->Pop();
-        }
-    };
-
     ODataView::ODataView(   vcl::Window* pParent,
                             IController& _rController,
                             const Reference< XComponentContext >& _rxContext,
@@ -97,8 +76,11 @@ namespace dbaui
     {
         // draw the background
         {
-            ColorChanger aColors( this, COL_TRANSPARENT, GetSettings().GetStyleSettings().GetFaceColor() );
-            DrawRect( _rRect );
+            rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
+            rRenderContext.SetLineColor(COL_TRANSPARENT);
+            rRenderContext.SetFillColor(GetSettings().GetStyleSettings().GetFaceColor());
+            rRenderContext.DrawRect(_rRect);
+            rRenderContext.Pop();
         }
 
         // let the base class do anything it needs

dbaccess/source/ui/control/marktree.cxx

@@ -50,15 +50,15 @@ void OMarkableTreeListBox::Paint(vcl::RenderContext& rRenderContext, const Recta
 {
     if (!IsEnabled())
     {
-        vcl::Font aOldFont = GetFont();
+        vcl::Font aOldFont = rRenderContext.GetFont();
         vcl::Font aNewFont(aOldFont);
 
         StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
         aNewFont.SetColor(aSystemStyle.GetDisableColor());
 
-        SetFont(aNewFont);
+        rRenderContext.SetFont(aNewFont);
         DBTreeListBox::Paint(rRenderContext, _rRect);
-        SetFont(aOldFont);
+        rRenderContext.SetFont(aOldFont);
     }
     else
         DBTreeListBox::Paint(rRenderContext, _rRect);

dbaccess/source/ui/inc/ConnectionLine.hxx

@@ -71,7 +71,7 @@ namespace dbaui
     };
     /// unary_function Functor object for class OConnectionLine returntype is void
     /// draws a connectionline object on outputdevice
-    struct TConnectionLineDrawFunctor : ::std::unary_function<OConnectionLine*,void>
+    struct TConnectionLineDrawFunctor : std::unary_function<OConnectionLine*, void>
     {
         VclPtr<OutputDevice> pDevice;
         TConnectionLineDrawFunctor(OutputDevice* _pDevice)

dbaccess/source/ui/inc/JoinTableView.hxx

@@ -129,7 +129,7 @@ namespace dbaui
         ScrollBar& GetVScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetVScrollBar(); }
         DECL_LINK( ScrollHdl, ScrollBar* );
 
-        void DrawConnections( const Rectangle& rRect );
+        void DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
         void InvalidateConnections();
 
         void BeginChildMove( OTableWindow* pTabWin, const Point& rMousePos );

dbaccess/source/ui/inc/TableConnection.hxx

@@ -95,7 +95,7 @@ namespace dbaui
         inline TTableConnectionData::value_type GetData() const { return m_pData; }
         const ::std::vector<OConnectionLine*>&  GetConnLineList() const { return m_vConnLine; }
         inline OJoinTableView*                  GetParent() const { return m_pParent; }
-        virtual void                    Draw( const Rectangle& rRect );
+        virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
         using Window::Draw;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
     };

dbaccess/source/ui/inc/TableWindow.hxx

@@ -69,7 +69,7 @@ namespace dbaui
         sal_uInt16              m_nSizingFlags;
         bool                m_bActive;
 
-        void Draw3DBorder( const Rectangle& rRect );
+        void Draw3DBorder(vcl::RenderContext& rRenderContext,const Rectangle& rRect);
         // OContainerListener
         virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual void _elementRemoved( const  ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

dbaccess/source/ui/querydesign/JoinTableView.cxx

@@ -935,26 +935,26 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
     }
 }
 
-void OJoinTableView::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void OJoinTableView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
-    DrawConnections( rRect );
+    DrawConnections(rRenderContext, rRect);
 }
 
 void OJoinTableView::InvalidateConnections()
 {
     // draw Joins
-    for(auto & conn : m_vTableConnection)
+    for (auto & conn : m_vTableConnection)
         conn->InvalidateConnection();
 }
 
-void OJoinTableView::DrawConnections( const Rectangle& rRect )
+void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     // draw Joins
-    for(auto conn : m_vTableConnection)
-        conn->Draw(rRect);
+    for(auto connection : m_vTableConnection)
+        connection->Draw(rRenderContext, rRect);
     // finally redraw the selected one above all others
     if (GetSelectedConn())
-        GetSelectedConn()->Draw( rRect );
+        GetSelectedConn()->Draw(rRenderContext, rRect);
 }
 
 ::std::vector<VclPtr<OTableConnection> >::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const

dbaccess/source/ui/querydesign/TableConnection.cxx

@@ -193,10 +193,10 @@ namespace dbaui
         return aBoundingRect;
     }
 
-    void OTableConnection::Draw( const Rectangle& /*rRect*/ )
+    void OTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
     {
         // Draw line
-        ::std::for_each(m_vConnLine.begin(),m_vConnLine.end(),TConnectionLineDrawFunctor(m_pParent));
+        std::for_each(m_vConnLine.begin(), m_vConnLine.end(), TConnectionLineDrawFunctor(&rRenderContext));
     }
 }
 

dbaccess/source/ui/querydesign/TableWindow.cxx

@@ -312,33 +312,33 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt)
     }
 }
 
-void OTableWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect )
+void OTableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     Rectangle aRect(Point(0,0), GetOutputSizePixel());
     Window::Paint(rRenderContext, rRect);
-    Draw3DBorder( aRect );
+    Draw3DBorder(rRenderContext, aRect);
 }
 
-void OTableWindow::Draw3DBorder(const Rectangle& rRect)
+void OTableWindow::Draw3DBorder(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     // Use the System Style-Settings for my colours
     const StyleSettings& aSystemStyle = Application::GetSettings().GetStyleSettings();
 
     // Black lines for bottom and right
-    SetLineColor(aSystemStyle.GetDarkShadowColor());
-    DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
-    DrawLine( rRect.BottomRight(), rRect.TopRight() );
+    rRenderContext.SetLineColor(aSystemStyle.GetDarkShadowColor());
+    rRenderContext.DrawLine(rRect.BottomLeft(), rRect.BottomRight());
+    rRenderContext.DrawLine(rRect.BottomRight(), rRect.TopRight());
 
     // Dark grey lines over the black lines
-    SetLineColor(aSystemStyle.GetShadowColor());
-    Point aEHvector(1,1);
-    DrawLine( rRect.BottomLeft()+Point(1,-1), rRect.BottomRight() - aEHvector );
-    DrawLine( rRect.BottomRight() - aEHvector, rRect.TopRight()+Point(-1,1) );
+    rRenderContext.SetLineColor(aSystemStyle.GetShadowColor());
+    Point aEHvector(1, 1);
+    rRenderContext.DrawLine(rRect.BottomLeft() + Point(1, -1), rRect.BottomRight() - aEHvector);
+    rRenderContext.DrawLine(rRect.BottomRight() - aEHvector, rRect.TopRight() + Point(-1, 1));
 
     // Light grey lines for top and left
-    SetLineColor(aSystemStyle.GetLightColor());
-    DrawLine( rRect.BottomLeft()+Point(1,-2), rRect.TopLeft() + aEHvector );
-    DrawLine( rRect.TopLeft() + aEHvector, rRect.TopRight()+Point(-2,1) );
+    rRenderContext.SetLineColor(aSystemStyle.GetLightColor());
+    rRenderContext.DrawLine(rRect.BottomLeft() + Point(1, -2), rRect.TopLeft() + aEHvector);
+    rRenderContext.DrawLine(rRect.TopLeft() + aEHvector, rRect.TopRight() + Point(-2, 1));
 }
 
 Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const

dbaccess/source/ui/relationdesign/RTableConnection.cxx

@@ -48,11 +48,11 @@ ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTa
     return *this;
 }
 
-void ORelationTableConnection::Draw( const Rectangle& rRect )
+void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect )
 {
-    OTableConnection::Draw( rRect );
+    OTableConnection::Draw(rRenderContext, rRect);
     ORelationTableConnectionData* pData = static_cast< ORelationTableConnectionData* >(GetData().get());
-    if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) )
+    if (pData && (pData->GetCardinality() == CARDINAL_UNDEFINED))
         return;
 
     // search lines for top line
@@ -62,15 +62,16 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
 
     const OConnectionLine* pTopLine = NULL;
     const ::std::vector<OConnectionLine*>& rConnLineList = GetConnLineList();
-    ::std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin();
-    ::std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end();
+    std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin();
+    std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end();
+
     for(;aIter != aEnd;++aIter)
     {
         if( (*aIter)->IsValid() )
         {
             aBoundingRect = (*aIter)->GetBoundingRect();
             nTemp = aBoundingRect.Top();
-            if( nTemp<nTop )
+            if(nTemp < nTop)
             {
                 nTop = nTemp;
                 pTopLine = (*aIter);
@@ -79,7 +80,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
     }
 
     // cardinality
-    if( !pTopLine )
+    if (!pTopLine)
         return;
 
     Rectangle aSourcePos = pTopLine->GetSourceTextPos();
@@ -88,7 +89,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
     OUString aSourceText;
     OUString aDestText;
 
-    switch( pData->GetCardinality() )
+    switch (pData->GetCardinality())
     {
     case CARDINAL_ONE_MANY:
         aSourceText = "1";
@@ -107,12 +108,12 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
     }
 
     if (IsSelected())
-        GetParent()->SetTextColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
+        rRenderContext.SetTextColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
     else
-        GetParent()->SetTextColor(Application::GetSettings().GetStyleSettings().GetWindowTextColor());
+        rRenderContext.SetTextColor(Application::GetSettings().GetStyleSettings().GetWindowTextColor());
 
-    GetParent()->DrawText( aSourcePos, aSourceText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
-    GetParent()->DrawText( aDestPos, aDestText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
+    rRenderContext.DrawText(aSourcePos, aSourceText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
+    rRenderContext.DrawText(aDestPos, aDestText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/relationdesign/RTableConnection.hxx

@@ -34,7 +34,7 @@ namespace dbaui
 
         ORelationTableConnection& operator=( const ORelationTableConnection& rConn );
 
-        virtual void    Draw( const Rectangle& rRect ) SAL_OVERRIDE;
+        virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
         using OTableConnection::Draw;
     };
 }

dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx

@@ -103,18 +103,18 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
     getGenPage()->SaveData( pFieldDescr );
 }
 
-void OTableFieldDescWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
+void OTableFieldDescWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
     // 3D-line at the top window border
-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
 
-    SetLineColor( rStyleSettings.GetLightColor() );
-    DrawLine( Point(0,0), Point(GetSizePixel().Width(),0) );
+    rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
+    rRenderContext.DrawLine(Point(0,0), Point(GetSizePixel().Width(), 0));
 
     // 3D-line for the separation of the header
-    DrawLine( Point(3, DETAILS_HEADER_HEIGHT), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT) );
-    SetLineColor( rStyleSettings.GetShadowColor() );
-    DrawLine( Point(3, DETAILS_HEADER_HEIGHT-1), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT-1) );
+    rRenderContext.DrawLine(Point(3, DETAILS_HEADER_HEIGHT), Point(GetSizePixel().Width() - 6, DETAILS_HEADER_HEIGHT));
+    rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+    rRenderContext.DrawLine(Point(3, DETAILS_HEADER_HEIGHT - 1), Point(GetSizePixel().Width() - 6, DETAILS_HEADER_HEIGHT - 1));
 }
 
 void OTableFieldDescWin::Resize()