diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-11 19:51:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-11 22:19:28 +0200 |
| commit | b8061f41373cc90823c93cf9f025647c93496293 (patch) | |
| tree | 5ffa8954183ec0fe07270381bc67bfc11699ed3d /sc/inc | |
| parent | 28e9dcca1f2f0e1bd91e779bf772bcb4a9d8a9f4 (diff) | |
weld ScCondFormatManagerDlg
Change-Id: Iccf2657f2c8fe98b4e975936fb75d56fc9523b5a
Reviewed-on: https://gerrit.libreoffice.org/72162
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/globstr.hrc | 3 | ||||
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 614beb5300bb..78437dc9f9d3 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -423,7 +423,6 @@ #define STR_UNDO_INSERT_CURRENT_TIME NC_("STR_UNDO_INSERT_CURRENT_TIME", "Insert Current Time") #define STR_MANAGE_NAMES NC_("STR_MANAGE_NAMES", "Manage Names...") #define STR_HEADER_NAME NC_("STR_HEADER_NAME", "Name") -#define STR_HEADER_RANGE_OR_EXPR NC_("STR_HEADER_RANGE_OR_EXPR", "Range or formula expression") #define STR_HEADER_SCOPE NC_("STR_HEADER_SCOPE", "Scope") #define STR_MULTI_SELECT NC_("STR_MULTI_SELECT", "(multiple)") #define STR_GLOBAL_SCOPE NC_("STR_GLOBAL_SCOPE", "Document (Global)") @@ -431,8 +430,6 @@ #define STR_ERR_NAME_INVALID NC_("STR_ERR_NAME_INVALID", "Invalid name. Only use letters, numbers and underscore.") #define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF", "This Document contains external references to unsaved documents.\n\nDo you want to continue?") #define STR_CLOSE_WITH_UNSAVED_REFS NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss.") -#define STR_HEADER_RANGE NC_("STR_HEADER_RANGE", "Range") -#define STR_HEADER_COND NC_("STR_HEADER_COND", "First Condition") #define STR_COND_CONDITION NC_("STR_COND_CONDITION", "Cell value is") #define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE", "ColorScale") #define STR_COND_DATABAR NC_("STR_COND_DATABAR", "DataBar") diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index cb6ba6933ee7..afada832cfa0 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -410,7 +410,7 @@ public: virtual VclPtr<AbstractScSortWarningDlg> CreateScSortWarningDlg(weld::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0; - virtual VclPtr<AbstractScCondFormatManagerDlg> CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) = 0; + virtual VclPtr<AbstractScCondFormatManagerDlg> CreateScCondFormatMgrDlg(weld::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList ) = 0; virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(weld::Window* pParent) = 0; |