diff options
| author | Albert Thuswaldner <albert.thuswaldner@gmail.com> | 2013-04-14 12:41:42 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-15 10:44:35 +0000 |
| commit | db8b11b876ed26fb70cf90f86337395dd2e78f64 (patch) | |
| tree | 1700b79bd34f16bebf1b4856bfe4d061d32a9fe1 /sc/inc | |
| parent | 6fe3a4a31e1cf85bc83fe3eec603b333038eb1fb (diff) | |
Calc: converted sort warning dialog to .ui
Change-Id: I2bc44990efb62183507f46b22bfd8e09edf02eb6
Reviewed-on: https://gerrit.libreoffice.org/3380
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/sc.hrc | 1 | ||||
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index b0bfb20413b0..7e88881c32cb 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1080,7 +1080,6 @@ #define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145) #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146) -#define RID_SCDLG_SORT_WARNING (SC_DIALOGS_START + 147) #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148) #define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 150) #define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 4e9ffaaf5e6e..2e80c1cfc3de 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -46,6 +46,7 @@ class SfxStyleSheetBase; class ScDPObject; struct ScPivotFuncData; struct ScDPNumGroupInfo; +class ScSortWarningDlg; class ScTabViewShell; class ScConditionalFormat; class ScConditionalFormatList; @@ -293,6 +294,10 @@ public: virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; }; +class AbstractScSortWarningDlg : public VclAbstractDialog //add for ScSortWarningDlg +{ +}; + class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg { public: @@ -345,7 +350,8 @@ public: const String& rStrLabel, int nId, sal_Bool bColDefault = sal_True ) = 0; - virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg + + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0; //add for ScSortWarningDlg virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) = 0; |