[Libreoffice-commits] .: 5 commits - bridges/source cpputools/source io/source sal/osl sal/textenc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Oct 25 13:28:04 PDT 2010
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 4 ++--
bridges/source/remote/static/helper.cxx | 2 +-
bridges/source/remote/urp/urp_bridgeimpl.cxx | 8 ++++----
bridges/source/remote/urp/urp_environment.cxx | 4 ++--
bridges/source/remote/urp/urp_propertyobject.cxx | 2 +-
cpputools/source/regcomplazy/regcomplazy.cxx | 11 +++++------
cpputools/source/registercomponent/registercomponent.cxx | 12 ++++++------
cpputools/source/unoexe/unoexe.cxx | 6 +++---
io/source/acceptor/acc_pipe.cxx | 8 ++++----
io/source/acceptor/acceptor.cxx | 2 +-
io/source/connector/connector.cxx | 12 ++++++------
io/source/connector/ctr_pipe.cxx | 2 +-
io/source/stm/omark.cxx | 2 +-
io/source/stm/opump.cxx | 4 ++--
sal/osl/unx/file_path_helper.cxx | 6 +++---
sal/textenc/convertiscii.tab | 2 +-
sal/textenc/tencinfo.c | 5 +++++
17 files changed, 48 insertions(+), 44 deletions(-)
New commits:
commit 7d7c79714a3cf863a464b82ce1eef58e5c4447f3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 25 21:03:26 2010 +0100
#i113212# support x-iscii-de/RTL_TEXTENCODING_ISCII_DEVANGARI mapping
diff --git a/sal/textenc/convertiscii.tab b/sal/textenc/convertiscii.tab
index 713309d..891ee83 100644
--- a/sal/textenc/convertiscii.tab
+++ b/sal/textenc/convertiscii.tab
@@ -108,5 +108,5 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData
1,
1,
NULL,
- NULL,
+ "x-iscii-de",
RTL_TEXTENCODING_INFO_ASCII };
diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c
index 4375f84..579ac54 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -750,6 +750,9 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pM
{ "csptcp154", RTL_TEXTENCODING_PT154 },
{ "pt154", RTL_TEXTENCODING_PT154 },
{ "cp154", RTL_TEXTENCODING_PT154 },
+ { "xisciide", RTL_TEXTENCODING_ISCII_DEVANAGARI },
+ /* This is not an official MIME character set name, but is in use by
+ various windows APIs. */
{ NULL, RTL_TEXTENCODING_DONTKNOW }
};
@@ -912,6 +915,7 @@ rtl_getTextEncodingFromWindowsCodePage(sal_uInt32 nCodePage)
case 51932: return RTL_TEXTENCODING_EUC_JP;
case 51936: return RTL_TEXTENCODING_EUC_CN;
case 51949: return RTL_TEXTENCODING_EUC_KR;
+ case 57002: return RTL_TEXTENCODING_ISCII_DEVANAGARI;
case 65000: return RTL_TEXTENCODING_UTF7;
case 65001: return RTL_TEXTENCODING_UTF8;
default: return RTL_TEXTENCODING_DONTKNOW;
@@ -987,6 +991,7 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding)
case RTL_TEXTENCODING_EUC_JP: return 51932;
case RTL_TEXTENCODING_EUC_CN: return 51936;
case RTL_TEXTENCODING_EUC_KR: return 51949;
+ case RTL_TEXTENCODING_ISCII_DEVANAGARI: return 57002;
case RTL_TEXTENCODING_UTF7: return 65000;
case RTL_TEXTENCODING_UTF8: return 65001;
default: return 0;
commit 721498cbf2922541af4436652b6b4442790c331b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 25 12:47:12 2010 +0100
micro optimizations
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 81d8afb..61efcb7 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -84,7 +84,7 @@ namespace io_acceptor
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+ m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
m_sDescription += OUString::valueOf(
sal::static_int_cast<sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)),
@@ -167,7 +167,7 @@ namespace io_acceptor
m_pipe = Pipe( m_sPipeName.pData , osl_Pipe_CREATE , osl::Security() );
if( ! m_pipe.is() )
{
- OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > () );
}
@@ -182,7 +182,7 @@ namespace io_acceptor
}
if( ! pipe.is() )
{
- OUString error = OUString::createFromAscii( "io.acceptor: pipe already closed" );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: pipe already closed"));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > () );
}
@@ -202,7 +202,7 @@ namespace io_acceptor
}
else
{
- OUString error = OUString::createFromAscii( "io.acceptor: Couldn't setup pipe " );
+ OUString error = OUString(RTL_CONSTASCII_USTRINGPARAM("io.acceptor: Couldn't setup pipe "));
error += m_sPipeName;
throw ConnectionSetupException( error, Reference< XInterface > ());
}
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 2e81554..487f173 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -308,7 +308,7 @@ namespace io_acceptor
if( !pNames )
{
static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
pNames = &seqNames;
}
}
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 84491ca..da55d84 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -119,11 +119,11 @@ namespace stoc_connector
}
else
{
- OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to pipe " );
+ OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to pipe "));
sMessage += aName;
- sMessage += OUString::createFromAscii( "(" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("("));
sMessage += OUString::valueOf( (sal_Int32 ) pConn->m_pipe.getError() );
- sMessage += OUString::createFromAscii( ")" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
delete pConn;
throw NoConnectException( sMessage ,Reference< XInterface > () );
}
@@ -153,10 +153,10 @@ namespace stoc_connector
SocketAddr AddrTarget( aHost.pData, nPort );
if(pConn->m_socket.connect(AddrTarget) != osl_Socket_Ok)
{
- OUString sMessage = OUString::createFromAscii( "Connector : couldn't connect to socket (" );
+ OUString sMessage = OUString(RTL_CONSTASCII_USTRINGPARAM("Connector : couldn't connect to socket ("));
OUString sError = pConn->m_socket.getErrorAsString();
sMessage += sError;
- sMessage += OUString::createFromAscii( ")" );
+ sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
delete pConn;
throw NoConnectException( sMessage, Reference < XInterface > () );
}
@@ -211,7 +211,7 @@ namespace stoc_connector
if( !pNames )
{
static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+ seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
pNames = &seqNames;
}
}
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 34e4195..8a347a7 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -46,7 +46,7 @@ namespace stoc_connector {
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
// make it unique
- m_sDescription += OUString::createFromAscii( ",uniqueValue=" );
+ m_sDescription += OUString(RTL_CONSTASCII_USTRINGPARAM(",uniqueValue="));
m_sDescription += OUString::valueOf(
sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(&m_pipe)),
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index d8c1710..13ce6db 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -730,7 +730,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
{
if ( nBytesToSkip < 0 )
throw BufferSizeExceededException(
- ::rtl::OUString::createFromAscii( "precondition not met: XInputStream::skipBytes: non-negative integer required!" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("precondition not met: XInputStream::skipBytes: non-negative integer required!")),
*this
);
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index ef24842..d0b78f9 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -280,7 +280,7 @@ void Pump::run()
if( ! rInput.is() )
{
NotConnectedException exception(
- OUString::createFromAscii( "no input stream set" ) , Reference<XInterface>((OWeakObject*)this) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("no input stream set")) , Reference<XInterface>((OWeakObject*)this) );
throw exception;
}
Sequence< sal_Int8 > aData;
@@ -289,7 +289,7 @@ void Pump::run()
if( ! rOutput.is() )
{
NotConnectedException exception(
- OUString::createFromAscii( "no output stream set" ) , Reference<XInterface>( (OWeakObject*)this) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("no output stream set")) , Reference<XInterface>( (OWeakObject*)this) );
throw exception;
}
rOutput->writeBytes( aData );
commit cdcbc2be88c1026ff3f6771b58357454e8e16cce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 25 12:43:57 2010 +0100
micro optimizations
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
index 7b56138..fec0f6a 100644
--- a/cpputools/source/regcomplazy/regcomplazy.cxx
+++ b/cpputools/source/regcomplazy/regcomplazy.cxx
@@ -40,7 +40,6 @@
#include <registry/registry.hxx>
-#define OUSTR(x) ::rtl::OUString::createFromAscii( x )
#define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding())
#define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding())
using namespace ::rtl;
@@ -95,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
++nPos;
}
- OUString sys_path( OUSTR( argv[ nPos ] ) );
+ OUString sys_path( ::rtl::OUString::createFromAscii( argv[ nPos ] ) );
OUString reg_url;
oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, ®_url.pData );
if (osl_File_E_None != rc)
@@ -207,21 +206,21 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
OString sLoaderName = (*comp_iter).sLoaderName;
- OUString usKeyName(OUSTR("UNO/ACTIVATOR"));
+ OUString usKeyName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")));
key.createKey(usKeyName, subKey);
subKey.setValue(OUString(), RG_VALUETYPE_STRING,
(sal_Char*)sLoaderName.getStr(), sLoaderName.getLength()+1);
OString sCompName = (*comp_iter).sComponentName;
- usKeyName = OUSTR("UNO/LOCATION");
+ usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION"));
key.createKey(usKeyName, subKey);
subKey.setValue(OUString(), RG_VALUETYPE_STRING,
(sal_Char*)sCompName.getStr(), sCompName.getLength()+1);
- usKeyName = OUSTR("UNO/SERVICES");
+ usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES"));
key.createKey(usKeyName, subKey);
- rootKey.createKey(OUSTR("/SERVICES"), serviceKey);
+ rootKey.createKey(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/SERVICES")), serviceKey);
OSVector::const_iterator serv_iter = ((*comp_iter).vSupportedServices).begin();
OUString usServiceKeyName;
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index 4f3c498..92f7e2f 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -83,7 +83,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) {
sal_Bool isFileUrl(const OUString& fileName)
{
- if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+ if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True;
return sal_False;
}
@@ -694,7 +694,7 @@ static void bootstrap(
}
reg = Reference< XSimpleRegistry >(
xSMgr->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.registry.SimpleRegistry")), UNO_QUERY);
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), UNO_QUERY);
if (reg.is())
{
@@ -727,15 +727,15 @@ static void bootstrap(
// we know our java loader, so we check, whether a java-loader is
// registered
Reference< XInterface > r = loadSharedLibComponentFactory(
- OUString::createFromAscii( "javavm.uno" SAL_DLLEXTENSION ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.uno" SAL_DLLEXTENSION)),
OUString(),
- OUString::createFromAscii( "com.sun.star.comp.stoc.JavaVirtualMachine" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")),
xSMgr,
Reference< XRegistryKey > () );
Reference< XInterface > r2 = loadSharedLibComponentFactory(
- OUString::createFromAscii( "javaloader.uno" SAL_DLLEXTENSION ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)),
OUString(),
- OUString::createFromAscii(( "com.sun.star.comp.stoc.JavaComponentLoader" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")),
xSMgr,
Reference< XRegistryKey > () );
Reference <XSet> xSet( xSMgr, UNO_QUERY );
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index b7c936b..bac822b 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -90,7 +90,7 @@ namespace unoexe
static sal_Bool isFileUrl(const OUString& fileName)
{
- if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+ if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True;
return sal_False;
}
@@ -159,7 +159,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_Int32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
- const OUString dash = OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+ const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
if(aArg.indexOf(dash) != 0)
return sal_False;
@@ -650,7 +650,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
rtl_getAppCommandArg(nPos, &arg.pData);
- const OUString dashdash = OUString(RTL_CONSTASCII_USTRINGPARAM("--"));
+ const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
if (dashdash == arg)
{
++nPos;
commit bd4432814051ee47ce5a5b34c697fac0f17d79bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 25 12:38:26 2010 +0100
micro optimizations
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 7b8fdeb..a208c2f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -292,7 +292,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException( OUString::createFromAscii("illegal vtable index!"),
+ throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!")),
reinterpret_cast<XInterface *>( pCppI ) );
}
@@ -389,7 +389,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
default:
{
- throw RuntimeException( OUString::createFromAscii("no member description found!"),
+ throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("no member description found!")),
reinterpret_cast<XInterface *>( pCppI ) );
// is here for dummy
eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/remote/static/helper.cxx b/bridges/source/remote/static/helper.cxx
index 17e34b4..d120d38 100644
--- a/bridges/source/remote/static/helper.cxx
+++ b/bridges/source/remote/static/helper.cxx
@@ -128,7 +128,7 @@ void SAL_CALL remote_sendQueryInterface(
// get type for queryInterface
OUString sCompleteMethodName = type.getTypeName();
- sCompleteMethodName += OUString::createFromAscii("::queryInterface");
+ sCompleteMethodName += OUString(RTL_CONSTASCII_USTRINGPARAM("::queryInterface"));
typelib_InterfaceMemberTypeDescription *pMemberType = 0;
typelib_typedescription_getByName(
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.cxx b/bridges/source/remote/urp/urp_bridgeimpl.cxx
index 21222d3..53443a0 100644
--- a/bridges/source/remote/urp/urp_bridgeimpl.cxx
+++ b/bridges/source/remote/urp/urp_bridgeimpl.cxx
@@ -205,9 +205,9 @@ void urp_BridgeImpl::applyProtocolChanges( const Properties &props )
void urp_BridgeImpl::addError( char const *pError )
{
- OUString message = OUString( RTL_CONSTASCII_USTRINGPARAM( "(tid=" ) );
+ OUString message = OUString(RTL_CONSTASCII_USTRINGPARAM("(tid=" ));
message += OUString::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) );
- message += OUString::createFromAscii( ") " );
+ message += OUString(RTL_CONSTASCII_USTRINGPARAM(") "));
message += OUString::createFromAscii( pError );
MutexGuard guard( m_errorListMutex );
m_lstErrors.push_back( message );
@@ -215,9 +215,9 @@ void urp_BridgeImpl::addError( char const *pError )
void urp_BridgeImpl::addError( const OUString & error )
{
- OUString message = OUString( RTL_CONSTASCII_USTRINGPARAM( "(tid=" ) );
+ OUString message = OUString(RTL_CONSTASCII_USTRINGPARAM("(tid="));
message += OUString::valueOf( (sal_Int32 ) osl_getThreadIdentifier( 0 ) );
- message += OUString::createFromAscii( ") " );
+ message += OUString(RTL_CONSTASCII_USTRINGPARAM(") "));
message += error;
MutexGuard guard( m_errorListMutex );
m_lstErrors.push_back( message );
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx
index f0db5b5..9f13e60 100644
--- a/bridges/source/remote/urp/urp_environment.cxx
+++ b/bridges/source/remote/urp/urp_environment.cxx
@@ -515,8 +515,8 @@ void SAL_CALL uno_ext_getMapping(
::rtl::OUString sFromName = pFrom->pTypeName;
::rtl::OUString sToName = pTo->pTypeName;
- ::rtl::OUString sUno = OUString::createFromAscii( UNO_LB_UNO );
- ::rtl::OUString sRemote = OUString::createFromAscii( "urp" );
+ ::rtl::OUString sUno(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO));
+ ::rtl::OUString sRemote(RTL_CONSTASCII_USTRINGPARAM("urp"));
if ( sFromName.equalsIgnoreAsciiCase( sRemote ) &&
sToName.equalsIgnoreAsciiCase( sUno ) )
{
diff --git a/bridges/source/remote/urp/urp_propertyobject.cxx b/bridges/source/remote/urp/urp_propertyobject.cxx
index 599156a..95c290e 100644
--- a/bridges/source/remote/urp/urp_propertyobject.cxx
+++ b/bridges/source/remote/urp/urp_propertyobject.cxx
@@ -761,7 +761,7 @@ void SAL_CALL PropertyObject::implCommitChange( uno_Sequence *pSequence, uno_Any
{
InvalidProtocolChangeException exception;
Type type = getCppuType( &exception );
- exception.Message = OUString::createFromAscii( "urp: unknown Property " );
+ exception.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("urp: unknown Property "));
exception.Message += pP[i].Name;
exception.invalidProperty = pP[i];
exception.reason = 1;
commit dbc74eca2e97316960c70cfd26e75b6f5069b657
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 25 12:22:45 2010 +0100
micro optimizations
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 6154fa4..5e581d3 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -62,11 +62,11 @@
const sal_Unicode FPH_CHAR_COLON = (sal_Unicode)':';
inline const rtl::OUString FPH_PATH_SEPARATOR()
- { return rtl::OUString::createFromAscii("/"); }
+ { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
- { return rtl::OUString::createFromAscii("."); }
+ { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); }
inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
- { return rtl::OUString::createFromAscii(".."); }
+ { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
/*******************************************
* osl_systemPathRemoveSeparator
More information about the Libreoffice-commits
mailing list