diff options
| author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2013-05-14 21:34:18 -0300 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-05-15 14:13:10 +0000 |
| commit | 387c6712c8c49ec7f4521f2c5ac615c355039352 (patch) | |
| tree | e69b07618d681860c652ce97507732a5913c424e /sc/inc | |
| parent | 8c23e31acc61406103c1565960e4c5b391902754 (diff) | |
String to OUString in calc header & footer edit
Conflicts:
sc/inc/scabstdlg.hxx
sc/source/ui/attrdlg/scdlgfact.cxx
sc/source/ui/attrdlg/scdlgfact.hxx
sc/source/ui/inc/hfedtdlg.hxx
sc/source/ui/pagedlg/hfedtdlg.cxx
Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Reviewed-on: https://gerrit.libreoffice.org/3911
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 93bae5a05508..9a0edf4a77b8 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -491,7 +491,7 @@ public: virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg Window* pParent, const SfxItemSet& rCoreSet, - const String& rPageStyle, + const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg |