add all the new conditional formats to the menu, related fdo#58778

Change-Id: I398fac5c585b5ea6e40331b50119c90c180a32bc

officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu

@@ -459,6 +459,16 @@
                     <value xml:lang="en-US">Data Bar...</value>
                 </prop>
             </node>
+            <node oor:name=".uno:IconSetFormatDialog" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Icon Set...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:CondDateFormatDialog" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Date...</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ConditionalFormatManagerDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Manage...</value>

sc/inc/sc.hrc

@@ -245,6 +245,8 @@
 #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
 #define SID_OPENDLG_COLORSCALE      (SC_MESSAGE_START + 66)
 #define SID_OPENDLG_DATABAR         (SC_MESSAGE_START + 67)
+#define SID_OPENDLG_ICONSET         (SC_MESSAGE_START + 68)
+#define SID_OPENDLG_CONDDATE        (SC_MESSAGE_START + 69)
 
 // functions
 

sc/sdi/cellsh.sdi

@@ -183,6 +183,8 @@ interface CellSelection
     SID_OPENDLG_CONDFRMT    [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     SID_OPENDLG_COLORSCALE  [ ExecMethod = ExecuteEdit; ]
     SID_OPENDLG_DATABAR     [ ExecMethod = ExecuteEdit; ]
+    SID_OPENDLG_ICONSET     [ ExecMethod = ExecuteEdit; ]
+    SID_OPENDLG_CONDDATE    [ ExecMethod = ExecuteEdit; ]
     SID_OPENDLG_CONDFRMT_MANAGER    [ ExecMethod = ExecuteEdit; ]
     SID_COLORSCALE          [ ExecMethod = ExecuteEdit; ]
     SID_DATABAR             [ ExecMethod = ExecuteEdit; ]

sc/sdi/scalc.sdi

@@ -1134,6 +1134,56 @@ SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR
     GroupId = GID_FORMAT;
 ]
 
+//--------------------------------------------------------------------------
+SfxVoidItem IconSetFormatDialog SID_OPENDLG_ICONSET
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem CondDateFormatDialog SID_OPENDLG_CONDDATE
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
 //--------------------------------------------------------------------------
 SfxVoidItem ConditionalFormatManagerDialog SID_OPENDLG_CONDFRMT_MANAGER
 ()

sc/source/ui/condformat/condformatdlg.cxx

@@ -119,7 +119,13 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocum
             case condformat::dialog::DATABAR:
                 maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc, maPos ));
                 break;
-            default:
+            case condformat::dialog::ICONSET:
+                maEntries.push_back(new ScIconSetFrmtEntry( this, mpDoc, maPos ));
+                break;
+            case condformat::dialog::DATE:
+                maEntries.push_back(new ScDateFrmtEntry( this, mpDoc ));
+                break;
+            case condformat::dialog::NONE:
                 break;
         }
     }

sc/source/ui/inc/condformatdlg.hxx

@@ -58,7 +58,9 @@ enum ScCondFormatDialogType
     NONE,
     CONDITION,
     COLORSCALE,
-    DATABAR
+    DATABAR,
+    ICONSET,
+    DATE
 };
 
 }

sc/source/ui/view/cellsh1.cxx

@@ -1759,6 +1759,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_OPENDLG_CONDFRMT:
         case SID_OPENDLG_COLORSCALE:
         case SID_OPENDLG_DATABAR:
+        case SID_OPENDLG_ICONSET:
+        case SID_OPENDLG_CONDDATE:
             {
 
                 ScRangeList aRangeList;
@@ -1865,7 +1867,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         case SID_OPENDLG_DATABAR:
                             eType = condformat::dialog::DATABAR;
                             break;
+                        case SID_OPENDLG_ICONSET:
+                            eType = condformat::dialog::ICONSET;
+                            break;
+                        case SID_OPENDLG_CONDDATE:
+                            eType = condformat::dialog::DATE;
+                            break;
                         default:
+                            assert(false);
                             break;
                     }
                     pCondFormatDlg.reset( new ScCondFormatDlg( pTabViewShell->GetDialogParent(), pDoc, NULL, aRangeList, aRangeList.GetTopLeftCorner(), eType ) );

sc/uiconfig/scalc/menubar/menubar.xml

@@ -292,6 +292,8 @@
                 <menu:menuitem menu:id=".uno:ConditionalFormatDialog"/>
                 <menu:menuitem menu:id=".uno:ColorScaleFormatDialog"/>
                 <menu:menuitem menu:id=".uno:DataBarFormatDialog"/>
+                <menu:menuitem menu:id=".uno:IconSetFormatDialog"/>
+                <menu:menuitem menu:id=".uno:CondDateFormatDialog"/>
                 <menu:menuseparator/>
                 <menu:menuitem menu:id=".uno:ConditionalFormatManagerDialog"/>
               </menu:menupopup>