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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/objembed.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 5d597a83e816..73a1934ef015 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -619,9 +619,9 @@ public: virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pFormat, - String * pAppName, - String * pFullTypeName, - String * pShortTypeName, + OUString * pAppName, + OUString * pFullTypeName, + OUString * pShortTypeName, sal_Int32 nVersion, sal_Bool bTemplate = sal_False) const = 0; diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index ede1a205d6ec..f613e2b177b8 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -156,7 +156,7 @@ void SfxObjectShell::SetMapUnit( MapUnit nMapUnit ) void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) const { sal_uInt32 nClipFormat; - String aAppName, aShortName; + OUString aAppName, aShortName; FillClass( &rDesc.maClassName, &nClipFormat, &aAppName, &rDesc.maTypeName, &aShortName, SOFFICE_FILEFORMAT_CURRENT ); rDesc.mnViewAspect = ASPECT_CONTENT; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index bd862c67b5f7..e352b5a9799f 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -315,7 +315,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto if ( xProps.is() ) { SvGlobalName aName; - String aFullTypeName, aShortTypeName, aAppName; + OUString aFullTypeName, aShortTypeName, aAppName; sal_uInt32 nClipFormat=0; FillClass( &aName, &nClipFormat, &aAppName, &aFullTypeName, &aShortTypeName, nVersion, bTemplate ); |