l10ntooling18: merge

1 files changed, 208 insertions, 68 deletions

diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index ada2e463c8af..a3f954e0bef5 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -31,6 +31,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/window.hxx>
+#include <vcl/image.hxx>
 
 //........................................................................
 namespace svt { namespace table
@@ -78,15 +79,15 @@ namespace svt { namespace table
         OSL_PRECOND( _bIsColHeaderArea || _bIsRowHeaderArea,
             "GridTableRenderer::PaintHeaderArea: invalid area flags!" );
 
-        // fill the rows with alternating background colors
-        _rDevice.Push( PUSH_FILLCOLOR | PUSH_LINECOLOR );
-
-        _rDevice.SetLineColor();
-        _rDevice.SetFillColor( _rStyle.GetDialogColor() );
+        _rDevice.Push( PUSH_FILLCOLOR | PUSH_LINECOLOR);
+        Color background = m_pImpl->rModel.getHeaderBackgroundColor();
+        if( background != 0xFFFFFF)
+            _rDevice.SetFillColor(background);
+        else
+            _rDevice.SetFillColor(_rStyle.GetDialogColor());
+        _rDevice.SetLineColor(_rStyle.GetSeparatorColor());
         _rDevice.DrawRect( _rArea );
-
         // delimiter lines at bottom/right
-        _rDevice.SetLineColor( _rStyle.GetDialogTextColor() );
         _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
         _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
 
@@ -99,31 +100,38 @@ namespace svt { namespace table
     void GridTableRenderer::PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected,
         OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle )
     {
-        _rDevice.Push( PUSH_LINECOLOR );
-
-        _rDevice.SetLineColor( _rStyle.GetDialogTextColor() );
-        _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
+        _rDevice.Push( PUSH_LINECOLOR);
+        _rDevice.SetLineColor(_rStyle.GetSeparatorColor());
+        _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight());
 
         String sHeaderText;
-
         PColumnModel pColumn = m_pImpl->rModel.getColumnModel( _nCol );
         DBG_ASSERT( !!pColumn, "GridTableRenderer::PaintColumnHeader: invalid column model object!" );
         if ( !!pColumn )
             sHeaderText = pColumn->getName();
-        Color aRowBackground = _rStyle.GetFieldColor();
-        if ( _bSelected )
-        {
-            aRowBackground = COL_BLUE;
-        }
-        _rDevice.DrawText( _rArea, sHeaderText, TEXT_DRAW_LEFT | TEXT_DRAW_TOP );
+        _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        ULONG nHorFlag = TEXT_DRAW_LEFT;
+        ULONG nVerFlag = TEXT_DRAW_TOP;
+        if(m_pImpl->rModel.getVerticalAlign() == 1)
+            nVerFlag = TEXT_DRAW_VCENTER;
+        else if(m_pImpl->rModel.getVerticalAlign() == 2)
+            nVerFlag = TEXT_DRAW_BOTTOM;
+        if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 1)
+            nHorFlag = TEXT_DRAW_CENTER;
+        else if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 2)
+            nHorFlag = TEXT_DRAW_RIGHT;
+        Rectangle aRect(_rArea);
+        aRect.Left()+=4; aRect.Right()-=4;
+        aRect.Bottom()-=2;
+            _rDevice.DrawText( aRect, sHeaderText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
         _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
         _rDevice.Pop();
 
         (void)_bActive;
         // no special painting for the active column at the moment
 
-        //(void)_bSelected;
-        // TODO: selection not yet implemented
+        (void)_bSelected;
+        //selection for column header not yet implemented
     }
 
     //--------------------------------------------------------------------
@@ -133,86 +141,218 @@ namespace svt { namespace table
         // remember the row for subsequent calls to the other ->ITableRenderer methods
         m_pImpl->nCurrentRow = _nRow;
 
-        // fill the rows with alternating background colors
-        _rDevice.Push( PUSH_FILLCOLOR | PUSH_LINECOLOR );
-
-        _rDevice.SetLineColor();
-
-        Color aRowBackground = _rStyle.GetFieldColor();
+        _rDevice.Push( PUSH_FILLCOLOR | PUSH_LINECOLOR);
 
+        Color aRowBackground = m_pImpl->rModel.getOddRowBackgroundColor();
+        Color line =  m_pImpl->rModel.getLineColor();
+        Color aRowBackground2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+        //if row is selected background color becomes blue, and lines should be also blue
+        //if they aren't user defined
+        if(_bSelected)
+        {
+            Color aSelected(_rStyle.GetHighlightColor());
+            aRowBackground = aSelected;
+            if(line == 0xFFFFFF)
+                _rDevice.SetLineColor(aRowBackground);
+            else
+                _rDevice.SetLineColor(line);
+        }
+        //if row not selected, check the cases whether user defined backgrounds are set
+        //and set line color to be the same
+        else
+        {
+            if(aRowBackground2 != 0xFFFFFF && _nRow%2)
+            {
+                aRowBackground = aRowBackground2;
+                if(line == 0xFFFFFF)
+                    _rDevice.SetLineColor(aRowBackground);
+                else
+                    _rDevice.SetLineColor(line);
+            }
+            //fill the rows with alternating background colors if second background color is specified
+            else if(aRowBackground != 0xFFFFFF && line == 0xFFFFFF)
+                _rDevice.SetLineColor(aRowBackground);
+            else
+            {
+                //if Line color is set, then it was user defined and should be visible
+                //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
+                _rDevice.SetLineColor(line);
+            }
+        }
         _rDevice.SetFillColor( aRowBackground );
-
         _rDevice.DrawRect( _rRowArea );
 
-        // TODO: active? selected?
+        // TODO: active?
 
         _rDevice.Pop();
-        (void) _bSelected;
         (void)_bActive;
-
-        // no special painting for the active row at the moment
-
-        //(void)_bSelected;
-        // TODO: selection not yet implemented
     }
 
     //--------------------------------------------------------------------
     void GridTableRenderer::PaintRowHeader( bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea,
         const StyleSettings& _rStyle, rtl::OUString& _rText )
     {
-        _rDevice.Push( PUSH_FILLCOLOR | PUSH_LINECOLOR );
-
-        _rDevice.SetLineColor( _rStyle.GetDialogTextColor() );
+        _rDevice.Push( PUSH_LINECOLOR);
+        _rDevice.SetLineColor(_rStyle.GetSeparatorColor());
         _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
-        _rDevice.DrawText( _rArea, _rText, TEXT_DRAW_LEFT);
+        _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        ULONG nHorFlag = TEXT_DRAW_LEFT;
+        ULONG nVerFlag = TEXT_DRAW_TOP;
+        if(m_pImpl->rModel.getVerticalAlign() == 1)
+            nVerFlag = TEXT_DRAW_VCENTER;
+        else if(m_pImpl->rModel.getVerticalAlign() == 2)
+            nVerFlag = TEXT_DRAW_BOTTOM;
+        if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 1)
+            nHorFlag = TEXT_DRAW_CENTER;
+        else if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 2)
+            nHorFlag = TEXT_DRAW_RIGHT;
+        Rectangle aRect(_rArea);
+        aRect.Left()+=4; aRect.Right()-=4;
+        aRect.Bottom()-=2;
+        _rDevice.DrawText( aRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
         // TODO: active? selected?
         (void)_bActive;
         (void)_bSelected;
-
+        //at the moment no special paint for selected row header
         _rDevice.Pop();
     }
 
     //--------------------------------------------------------------------
-    void GridTableRenderer::PaintCell( ColPos _nColumn, bool _bSelected, bool _bActive,
-        OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle, rtl::OUString& _rText )
+    void GridTableRenderer::PaintCellImage( ColPos _nColumn, bool _bSelected, bool _bActive,
+        OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle, Image* _pCellData )
    {
-        _rDevice.Push( PUSH_LINECOLOR );
-
-        // draw the grid
-        _rDevice.SetLineColor( COL_LIGHTGRAY );
-        // TODO: the LIGHTGRAY should probably be a property/setting
-        _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
-        _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
-
+        _rDevice.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_CLIPREGION);
+    _rDevice.IntersectClipRegion( _rArea );
+    Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
+    Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+    Color line = m_pImpl->rModel.getLineColor();
+    //if row is selected and line color isn't user specified, set it blue
+    if(_bSelected)
+    {
+        if(line == 0xFFFFFF)
+            _rDevice.SetLineColor(_rStyle.GetHighlightColor());
+        else
+            _rDevice.SetLineColor(line);
+    }
+    //else set line color to the color of row background
+    else
+    {
+        if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+        {
+            if(line == 0xFFFFFF)
+                _rDevice.SetLineColor(background2);
+            else
+                _rDevice.SetLineColor(line);
+        }
+        else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
+            _rDevice.SetLineColor(background1);
+        else
         {
+            //if line color is set, then it was user defined and should be visible
+            //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
+            _rDevice.SetLineColor(line);
+        }
+    }
+    _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
+    {
             // TODO: remove those temporary place holders
             Rectangle aRect( _rArea );
             ++aRect.Left(); --aRect.Right();
-            ++aRect.Top(); --aRect.Bottom();
+            aRect.Top(); aRect.Bottom();
+        Point imagePos(Point(aRect.Left(), aRect.Top()));
+        Size imageSize = _pCellData->GetSizePixel();
+        if(aRect.GetWidth() > imageSize.Width())
+        {
+            if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 1)
+                imagePos.X() = aRect.Left()+((double)(aRect.GetWidth() - imageSize.Width()))/2;
+            else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2)
+                imagePos.X() = aRect.Right() - imageSize.Width();
+        }
+        else
+            imageSize.Width() = aRect.GetWidth();
+        if(aRect.GetHeight() > imageSize.Height())
+        {
+            if(m_pImpl->rModel.getVerticalAlign() == 1)
+                imagePos.Y() = aRect.Top()+((double)(aRect.GetHeight() - imageSize.Height()))/2;
+            else if(m_pImpl->rModel.getVerticalAlign() == 2)
+                imagePos.Y() = aRect.Bottom() - imageSize.Height();
+        }
+        else
+            imageSize.Height() = aRect.GetHeight()-1;
+        Image& image (*_pCellData);
+        _rDevice.DrawImage(imagePos, imageSize, image, 0);
+        }
+    _rDevice.Pop();
 
-            String sText;
-            if(_bSelected)
-            {
-                Color aRed(COL_BLUE);
-                _rDevice.SetFillColor( aRed );
-                _rDevice.SetTextColor(COL_WHITE);
-            }
-            _rDevice.DrawRect( _rArea );
-            (void)_nColumn;
-            _rDevice.DrawText( aRect, _rText, TEXT_DRAW_LEFT | TEXT_DRAW_TOP);
+        (void)_bActive;
+        // no special painting for the active cell at the moment
+    }
+
+    //--------------------------------------------------------------------
+   void GridTableRenderer::PaintCellString( ColPos _nColumn, bool _bSelected, bool _bActive,
+        OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle, rtl::OUString& _rText )
+   {
+        _rDevice.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+    Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
+    Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+    Color line = m_pImpl->rModel.getLineColor();
+    //if row is selected and line color isn't user specified, set it blue
+    if(_bSelected)
+    {
+        if(line == 0xFFFFFF)
+            _rDevice.SetLineColor(_rStyle.GetHighlightColor());
+        else
+            _rDevice.SetLineColor(line);
+    }
+    //else set line color to the color of row background
+    else
+    {
+        if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+        {
+            if(line == 0xFFFFFF)
+                _rDevice.SetLineColor(background2);
+            else
+                _rDevice.SetLineColor(line);
+        }
+        else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
+            _rDevice.SetLineColor(background1);
+        else
+        {
+            //if Line color is set, then it was user defined and should be visible
+            //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
+            _rDevice.SetLineColor(line);
         }
+    }
+    _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
+        {
+           //  TODO: remove those temporary place holders
+            Rectangle aRect( _rArea );
+            ++aRect.Left(); --aRect.Right();
+            aRect.Top(); aRect.Bottom();
         if(_bSelected)
         {
-            _rDevice.SetFillColor( _rStyle.GetFieldColor() );
-            _rDevice.SetTextColor(COL_BLACK);
+            _rDevice.SetTextColor(_rStyle.GetHighlightTextColor());
+        }
+        else
+            _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        ULONG nHorFlag = TEXT_DRAW_LEFT;
+        ULONG nVerFlag = TEXT_DRAW_TOP;
+        if(m_pImpl->rModel.getVerticalAlign() == 1)
+            nVerFlag = TEXT_DRAW_VCENTER;
+        else if(m_pImpl->rModel.getVerticalAlign() == 2)
+            nVerFlag = TEXT_DRAW_BOTTOM;
+        if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 1)
+            nHorFlag = TEXT_DRAW_CENTER;
+        else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2)
+            nHorFlag = TEXT_DRAW_RIGHT;
+        Rectangle textRect(_rArea);
+        textRect.Left()+=4; textRect.Right()-=4;
+        textRect.Bottom()-=2;
+            _rDevice.DrawText( textRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
         }
-
         _rDevice.Pop();
-
         (void)_bActive;
-//        // no special painting for the active cell at the moment
-       (void)_rStyle;
-//        // TODO: do we need this?
+        // no special painting for the active cell at the moment
     }
 
     //--------------------------------------------------------------------
@@ -224,7 +364,7 @@ namespace svt { namespace table
     //--------------------------------------------------------------------
     void GridTableRenderer::HideCellCursor( Window& _rView, const Rectangle& _rCursorRect)
     {
-        (void)_rCursorRect;
+    (void)_rCursorRect;
         _rView.HideFocus();
 
     }