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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 0c585a95fda6..a9707de00786 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -171,9 +171,9 @@ TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-I void ScDocShell::FillClass( SvGlobalName* pClassName, sal_uInt32* pFormat, - String* /* pAppName */, - String* pFullTypeName, - String* pShortTypeName, + OUString* /* pAppName */, + OUString* pFullTypeName, + OUString* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate /* = sal_False */) const { @@ -181,8 +181,8 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, { *pClassName = SvGlobalName( SO3_SC_CLASSID_60 ); *pFormat = SOT_FORMATSTR_ID_STARCALC_60; - *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) ); - *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); + *pFullTypeName = OUString( ScResId( SCSTR_LONG_SCDOC_NAME ) ); + *pShortTypeName = OUString( ScResId( SCSTR_SHORT_SCDOC_NAME ) ); } else if ( nFileFormat == SOFFICE_FILEFORMAT_8 ) { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index b49bbe462ea1..ade8dfb64a01 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -189,9 +189,9 @@ public: virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pFormat, - String * pAppName, - String * pFullTypeName, - String * pShortTypeName, + OUString * pAppName, + OUString * pFullTypeName, + OUString * pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = false ) const; |