CWS-TOOLING: integrate CWS calctabcolor

12 files changed, 95 insertions, 15 deletions

diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 7d01317c6b8d..55fcb503f51b 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -58,9 +58,6 @@ public:
 
     // Non-UNO Methods
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-        getAccessibleChildMenu();
-
     enum ChildControlType {
         LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
     };
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index 9e787ea590fe..f23229d31a43 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -61,7 +61,7 @@
 // this are the defines for the position of the settings in the
 // TableViewSettingsSequence
 
-#define SC_TABLE_VIEWSETTINGS_COUNT         14
+#define SC_TABLE_VIEWSETTINGS_COUNT         15
 
 #define SC_CURSOR_X                         0
 #define SC_CURSOR_Y                         1
@@ -77,6 +77,7 @@
 #define SC_TABLE_ZOOM_TYPE                  11
 #define SC_TABLE_ZOOM_VALUE                 12
 #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
+#define SC_TABLE_TAB_BG_COLOR               14
 
 #define SC_CURSORPOSITIONX                  "CursorPositionX"
 #define SC_CURSORPOSITIONY                  "CursorPositionY"
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index dd1d18e49a51..f7216b9cff48 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -206,8 +206,6 @@ private:
     ::std::auto_ptr<ScDBQueryParamBase> mpParam;
     ::std::auto_ptr<DataAccess>         mpData;
 
-    bool            GetThis(Value& rValue);
-
 public:
                     ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam);
     /// Does NOT reset rValue if no value found!
@@ -305,7 +303,6 @@ public:
     ScBaseCell*     GetNext();
     SCCOL           GetCol() { return nCol; }
     SCROW           GetRow() { return nRow; }
-    ULONG           GetNumberFormat();
 
                     // setzt alle Entry.nField einen weiter, wenn Spalte
                     // wechselt, fuer ScInterpreter ScHLookup()
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 768dc815a482..044ccc853034 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -616,6 +616,9 @@ public:
                                         Color& rColor, USHORT& rFlags ) const;
     SC_DLLPUBLIC void           SetScenarioData( SCTAB nTab, const String& rComment,
                                         const Color& rColor, USHORT nFlags );
+    SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const;
+    SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor );
+    SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const;
     void            GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const;
     SC_DLLPUBLIC BOOL           IsActiveScenario( SCTAB nTab ) const;
     SC_DLLPUBLIC void           SetActiveScenario( SCTAB nTab, BOOL bActive );      // nur fuer Undo etc.
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index a9c1997f74f5..31934067988a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -571,9 +571,13 @@
 #define STR_STYLE_FAMILY_PAGE       434
 
 #define STR_ERR_DATAPILOTSOURCE     435
-#define STR_PIVOT_FIRSTROWEMPTYERR  436
+#define STR_PIVOT_FIRSTROWEMPTYERR      436
 #define STR_PIVOT_ONLYONEROWERR     437
-#define STR_COUNT                   438
+
+#define STR_UNDO_SET_TAB_BG_COLOR       438
+#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439
+
+#define STR_COUNT                       440
 
 #endif
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index c2bf3e96ed5c..aad25ab4d0a4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -833,8 +833,10 @@
 #define FID_TAB_INDEX           (TAB_POPUP_START+6)
 #define FID_TAB_RTL             (TAB_POPUP_START+7)
 #define FID_TAB_DESELECTALL     (TAB_POPUP_START+8)
+#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9)
+#define FID_TAB_SET_TAB_BG_COLOR      (TAB_POPUP_START + 10)
 
-#define TAB_POPUP_END           (DATA_MENU_END + 20)
+#define TAB_POPUP_END           (TAB_POPUP_START + 20)
 
 #define OBJBAR_FORMAT_START     (TAB_POPUP_END)
 #define SID_ALIGNLEFT           (OBJBAR_FORMAT_START+6)
@@ -1423,7 +1425,10 @@
 
 #define RID_SCSTR_ONCLICK       (STR_START + 402)
 
-#define STR_END                 RID_SCSTR_ONCLICK
+#define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
+#define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
+
+#define STR_END                 (SCSTR_NO_TAB_BG_COLOR)
 
 #define BMP_START               (STR_END)
 
@@ -1631,8 +1636,9 @@
 #define RID_SCDLG_RETYPEPASS_INPUT      (SC_DIALOGS_START + 151)
 #define RID_SCDLG_TEXT_IMPORT_OPTIONS   (SC_DIALOGS_START + 152)
 #define RID_POPUP_FILTER                (SC_DIALOGS_START + 153)
+#define RID_SCDLG_TAB_BG_COLOR          (SC_DIALOGS_START + 154)
 
-#define SC_DIALOGS_END                  (SC_DIALOGS_START + 154)
+#define SC_DIALOGS_END                  (SC_DIALOGS_START + 155)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index d3c19bb539d5..442e62bdd9cb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -286,6 +286,12 @@ public:
     virtual void GetInputString( String& rString ) const = 0;
 };
 
+class AbstractScTabBgColorDlg : public VclAbstractDialog  //add for ScTabBgColorDlg
+{
+public:
+    virtual void GetSelectedColor( Color& rColor ) const = 0;
+};
+
 class AbstractScImportOptionsDlg : public VclAbstractDialog  //add for ScImportOptionsDlg
 {
 public:
@@ -435,6 +441,14 @@ public:
                                                                 const String& rDefault,
                                                                 ULONG nHelpId ,
                                                                 int nId ) = 0;
+
+    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent, //add for ScTabBgColorDlg
+                                                                const String& rTitle, //Dialog Title
+                                                                const String& rTabBgColorNoColorText, //Label for no tab color
+                                                                const Color& rDefaultColor, //Currently selected Color
+                                                                ULONG nHelpId ,
+                                                                int nId ) = 0;
+
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window*                 pParent, //add for ScImportOptionsDlg
                                                                     int nId,
                                                                     BOOL                    bAscii = TRUE,
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 984e36bec03e..bd5d40709cd4 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -282,13 +282,11 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     void                SetInSharedDocSaving( bool bNew )   { mbIsInSharedDocSaving = bNew; }
     bool                IsInSharedDocSaving() const         { return mbIsInSharedDocSaving; }
 
-    //<!--Added by PengYunQuan for Validity Cell Range Picker
     SC_DLLPUBLIC BOOL   RegisterRefWindow( USHORT nSlotId, Window *pWnd );
     SC_DLLPUBLIC BOOL   UnregisterRefWindow( USHORT nSlotId, Window *pWnd );
     SC_DLLPUBLIC BOOL   IsAliveRefDlg( USHORT nSlotId, Window *pWnd );
     SC_DLLPUBLIC Window * Find1RefWindow( USHORT nSlotId, Window *pWndAncestor );
     SC_DLLPUBLIC Window * Find1RefWindow( Window *pWndAncestor );
-    //-->Added by PengYunQuan for Validity Cell Range Picker
 };
 
 #define SC_MOD() ( *(ScModule**) GetAppData(SHL_CALC) )
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
new file mode 100644
index 000000000000..c2b2a63baf65
--- /dev/null
+++ b/sc/inc/tabbgcolor.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: tabbgcolor.hxx,v $
+ * $Revision: 1.00 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_TABBGCOLOR_HXX
+#define SC_TABBGCOLOR_HXX
+
+#include "tools/color.hxx"
+#include "address.hxx"
+
+#include <vector>
+
+struct ScUndoTabColorInfo
+{
+    SCTAB mnTabId;
+    Color maOldTabBgColor;
+    Color maNewTabBgColor;
+
+    bool IsDefaultOldTabBgColor() const;
+    bool IsDefaultNewTabBgColor() const;
+
+    explicit ScUndoTabColorInfo(SCTAB nTab);
+    ScUndoTabColorInfo(const ScUndoTabColorInfo& r);
+
+    typedef ::std::vector<ScUndoTabColorInfo> List;
+};
+
+#endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index aed123bd7a65..e93f4e381f95 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -153,6 +153,7 @@ private:
 
     ScRangeList*    pScenarioRanges;
     Color           aScenarioColor;
+    Color           aTabBgColor;
     USHORT          nScenarioFlags;
     BOOL            bActiveScenario;
 
@@ -209,6 +210,8 @@ public:
     void        SetScenarioComment( const String& rComment ) { aComment = rComment; }
     const Color& GetScenarioColor() const                    { return aScenarioColor; }
     void        SetScenarioColor(const Color& rNew)          { aScenarioColor = rNew; }
+    const Color& GetTabBgColor() const;
+    void         SetTabBgColor(const Color& rColor);
     USHORT      GetScenarioFlags() const                     { return nScenarioFlags; }
     void        SetScenarioFlags(USHORT nNew)                { nScenarioFlags = nNew; }
     void        SetActiveScenario(BOOL bSet)                 { bActiveScenario = bSet; }
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 4cf609d3644f..48ea39d40181 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -173,6 +173,7 @@
 #define SC_UNONAME_COPYFORM         "CopyFormulas"
 #define SC_UNONAME_TABLAYOUT        "TableLayout"
 #define SC_UNONAME_AUTOPRINT        "AutomaticPrintArea"
+#define SC_UNONAME_TABCOLOR         "TabColor"
 
 //  LinkTarget
 #define SC_UNO_LINKDISPBIT          "LinkDisplayBitmap"
@@ -527,6 +528,7 @@
 #define SC_UNO_ZOOMTYPE             "ZoomType"
 #define SC_UNO_ZOOMVALUE            "ZoomValue"
 #define SC_UNO_UPDTEMPL             "UpdateFromTemplate"
+
 /*Stampit enable/disable print cancel */
 #define SC_UNO_ALLOWPRINTJOBCANCEL  "AllowPrintJobCancel"
 
diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx
index f58c3248bf81..175022a0ba14 100644
--- a/sc/inc/unowids.hxx
+++ b/sc/inc/unowids.hxx
@@ -78,7 +78,8 @@
 #define SC_WID_UNO_AUTOPRINT        ( SC_WID_UNO_START + 38 )
 #define SC_WID_UNO_ABSNAME          ( SC_WID_UNO_START + 39 )
 #define SC_WID_UNO_CODENAME         ( SC_WID_UNO_START + 40 )
-#define SC_WID_UNO_END              ( SC_WID_UNO_START + 40 )
+#define SC_WID_UNO_TABCOLOR         ( SC_WID_UNO_START + 41 )
+#define SC_WID_UNO_END              ( SC_WID_UNO_START + 41 )
 
 
 inline BOOL IsScUnoWid( USHORT nWid )