[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                      |    1 
 patches/dev300/calc-insert-new-sheet-tab-svtools-fix.diff |   22 ---------
 patches/dev300/calc-insert-new-sheet-tab-svtools.diff     |   31 ++++++--------
 3 files changed, 14 insertions(+), 40 deletions(-)

New commits:
commit f3327d3e7b5ca0e94414f895ecb111825967523b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Aug 2 15:01:10 2010 -0400

    Combined patches & disabled custom tab colors in high contrast mode.
    
    * patches/dev300/apply:
    * patches/dev300/calc-insert-new-sheet-tab-svtools-fix.diff:
    * patches/dev300/calc-insert-new-sheet-tab-svtools.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ad6bca1..ba33cdb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3428,7 +3428,6 @@ calc-distributed-cell-text-xmloff.diff,  kohei
 calc-insert-new-sheet-tab-sc.diff,      kohei
 calc-insert-new-sheet-tab-svl.diff,     kohei
 calc-insert-new-sheet-tab-svtools.diff, kohei
-calc-insert-new-sheet-tab-svtools-fix.diff, n#606434, kohei
 
 # Support English function names in place of localized ones.
 calc-english-func-names-sc.diff,        i#38765, kohei
diff --git a/patches/dev300/calc-insert-new-sheet-tab-svtools-fix.diff b/patches/dev300/calc-insert-new-sheet-tab-svtools-fix.diff
deleted file mode 100644
index 594e231..0000000
--- a/patches/dev300/calc-insert-new-sheet-tab-svtools-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- svtools/source/control/tabbar.cxx |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git svtools/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
-index d1578d9..79a29ff 100644
---- svtools/source/control/tabbar.cxx
-+++ svtools/source/control/tabbar.cxx
-@@ -1385,6 +1385,10 @@ void TabBar::Paint( const Rectangle& )
-             else
-                 SetTextColor( aFaceTextColor );
- 
-+            // This tab is "special", and a special tab needs a blue text.
-+            if (bSpecialTab)
-+                SetTextColor(Color(COL_LIGHTBLUE));
-+
-             aDrawer.drawText(aText);
- 
-             if ( bCurrent )
--- 
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
index b6c33c5..5c67f5c 100644
--- a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
+++ b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
@@ -1,9 +1,3 @@
----
- svtools/inc/tabbar.hxx            |    9 +-
- svtools/source/control/tabbar.cxx |  676 ++++++++++++++++++++++++-------------
- svtools/source/misc/imagemgr.src  |    9 +
- 3 files changed, 457 insertions(+), 237 deletions(-)
-
 diff --git svtools/inc/tabbar.hxx svtools/inc/tabbar.hxx
 index ee19bfc..3ecea7b 100644
 --- svtools/inc/tabbar.hxx
@@ -58,7 +52,7 @@ index ee19bfc..3ecea7b 100644
      // returns the rectangle in which page tabs are drawn
      Rectangle		GetPageArea() const;
 diff --git svtools/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
-index 36dccc3..d1578d9 100644
+index 20b601e..bd6dd57 100755
 --- svtools/source/control/tabbar.cxx
 +++ svtools/source/control/tabbar.cxx
 @@ -39,6 +39,9 @@
@@ -119,7 +113,7 @@ index 36dccc3..d1578d9 100644
  
      if ( nWinStyle & WB_3DTAB )
          mnOffY++;
-@@ -1009,288 +1027,390 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
+@@ -1009,288 +1027,396 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
      Window::MouseButtonUp( rMEvt );
  }
  
@@ -621,7 +615,7 @@ index 36dccc3..d1578d9 100644
 +    bool        mbSpecialTab:1;
 +    bool        mbEnabled:1;
 +};
-+
+ 
 +}
 +
 +void TabBar::Paint( const Rectangle& )
@@ -659,7 +653,8 @@ index 36dccc3..d1578d9 100644
 +        aDrawer.drawTab();
 +        aDrawer.drawPlusImage();
 +    }
- 
++
++    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 +    ImplTabBarItem* pCurItem = NULL;
 +    while ( pItem )
 +    {
@@ -684,7 +679,8 @@ index 36dccc3..d1578d9 100644
 +        {
 +            Rectangle aRect = pItem->maRect;
 +            bool bSelected = pItem->IsSelected(pCurItem);
-+            bool bCustomBgColor = !pItem->IsDefaultTabBgColor();
++            // We disable custom background color in high contrast mode.
++            bool bCustomBgColor = !pItem->IsDefaultTabBgColor() && !rStyleSettings.GetHighContrastMode();
 +            bool bSpecialTab = (pItem->mnBits & TPB_SPECIAL);
 +            bool bEnabled = pItem->mbEnable;
 +            String aText = pItem->mbShort ?
@@ -713,6 +709,10 @@ index 36dccc3..d1578d9 100644
 +            else
 +                SetTextColor( aFaceTextColor );
 +
++            // This tab is "special", and a special tab needs a blue text.
++            if (bSpecialTab)
++                SetTextColor(Color(COL_LIGHTBLUE));
++
 +            aDrawer.drawText(aText);
 +
 +            if ( bCurrent )
@@ -743,7 +743,7 @@ index 36dccc3..d1578d9 100644
  void TabBar::Resize()
  {
      Size aNewSize = GetOutputSizePixel();
-@@ -1546,6 +1666,80 @@ long TabBar::ImplDeactivatePage()
+@@ -1546,6 +1672,80 @@ long TabBar::ImplDeactivatePage()
      return nRet;
  }
  
@@ -824,7 +824,7 @@ index 36dccc3..d1578d9 100644
  // -----------------------------------------------------------------------
  
  long TabBar::DeactivatePage()
-@@ -1838,7 +2032,7 @@ USHORT TabBar::GetPagePos( USHORT nPageId ) const
+@@ -1838,7 +2038,7 @@ USHORT TabBar::GetPagePos( USHORT nPageId ) const
  
  // -----------------------------------------------------------------------
  
@@ -833,7 +833,7 @@ index 36dccc3..d1578d9 100644
  {
      ImplTabBarItem* pItem = mpItemList->First();
      while ( pItem )
-@@ -1849,6 +2043,16 @@ USHORT TabBar::GetPageId( const Point& rPos ) const
+@@ -1849,6 +2049,16 @@ USHORT TabBar::GetPageId( const Point& rPos ) const
          pItem = mpItemList->Next();
      }
  
@@ -870,6 +870,3 @@ index b50a050..fc7dc8c 100644
  // description strings
  
  String STR_DESCRIPTION_SOURCEFILE
--- 
-1.7.0.1
-