CWS-TOOLING: integrate CWS calctabcolor

svtools/inc/tabbar.hxx

@@ -320,9 +320,6 @@ typedef USHORT TabBarPageBits;
 // - TabBar-Types -
 // ----------------
 
-#define TABBAR_APPEND          ((USHORT)0xFFFF)
-#define TABBAR_PAGE_NOTFOUND   ((USHORT)0xFFFF)
-
 #define TABBAR_RENAMING_YES    ((long)TRUE)
 #define TABBAR_RENAMING_NO     ((long)FALSE)
 #define TABBAR_RENAMING_CANCEL ((long)2)
@@ -400,6 +397,9 @@ private:
                     DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* );
 
 public:
+    static const sal_uInt16 APPEND;
+    static const sal_uInt16 PAGE_NOT_FOUND;
+
                     TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR );
     virtual         ~TabBar();
 
@@ -424,9 +424,14 @@ public:
 
     void            InsertPage( USHORT nPageId, const XubString& rText,
                                 TabBarPageBits nBits = 0,
-                                USHORT nPos = TABBAR_APPEND );
+                                USHORT nPos = TabBar::APPEND );
     void            RemovePage( USHORT nPageId );
     void            MovePage( USHORT nPageId, USHORT nNewPos );
+
+    Color           GetTabBgColor( USHORT nPageId ) const;
+    void            SetTabBgColor( USHORT nPageId, const Color& aTabBgColor );
+    BOOL            IsDefaultTabBgColor( USHORT nPageId );
+
     void            Clear();
 
     void            EnablePage( USHORT nPageId, BOOL bEnable = TRUE );
@@ -453,7 +458,7 @@ public:
     void            SelectPage( USHORT nPageId, BOOL bSelect = TRUE );
     void            SelectPageRange( BOOL bSelect = FALSE,
                                      USHORT nStartPos = 0,
-                                     USHORT nEndPos = TABBAR_APPEND );
+                                     USHORT nEndPos = TabBar::APPEND );
     USHORT          GetSelectPage( USHORT nSelIndex = 0 ) const;
     USHORT          GetSelectPageCount() const;
     BOOL            IsPageSelected( USHORT nPageId ) const;

tools/inc/tools/color.hxx

@@ -78,7 +78,7 @@ typedef UINT32 ColorData;
 #define COL_YELLOW                  RGB_COLORDATA( 0xFF, 0xFF, 0x00 )
 #define COL_WHITE                   RGB_COLORDATA( 0xFF, 0xFF, 0xFF )
 #define COL_TRANSPARENT             TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF )
-#define COL_AUTO                    (UINT32)0xFFFFFFFF
+#define COL_AUTO                    (ColorData)0xFFFFFFFF
 #define COL_AUTHOR1_DARK            RGB_COLORDATA(198, 146, 0)
 #define COL_AUTHOR1_NORMAL          RGB_COLORDATA(255, 255, 158)
 #define COL_AUTHOR1_LIGHT           RGB_COLORDATA(255, 255, 195)