diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-06 13:43:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-06 13:48:55 +0100 |
| commit | 3b79694781e825a215842e57287e6054db591c57 (patch) | |
| tree | 34743556cae6f741bc568d35bfc0ebf0a4f82d76 /sw/inc | |
| parent | 03977c451acd3aadf2509397dc8224bd80ce419b (diff) | |
SwFrmDlg ctor: turn sRestype into an OUString
In practice, currently possible values are ASCII, but then this string
becomes part of URLs, which are in general no longer ASCII, and are
OUStrings. Instead of trying to guess the encoding of the string we get,
require callers to create an OUString right away.
A follow-up commit could adapt SfxTabDialog ctor,
SwFrmPage::SetFrmType() and SwFrmAddPage::SetFrmType() accordingly to
avoid the new introduced OUStringToOString() calls.
Change-Id: I087ed2bb341f5aca59e15e2ef4102556ca803363
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index f5542757bfa6..c94ca6fc589f 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -389,7 +389,7 @@ public: virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; virtual VclAbstractDialog* CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; - virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OString &rDialogType, + virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OUString &rDialogType, SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, |