Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4245
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/4245/1
String->OUString unotools, ucbstreamhelper
Change-Id: I0e16761b2a4937df15a2746767653fd6898f2366
---
M include/tools/StringListResource.hxx
M include/unotools/ucbstreamhelper.hxx
M unotools/source/ucbhelper/ucbstreamhelper.cxx
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/include/tools/StringListResource.hxx b/include/tools/StringListResource.hxx
index 52f22e4..e443b43 100644
--- a/include/tools/StringListResource.hxx
+++ b/include/tools/StringListResource.hxx
@@ -34,7 +34,7 @@
sal_uInt16 i = 1;
while( IsAvailableRes(ResId(i,*m_pResMgr).SetRT(RSC_STRING)) )
{
- String sStr = String(ResId(i,*m_pResMgr));
+ OUString sStr = OUString(ResId(i,*m_pResMgr));
_rToFill.push_back(sStr);
++i;
}
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 85de1f3..868dd8a 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -45,7 +45,6 @@
}
}
-class String;
namespace utl
{
class UcbLockBytesHandler;
@@ -53,12 +52,12 @@
class UNOTOOLS_DLLPUBLIC UcbStreamHelper : public SvStream
{
public:
- static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
+ static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
UcbLockBytesHandler* pHandler=0 );
- static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
+ static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
::com::sun::star::uno::Reference <
::com::sun::star::task::XInteractionHandler >,
UcbLockBytesHandler* pHandler=0 );
- static SvStream* CreateStream( const String& rFileName, StreamMode eOpenMode,
+ static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
sal_Bool bFileExists,
UcbLockBytesHandler* pHandler=0 );
static SvStream* CreateStream( ::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > xStream );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx
b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 1c9e39d..996be34 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -40,7 +40,7 @@
namespace utl
{
-static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode,
+static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMode,
Reference < XInteractionHandler > xInteractionHandler,
UcbLockBytesHandler* pHandler, sal_Bool bEnsureFileExists )
{
@@ -140,20 +140,20 @@
//============================================================================
-SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
UcbLockBytesHandler* pHandler )
{
return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler,
sal_True /* bEnsureFileExists */ );
}
-SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
Reference < XInteractionHandler > xInteractionHandler,
UcbLockBytesHandler* pHandler )
{
return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, sal_True /*
bEnsureFileExists */ );
}
-SvStream* UcbStreamHelper::CreateStream( const String& rFileName, StreamMode eOpenMode,
+SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
sal_Bool bFileExists,
UcbLockBytesHandler* pHandler )
{
--
To view, visit https://gerrit.libreoffice.org/4245
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e16761b2a4937df15a2746767653fd6898f2366
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud@gmail.com>
Context
- [PATCH] String->OUString unotools, ucbstreamhelper · Norbert Thiebaud (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.