summaryrefslogtreecommitdiff
path: root/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx')
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx56
1 files changed, 19 insertions, 37 deletions
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 264117fe16a6..d316740a0490 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -420,10 +420,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
result += OUString::valueOf( number );
break;
case NUMBER_NONE:
- return OUString::createFromAscii(""); // ignore prefix and suffix
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
case CHAR_SPECIAL:
// apparently, we're supposed to return an empty string in this case...
- return OUString::createFromAscii(""); // ignore prefix and suffix
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
case PAGE_DESCRIPTOR:
case BITMAP:
OSL_ASSERT(0);
@@ -459,25 +459,25 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
break;
case NUMBER_LOWER_ZH:
natNum = NativeNumberMode::NATNUM7;
- locale.Language = OUString::createFromAscii("zh");
+ locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
break;
case NUMBER_UPPER_ZH_TW:
- locale.Country = OUString::createFromAscii("TW");
+ locale.Country = OUString(RTL_CONSTASCII_USTRINGPARAM("TW"));
case NUMBER_UPPER_ZH:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString::createFromAscii("zh");
+ locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
break;
case NUMBER_TRADITIONAL_JA:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString::createFromAscii("ja");
+ locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
break;
case NUMBER_UPPER_KO:
natNum = NativeNumberMode::NATNUM8;
- locale.Language = OUString::createFromAscii("ko");
+ locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
break;
case NUMBER_HANGUL_KO:
natNum = NativeNumberMode::NATNUM11;
- locale.Language = OUString::createFromAscii("ko");
+ locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
break;
case CIRCLE_NUMBER:
@@ -646,9 +646,6 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
return result;
}
-/* -----------------------------21.02.01 15:57--------------------------------
-
- ---------------------------------------------------------------------------*/
#define LANG_ALL (1 << 0)
#define LANG_CJK (1 << 1)
@@ -715,9 +712,6 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
};
static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
-/* -----------------------------21.02.01 15:57--------------------------------
-
- ---------------------------------------------------------------------------*/
OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
throw(RuntimeException)
@@ -727,17 +721,17 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
// return OUString::createFromAscii(aSupportedTypes[index].cSymbol);
else {
OUString result;
- Locale aLocale(OUString::createFromAscii("en"), OUString(), OUString());
+ Locale aLocale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(), OUString());
Sequence<beans::PropertyValue> aProperties(2);
- aProperties[0].Name = OUString::createFromAscii("NumberingType");
+ aProperties[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
aProperties[0].Value <<= aSupportedTypes[index].nType;
- aProperties[1].Name = OUString::createFromAscii("Value");
+ aProperties[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
for (sal_Int32 j = 1; j <= 3; j++) {
aProperties[1].Value <<= j;
result += makeNumberingString( aProperties, aLocale );
- result += OUString::createFromAscii(", ");
+ result += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
}
- result += OUString::createFromAscii("...");
+ result += OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
return result;
}
}
@@ -748,7 +742,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
if (! xHierarchicalNameAccess.is()) {
Reference< XInterface > xInterface;
- xInterface = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"));
+ xInterface = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")));
Reference< XMultiServiceFactory > xConfigProvider =
Reference< XMultiServiceFactory >(xInterface, UNO_QUERY );
@@ -757,12 +751,12 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
Sequence< Any > aArgs(1);
beans::PropertyValue aPath;
- aPath.Name = OUString::createFromAscii("nodepath");
- aPath.Value <<= OUString::createFromAscii("/org.openoffice.Office.Common/I18N"),
+ aPath.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aPath.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N")),
aArgs[0] <<= aPath;
xInterface = xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), aArgs);
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), aArgs);
xHierarchicalNameAccess.set(xInterface, UNO_QUERY);
@@ -785,8 +779,8 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( )
Sequence< sal_Int16 > aRet(nSupported_NumberingTypes );
sal_Int16* pArray = aRet.getArray();
- sal_Bool cjkEnabled = isScriptFlagEnabled(OUString::createFromAscii("CJK/CJKFont"));
- sal_Bool ctlEnabled = isScriptFlagEnabled(OUString::createFromAscii("CTL/CTLFont"));
+ sal_Bool cjkEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CJK/CJKFont")));
+ sal_Bool ctlEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CTL/CTLFont")));
for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) {
if ( (aSupportedTypes[i].langOption & LANG_ALL) ||
@@ -796,9 +790,7 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( )
}
return aRet;
}
-/* -----------------------------21.02.01 15:57--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier )
throw(RuntimeException)
{
@@ -807,9 +799,7 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering
return aSupportedTypes[i].nType;
throw RuntimeException();
}
-/* -----------------------------21.02.01 15:57--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier )
throw(RuntimeException)
{
@@ -818,9 +808,7 @@ sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingI
return sal_True;
return sal_False;
}
-/* -----------------------------21.02.01 15:57--------------------------------
- ---------------------------------------------------------------------------*/
OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingType )
throw(RuntimeException)
{
@@ -829,26 +817,20 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT
return makeNumberingIdentifier(i);
return OUString();
}
-/* -----------------------------05.07.01 13:34--------------------------------
- ---------------------------------------------------------------------------*/
const sal_Char cDefaultNumberingProvider[] = "com.sun.star.text.DefaultNumberingProvider";
OUString DefaultNumberingProvider::getImplementationName(void)
throw( RuntimeException )
{
return OUString::createFromAscii(cDefaultNumberingProvider);
}
-/* -----------------------------05.07.01 13:34--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool DefaultNumberingProvider::supportsService(const rtl::OUString& rServiceName)
throw( RuntimeException )
{
return rServiceName.equalsAscii(cDefaultNumberingProvider);
}
-/* -----------------------------05.07.01 13:34--------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void)
throw( RuntimeException )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 03:53:37 +0000