diff options
Diffstat (limited to 'ucb/source/ucp/file/filglob.cxx')
| -rw-r--r-- | ucb/source/ucp/file/filglob.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 2a3df432fb..3b7af59ede 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include "precompiled_ucb.hxx" #include <stdio.h> #include "filglob.hxx" -#ifndef _FILERROR_HXX_ #include "filerror.hxx" -#endif #include "shell.hxx" #include "bc.hxx" #include <osl/file.hxx> @@ -223,10 +222,10 @@ namespace fileaccess { rtl::OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString::createFromAscii( "/" ); + aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - if( 0 == aParent.compareToAscii( "file://" ) ) - aParent = rtl::OUString::createFromAscii( "file:///" ); + if( aParent.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file://")) ) + aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///")); return aParent; } @@ -390,7 +389,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during file opening")), + "an error occurred during file opening")), xComProc); } else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || @@ -445,7 +444,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during opening a directory")), + "an error occurred during opening a directory")), xComProc); } else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || @@ -462,7 +461,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured writing or reading from a file")), + "an error occurred writing or reading from a file")), xComProc ); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) @@ -528,7 +527,7 @@ namespace fileaccess { xEnv, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "an error occured during opening a file")), + "an error occurred during opening a file")), xComProc); } else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || @@ -537,8 +536,8 @@ namespace fileaccess { Sequence< ::rtl::OUString > aSeq( 1 ); aSeq[0] = ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ) ? - rtl::OUString::createFromAscii( "Title" ) : - rtl::OUString::createFromAscii( "ContentType" ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) : + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")); aAny <<= MissingPropertiesException( rtl::OUString( @@ -604,7 +603,7 @@ namespace fileaccess { InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; PropertyValue prop; - prop.Name = rtl::OUString::createFromAscii("ResourceName"); + prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName")); prop.Handle = -1; rtl::OUString m_aClashingName( rtl::Uri::decode( @@ -952,3 +951,5 @@ namespace fileaccess { } // end namespace fileaccess + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |