officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 10 ------ sc/inc/colorscale.hxx | 4 +- sc/inc/sc.hrc | 15 ++++------ sc/uiconfig/scalc/menubar/menubar.xml | 2 - 4 files changed, 10 insertions(+), 21 deletions(-)
New commits: commit 53d2fc053390c1ca6676f773cc60312e9d44af24 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Jun 12 04:45:51 2012 +0200 make new conditional format menu appear Change-Id: I720037b7759a64d99cd08cf44ce9ae26b8f21873 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 80f6c86..5bf1ec3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -444,16 +444,6 @@ <value xml:lang="en-US">C~onditional Formatting</value> </prop> </node> - <node oor:name=".uno:DataBarDialog" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Data Bar...</value> - </prop> - </node> - <node oor:name=".uno:ColorScaleDialog" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Color Scale...</value> - </prop> - </node> <node oor:name=".uno:ConditionalFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Conditional Formatting...</value> diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e09ea16..e2949d4 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1229,14 +1229,13 @@ #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 RID_SCDLG_FORMULA_CALCOPTIONS (SC_DIALOGS_START + 155) -#define RID_SCPAGE_SORTKEY_FIELDS (SC_DIALOGS_START + 156) -#define RID_SCDLG_SORTKEY (SC_DIALOGS_START + 157) -#define RID_SCDLG_COLORSCALE (SC_DIALOGS_START + 158) -#define RID_SCDLG_DATABAR (SC_DIALOGS_START + 159) -#define RID_COND_ENTRY (SC_DIALOGS_START + 160) - -#define SC_DIALOGS_END (SC_DIALOGS_START + 161) +#define RID_SCDLG_DATABAR (SC_DIALOGS_START + 155) +#define RID_COND_ENTRY (SC_DIALOGS_START + 156) +#define RID_SCDLG_FORMULA_CALCOPTIONS (SC_DIALOGS_START + 157) +#define RID_SCPAGE_SORTKEY_FIELDS (SC_DIALOGS_START + 158) +#define RID_SCDLG_SORTKEY (SC_DIALOGS_START + 159) + +#define SC_DIALOGS_END (SC_DIALOGS_START + 160) #ifndef STD_MASKCOLOR #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index fbea1b9..af9f701 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -261,7 +261,7 @@ <menu:menuitem menu:id=".uno:AutoFormat"/> <menu:menu menu:id=".uno:ConditionalFormatMenu"> <menu:menupopup> - <menu:menuitem menu:id="uno:ConditionalFormatDialog"/> + <menu:menuitem menu:id=".uno:ConditionalFormatDialog"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> commit 7618860eac39b89bce9958a3271033a8b39407b7 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Jun 11 23:12:04 2012 +0200 need to export all symbols for color formats Change-Id: I18209f594ac6aa9ba03081342532e37a7b686571 diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 56e653e..e93d5b6 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -85,7 +85,7 @@ public: namespace databar { -enum ScAxisPostion +enum SC_DLLPUBLIC ScAxisPostion { NONE, AUTOMATIC, @@ -94,7 +94,7 @@ enum ScAxisPostion } -struct ScDataBarFormatData +struct SC_DLLPUBLIC ScDataBarFormatData { ScDataBarFormatData(): mbGradient(true), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits