summaryrefslogtreecommitdiff
path: root/sw/inc/swabstdlg.hxx
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-08-24 12:15:18 +0200
committerMichael Stahl <mstahl@redhat.com>2013-08-25 14:40:31 +0000
commit90f83bd75ffde23a42f1165b5c1e7272dca71164 (patch)
tree38372fabd7467f6471639b975ad700dcc105da76 /sw/inc/swabstdlg.hxx
parent743c7c09b4deb7b62e49268f9867b96e6aab158c (diff)
String to OUString + missing SetText
SetText was addes as seen in other dialogs, for completeness, although all call places seem to pass the default null pointer. Change-Id: I1fe1792ad6f061fc762bae237f5cecfcbbd1ce06 Reviewed-on: https://gerrit.libreoffice.org/5616 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/inc/swabstdlg.hxx')
-rw-r--r--sw/inc/swabstdlg.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 7a6402c0ee8b..9d6f98834350 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -340,7 +340,7 @@ public:
virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg
virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; //add for SwChangeDBDlg
virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const String* pFmtStr = 0) = 0; // add for SwCharDlg
+ sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0; // add for SwCharDlg
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg
virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog
@@ -365,7 +365,7 @@ public:
SwView& rVw,
const SfxItemSet& rCoreSet,
sal_uInt8 nDialogMode,
- const String *pCollName = 0,
+ const OUString *pCollName = 0,
sal_Bool bDraw = sal_False,
OString sDefPage = OString() ) = 0;
@@ -397,7 +397,7 @@ public:
bool bNewFrm = true,
bool bFmt = false,
OString sDefPage = OString(),
- const String* pFmtStr = 0) = 0; //add for SwFrmDlg
+ const OUString* pFmtStr = 0) = 0; //add for SwFrmDlg
// @param nSlot
// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane