diff options
| author | Ádám Csaba Király <kiraly.adam.csaba@gmail.com> | 2013-03-05 10:35:52 +0100 |
|---|---|---|
| committer | Muthu Subramanian K <muthusuba@gmail.com> | 2013-03-05 12:48:36 +0000 |
| commit | 10bb5b8e24b90f881ac0ef758bb11a0bbd531a67 (patch) | |
| tree | 267abbb4d2fa1bcb47e2defccea21cef67dacb0a /sd | |
| parent | de02e1e546a2141567afd8a90e54bcde72550ab1 (diff) | |
fdo#38838, replacement of String with OUString
Replaced String with OUString in mediawindow.cxx, basdoc.cxx,
basdoc.hxx and bastype3.cxx. In other files I only replaced,
what was necessary for the changes in basdoc to work.
Change-Id: I1ad0e7e262f8becdf57f182853aaa914a88895a4
Reviewed-on: https://gerrit.libreoffice.org/2554
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 195ca1c72de3..dda95b195ffc 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -937,9 +937,9 @@ sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) void DrawDocShell::FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, - String* , - String* pFullTypeName, - String* pShortTypeName, + OUString* , + OUString* pFullTypeName, + OUString* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate /* = sal_False */) const { @@ -949,13 +949,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, { *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60); *pFormat = SOT_FORMATSTR_ID_STARDRAW_60; - *pFullTypeName = String(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60)); + *pFullTypeName = OUString(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60)); } else { *pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60); *pFormat = SOT_FORMATSTR_ID_STARIMPRESS_60; - *pFullTypeName = String(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60)); + *pFullTypeName = OUString(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60)); } } else if (nFileFormat == SOFFICE_FILEFORMAT_8) @@ -974,7 +974,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, } } - *pShortTypeName = String(SdResId( (meDocType == DOCUMENT_TYPE_DRAW) ? + *pShortTypeName = OUString(SdResId( (meDocType == DOCUMENT_TYPE_DRAW) ? STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT )); } diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index eb75a3c48cba..46afc63bf70e 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -96,7 +96,7 @@ public: virtual SfxStyleSheetBasePool* GetStyleSheetPool(); virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; virtual Size GetFirstPageSize(); - virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; + virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual void SetModified( sal_Bool = sal_True ); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, const SfxItemSet &rSet ); |