Skip to content

C
core
Kaydet (Commit) 32ac07a9 authored tarafından Chr. Rossmanith's avatar Chr. Rossmanith
Dosyalara gözat
Seçenekler

Remove RTL_CONSTASCII_STRINGPARAM (unotools) 

Change-Id: Id6f9a357431a636c5982964452a0f067e884da96
üst 97346bdd
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 37 deletions
unotools/source/i18n/localedatawrapper.cxx
Dosyayı görüntüle @ 32ac07a9
...@@ -339,13 +339,11 @@ void LocaleDataWrapper::invalidateData() ...@@ -339,13 +339,11 @@ void LocaleDataWrapper::invalidateData()
// && !aDebugLocale.EqualsAscii( "es-BR" ) // ?!? Brazil/es // && !aDebugLocale.EqualsAscii( "es-BR" ) // ?!? Brazil/es
) )
{ {
rtl::OUStringBuffer aMsg; rtl::OUStringBuffer aMsg("ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n");
aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(
"ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"));
aMsg.append(aDebugLocale); aMsg.append(aDebugLocale);
aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( " -> 0x")); aMsg.appendAscii(" -> 0x");
aMsg.append(static_cast<sal_Int32>(eLang), 16); aMsg.append(static_cast<sal_Int32>(eLang), 16);
aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( " -> ")); aMsg.appendAscii(" -> ");
aMsg.append(aBackLanguageTag.getBcp47()); aMsg.append(aBackLanguageTag.getBcp47());
outputCheckMessage( aMsg.makeStringAndClear() ); outputCheckMessage( aMsg.makeStringAndClear() );
} }
...@@ -610,8 +608,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl() ...@@ -610,8 +608,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl()
{ {
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" );
"LocaleDataWrapper::getCurrSymbolsImpl: no default currency"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
nElem = 0; nElem = 0;
...@@ -720,8 +717,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() ...@@ -720,8 +717,7 @@ void LocaleDataWrapper::getCurrFormatsImpl()
{ // bad luck { // bad luck
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" );
"LocaleDataWrapper::getCurrFormatsImpl: no currency formats"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault;
...@@ -769,8 +765,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() ...@@ -769,8 +765,7 @@ void LocaleDataWrapper::getCurrFormatsImpl()
scanCurrFormatImpl( pFormatArr[nElem].Code, 0, nSign, nPar, nNum, nBlank, nSym ); scanCurrFormatImpl( pFormatArr[nElem].Code, 0, nSign, nPar, nNum, nBlank, nSym );
if (areChecksEnabled() && (nNum == -1 || nSym == -1)) if (areChecksEnabled() && (nNum == -1 || nSym == -1))
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" );
"LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
if (nBlank == -1) if (nBlank == -1)
...@@ -798,8 +793,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() ...@@ -798,8 +793,7 @@ void LocaleDataWrapper::getCurrFormatsImpl()
scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym ); scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym );
if (areChecksEnabled() && (nNum == -1 || nSym == -1 || (nPar == -1 && nSign == -1))) if (areChecksEnabled() && (nNum == -1 || nSym == -1 || (nPar == -1 && nSign == -1)))
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" );
"LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
// NOTE: one of nPar or nSign are allowed to be -1 // NOTE: one of nPar or nSign are allowed to be -1
...@@ -935,8 +929,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) ...@@ -935,8 +929,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode )
{ {
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: not all DMY present" );
"LocaleDataWrapper::scanDateFormat: not all DMY present"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
if (nDay == -1) if (nDay == -1)
...@@ -958,8 +951,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) ...@@ -958,8 +951,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode )
{ {
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: no magic applyable" );
"LocaleDataWrapper::scanDateFormat: no magic applyable"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
return DMY; return DMY;
...@@ -977,8 +969,7 @@ void LocaleDataWrapper::getDateFormatsImpl() ...@@ -977,8 +969,7 @@ void LocaleDataWrapper::getDateFormatsImpl()
{ // bad luck { // bad luck
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no date formats" );
"LocaleDataWrapper::getDateFormatsImpl: no date formats"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
nDateFormat = nLongDateFormat = DMY; nDateFormat = nLongDateFormat = DMY;
...@@ -1022,16 +1013,14 @@ void LocaleDataWrapper::getDateFormatsImpl() ...@@ -1022,16 +1013,14 @@ void LocaleDataWrapper::getDateFormatsImpl()
{ {
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no edit" );
"LocaleDataWrapper::getDateFormatsImpl: no edit"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
if ( nDef == -1 ) if ( nDef == -1 )
{ {
if (areChecksEnabled()) if (areChecksEnabled())
{ {
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no default" );
"LocaleDataWrapper::getDateFormatsImpl: no default"));
outputCheckMessage( appendLocaleInfo( aMsg ) ); outputCheckMessage( appendLocaleInfo( aMsg ) );
} }
if ( nMedium != -1 ) if ( nMedium != -1 )
...@@ -1078,8 +1067,8 @@ void LocaleDataWrapper::getDigitGroupingImpl() ...@@ -1078,8 +1067,8 @@ void LocaleDataWrapper::getDigitGroupingImpl()
if (!aGrouping[0]) if (!aGrouping[0])
{ {
i18n::LanguageCountryInfo aLCInfo( getLanguageCountryInfo()); i18n::LanguageCountryInfo aLCInfo( getLanguageCountryInfo());
if (aLCInfo.Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IN")) || // India if (aLCInfo.Country.equalsIgnoreAsciiCase("IN") || // India
aLCInfo.Country.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("BT")) ) // Bhutan aLCInfo.Country.equalsIgnoreAsciiCase("BT") ) // Bhutan
{ {
aGrouping[0] = 3; aGrouping[0] = 3;
aGrouping[1] = 2; aGrouping[1] = 2;
...@@ -1772,10 +1761,10 @@ rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg ...@@ -1772,10 +1761,10 @@ rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg
rtl::OUStringBuffer aDebugMsg(rDebugMsg); rtl::OUStringBuffer aDebugMsg(rDebugMsg);
aDebugMsg.append(static_cast<sal_Unicode>('\n')); aDebugMsg.append(static_cast<sal_Unicode>('\n'));
aDebugMsg.append(maLanguageTag.getBcp47()); aDebugMsg.append(maLanguageTag.getBcp47());
aDebugMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(" requested\n")); aDebugMsg.appendAscii(" requested\n");
LanguageTag aLoaded = getLoadedLanguageTag(); LanguageTag aLoaded = getLoadedLanguageTag();
aDebugMsg.append(aLoaded.getBcp47()); aDebugMsg.append(aLoaded.getBcp47());
aDebugMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(" loaded")); aDebugMsg.appendAscii(" loaded");
return aDebugMsg.makeStringAndClear(); return aDebugMsg.makeStringAndClear();
} }
......
unotools/source/ucbhelper/ucblockbytes.cxx
Dosyayı görüntüle @ 32ac07a9
...@@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc ...@@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
PropertyChangeEvent evt (rEvent[i]); PropertyChangeEvent evt (rEvent[i]);
if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("DocumentHeader"))) if (evt.PropertyName == ::rtl::OUString("DocumentHeader"))
{ {
Sequence<DocumentHeaderField> aHead; Sequence<DocumentHeaderField> aHead;
if (evt.NewValue >>= aHead) if (evt.NewValue >>= aHead)
...@@ -211,12 +211,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc ...@@ -211,12 +211,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
m_xLockBytes->SetStreamValid_Impl(); m_xLockBytes->SetStreamValid_Impl();
} }
else if (evt.PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationURL"))) else if (evt.PropertyName == rtl::OUString("PresentationURL"))
{ {
::rtl::OUString aUrl; ::rtl::OUString aUrl;
if (evt.NewValue >>= aUrl) if (evt.NewValue >>= aUrl)
{ {
::rtl::OUString aBad (RTL_CONSTASCII_USTRINGPARAM ("private:")); ::rtl::OUString aBad ("private:");
if (!aUrl.startsWith(aBad)) if (!aUrl.startsWith(aBad))
{ {
// URL changed (Redirection). // URL changed (Redirection).
...@@ -224,7 +224,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc ...@@ -224,7 +224,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
} }
} }
} }
else if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MediaType"))) else if (evt.PropertyName == ::rtl::OUString("MediaType"))
{ {
::rtl::OUString aContentType; ::rtl::OUString aContentType;
if (evt.NewValue >>= aContentType) if (evt.NewValue >>= aContentType)
...@@ -910,10 +910,10 @@ static sal_Bool UCBOpenContentSync( ...@@ -910,10 +910,10 @@ static sal_Bool UCBOpenContentSync(
aScheme = xContId->getContentProviderScheme(); aScheme = xContId->getContentProviderScheme();
// now determine whether we use a timeout or not; // now determine whether we use a timeout or not;
if( ! aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("http")) && if( ! aScheme.equalsIgnoreAsciiCase("http") &&
! aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("https")) && ! aScheme.equalsIgnoreAsciiCase("https") &&
! aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.webdav")) && ! aScheme.equalsIgnoreAsciiCase("vnd.sun.star.webdav") &&
! aScheme.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("ftp"))) ! aScheme.equalsIgnoreAsciiCase("ftp"))
return _UCBOpenContentSync( return _UCBOpenContentSync(
xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler);
......
unotools/source/ucbhelper/xtempfile.cxx
Dosyayı görüntüle @ 32ac07a9
...@@ -446,12 +446,12 @@ throw ( ::css::uno::RuntimeException ) ...@@ -446,12 +446,12 @@ throw ( ::css::uno::RuntimeException )
::rtl::OUString OTempFileService::getImplementationName_Static () ::rtl::OUString OTempFileService::getImplementationName_Static ()
{ {
return ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.io.comp.TempFile" ) ); return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" );
} }
::css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static() ::css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static()
{ {
::css::uno::Sequence < ::rtl::OUString > aNames ( 1 ); ::css::uno::Sequence < ::rtl::OUString > aNames ( 1 );
aNames[0] = ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.io.TempFile" ) ); aNames[0] = "com.sun.star.io.TempFile";
return aNames; return aNames;
} }
::css::uno::Reference < ::css::uno::XInterface >SAL_CALL XTempFile_createInstance( ::css::uno::Reference < ::css::uno::XInterface >SAL_CALL XTempFile_createInstance(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment