summaryrefslogtreecommitdiff
path: root/unodevtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-23 12:06:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-24 14:43:34 +0200
commit6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree413c83df969e73c5cba1e11ef3740afc748ee1f5 /unodevtools
parent4e729de73f2947155248f8df5897380611b87917 (diff)
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unodevtools')
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx134
-rw-r--r--unodevtools/source/skeletonmaker/cpptypemaker.cxx8
-rw-r--r--unodevtools/source/skeletonmaker/skeletoncommon.cxx6
3 files changed, 74 insertions, 74 deletions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 2bf20dc2b613..3cf2a236f08b 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -120,8 +120,8 @@ static OString generateCompHelperDeclaration(std::ostream & o,
// generate component/service helper functions
o << "// component and service helper functions:\n"
- "::rtl::OUString SAL_CALL _getImplementationName();\n"
- "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+ "OUString SAL_CALL _getImplementationName();\n"
+ "css::uno::Sequence< OUString > SAL_CALL "
"_getSupportedServiceNames();\n"
"css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
" css::uno::Reference< css::uno::XComponentContext > const & "
@@ -143,18 +143,18 @@ static void generateCompHelperDefinition(std::ostream & o,
OString nm;
short nbrackets = generateNamespace(o, implname, true, nm);
- o << "::rtl::OUString SAL_CALL _getImplementationName() {\n"
- " return ::rtl::OUString(\n"
+ o << "OUString SAL_CALL _getImplementationName() {\n"
+ " return OUString(\n"
" \"" << implname << "\");\n}\n\n";
- o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+ o << "css::uno::Sequence< OUString > SAL_CALL "
"_getSupportedServiceNames()\n{\n css::uno::Sequence< "
- "::rtl::OUString > s(" << services.size() << ");\n";
+ "OUString > s(" << services.size() << ");\n";
short i=0;
for (const auto& rService : services)
{
- o << " s[" << i++ << "] = ::rtl::OUString(\""
+ o << " s[" << i++ << "] = OUString(\""
<< rService << "\");\n";
}
o << " return s;\n}\n\n";
@@ -204,7 +204,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< propertyhelper
<< " >::getPropertySetInfo();\n}\n\n";
- o << "void SAL_CALL " << classname << "setPropertyValue(const ::rtl::OUString"
+ o << "void SAL_CALL " << classname << "setPropertyValue(const OUString"
" & aPropertyName, const css::uno::Any & aValue) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::beans::PropertyVetoException, css::lang::IllegalArgumentException, "
@@ -213,13 +213,13 @@ void generateXPropertySetBodies(std::ostream& o,
o << "css::uno::Any SAL_CALL " << classname << "getPropertyValue(const "
- "::rtl::OUString & aPropertyName) throw (css::uno::RuntimeException, "
+ "OUString & aPropertyName) throw (css::uno::RuntimeException, "
"css::beans::UnknownPropertyException, css::lang::WrappedTargetException)"
"\n{\n return ::cppu::PropertySetMixin< "
<< propertyhelper << " >::getPropertyValue(aPropertyName);\n}\n\n";
o << "void SAL_CALL " << classname << "addPropertyChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XPropertyChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -227,7 +227,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::addPropertyChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "removePropertyChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XPropertyChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -235,7 +235,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::removePropertyChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "addVetoableChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XVetoableChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -243,7 +243,7 @@ void generateXPropertySetBodies(std::ostream& o,
<< " >::addVetoableChangeListener(aPropertyName, xListener);\n}\n\n";
o << "void SAL_CALL " << classname << "removeVetoableChangeListener(const "
- "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+ "OUString & aPropertyName, const css::uno::Reference< "
"css::beans::XVetoableChangeListener > & xListener) throw ("
"css::uno::RuntimeException, css::beans::UnknownPropertyException, "
"css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< "
@@ -307,54 +307,54 @@ void generateXAddInBodies(std::ostream& o, const OString & classname)
{
o << "// css::sheet::XAddIn:\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
- "const ::rtl::OUString & aDisplayName) throw (css::uno::RuntimeException)"
- "\n{\n ::rtl::OUString ret;\n try {\n css::uno::Reference< "
+ o << "OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
+ "const OUString & aDisplayName) throw (css::uno::RuntimeException)"
+ "\n{\n OUString ret;\n try {\n css::uno::Reference< "
"css::container::XNameAccess > xNAccess(m_xHAccess, css::uno::UNO_QUERY);\n"
- " css::uno::Sequence< ::rtl::OUString > functions = "
+ " css::uno::Sequence< OUString > functions = "
"xNAccess->getElementNames();\n sal_Int32 len = functions."
- "getLength();\n ::rtl::OUString sDisplayName;\n"
+ "getLength();\n OUString sDisplayName;\n"
" for (sal_Int32 i=0; i < len; ++i) {\n"
" sDisplayName = getAddinProperty(functions[i], "
- "::rtl::OUString(),\n "
+ "OUString(),\n "
"sDISPLAYNAME);\n if (sDisplayName.equals(aDisplayName))\n"
" return functions[i];\n }\n }\n"
" catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n"
" catch ( css::uno::Exception & ) {\n }\n return ret;\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
- "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
- "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+ o << "OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
+ "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+ "{\n return getAddinProperty(aProgrammaticName, OUString(), "
"sDISPLAYNAME);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getFunctionDescription(const "
- "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
- "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+ o << "OUString SAL_CALL " << classname << "getFunctionDescription(const "
+ "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+ "{\n return getAddinProperty(aProgrammaticName, OUString(), "
"sDESCRIPTION);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
- "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+ o << "OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
+ "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
"(css::uno::RuntimeException)\n{\n return getAddinProperty("
"aProgrammaticFunctionName,\n m_functionMap["
"aProgrammaticFunctionName][nArgument],\n"
" sDISPLAYNAME);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getArgumentDescription(const "
- "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+ o << "OUString SAL_CALL " << classname << "getArgumentDescription(const "
+ "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
"(css::uno::RuntimeException)\n{\n return getAddinProperty("
"aProgrammaticFunctionName,\n "
"m_functionMap[aProgrammaticFunctionName][nArgument],\n"
" sDESCRIPTION);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
- "const ::rtl::OUString & aProgrammaticFunctionName) throw ("
+ o << "OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
+ "const OUString & aProgrammaticFunctionName) throw ("
"css::uno::RuntimeException)\n{\n return getAddinProperty("
- "aProgrammaticFunctionName, ::rtl::OUString(), sCATEGORY);\n}\n\n";
+ "aProgrammaticFunctionName, OUString(), sCATEGORY);\n}\n\n";
- o << "::rtl::OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
- "::rtl::OUString & aProgrammaticFunctionName) throw ("
+ o << "OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
+ "OUString & aProgrammaticFunctionName) throw ("
"css::uno::RuntimeException)\n{\n return getAddinProperty("
- "aProgrammaticFunctionName, ::rtl::OUString(), "
+ "aProgrammaticFunctionName, OUString(), "
"sCATEGORYDISPLAYNAME);\n}\n\n";
}
@@ -362,27 +362,27 @@ void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classnam
{
o << "// css::sheet::XCompatibilityNames:\n"
"css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL " << classname
- << "getCompatibilityNames(const ::rtl::OUString & aProgrammaticName) throw "
+ << "getCompatibilityNames(const OUString & aProgrammaticName) throw "
"(css::uno::RuntimeException)\n{\n css::uno::Sequence< "
"css::sheet::LocalizedName > seqLocalizedNames;\n try {\n "
- "::rtl::OUStringBuffer buf("
+ "OUStringBuffer buf("
"aProgrammaticName);\n buf.appendAscii(\"/CompatibilityName\");\n"
- " ::rtl::OUString hname(buf.makeStringAndClear());\n\n "
+ " OUString hname(buf.makeStringAndClear());\n\n "
"if ( m_xCompAccess->hasByHierarchicalName(hname) ) {\n"
" css::uno::Reference< css::container::XNameAccess > "
"xNameAccess(\n"
" m_xCompAccess->getByHierarchicalName(hname), "
- "css::uno::UNO_QUERY);\n\n css::uno::Sequence< ::rtl::OUString"
+ "css::uno::UNO_QUERY);\n\n css::uno::Sequence< OUString"
" > elems = \n xNameAccess->getElementNames();"
"\n ::sal_Int32 len = elems.getLength();\n\n "
- "seqLocalizedNames.realloc(len);\n\n ::rtl::OUString "
+ "seqLocalizedNames.realloc(len);\n\n OUString "
"sCompatibilityName;\n for (::sal_Int32 i=0; i < len; ++i) {\n"
- " ::rtl::OUString sLocale(elems[i]);\n "
+ " OUString sLocale(elems[i]);\n "
"xNameAccess->getByName(sLocale) >>= sCompatibilityName;\n\n"
" css::lang::Locale aLocale;\n "
"::sal_Int32 nIndex = 0, nToken = 0;\n "
/* FIXME-BCP47: this will break. */
- "do {\n ::rtl::OUString aToken = sLocale.getToken(0, '-', "
+ "do {\n OUString aToken = sLocale.getToken(0, '-', "
"nIndex);\n switch (nToken++) {\n "
"case 0:\n aLocale.Language = aToken;\n"
" break;\n case 1:\n"
@@ -457,7 +457,7 @@ void generateXDispatchProvider(std::ostream& o,
o << "// css::frame::XDispatchProvider:\n"
"css::uno::Reference< css::frame::XDispatch > SAL_CALL " << classname
<< "queryDispatch( const css::util::URL& aURL,"
- " const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
+ " const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
"throw(css::uno::RuntimeException)\n{\n css::uno::Reference< "
"css::frame::XDispatch > xRet;\n"
" if ( !m_xFrame.is() )\n return 0;\n\n";
@@ -506,20 +506,20 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " css::uno::Reference< css::lang::XMultiServiceFactory > xProvider"
"(\n m_xContext->getServiceManager()->createInstanceWithContext"
- "(\n ::rtl::OUString(\n "
+ "(\n OUString(\n "
" \"com.sun.star.configuration.ConfigurationProvider\"),"
"\n m_xContext ), css::uno::UNO_QUERY );\n\n";
- o << " ::rtl::OUString sReadOnlyView(\n"
+ o << " OUString sReadOnlyView(\n"
" \"com.sun.star.configuration.ConfigurationAccess\");\n\n";
- o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(\n"
+ o << " OUStringBuffer sPath(OUString(\n"
" \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n"
" sPath.appendAscii(sADDIN_SERVICENAME);\n"
" sPath.appendAscii(\"/AddInFunctions\");\n\n"
" // create arguments: nodepath\n"
" css::beans::PropertyValue aArgument;\n"
- " aArgument.Name = ::rtl::OUString(\"nodepath\");\n"
+ " aArgument.Name = OUString(\"nodepath\");\n"
" aArgument.Value <<= sPath.makeStringAndClear();\n\n"
" css::uno::Sequence< css::uno::Any > aArguments(1);\n"
" aArguments[0] <<= aArgument;\n\n";
@@ -533,8 +533,8 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " // extend arguments to create a view for all locales to get "
"simple\n // access to the compatibilityname property\n"
- " aArgument.Name = ::rtl::OUString(\"locale\");\n"
- " aArgument.Value <<= ::rtl::OUString(\"*\");\n"
+ " aArgument.Name = OUString(\"locale\");\n"
+ " aArgument.Value <<= OUString(\"*\");\n"
" aArguments.realloc(2);\n"
" aArguments[1] <<= aArgument;\n\n"
" // create view for all locales\n"
@@ -544,12 +544,12 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
o << " }\n catch ( css::uno::Exception & ) {\n }\n}\n\n";
- o << "// addin configuration property helper function:\n::rtl::OUString "
- "SAL_CALL " << classname << "::getAddinProperty(const ::rtl::OUString &"
- " funcName, const ::rtl::OUString & paramName, const char * propName) "
+ o << "// addin configuration property helper function:\nOUString "
+ "SAL_CALL " << classname << "::getAddinProperty(const OUString &"
+ " funcName, const OUString & paramName, const char * propName) "
"throw (css::uno::RuntimeException)\n{\n"
- " ::rtl::OUString ret;\n try {\n "
- "::rtl::OUStringBuffer buf(funcName);\n"
+ " OUString ret;\n try {\n "
+ "OUStringBuffer buf(funcName);\n"
" if (!paramName.isEmpty()) {\n"
" buf.appendAscii(\"/Parameters/\");\n"
" buf.append(paramName);\n }\n\n"
@@ -557,7 +557,7 @@ static void generateAddinConstructorAndHelper(std::ostream& o,
" m_xHAccess->getByHierarchicalName(\n"
" buf.makeStringAndClear()), css::uno::UNO_QUERY);\n"
" xPropSet->getPropertyValue(\n "
- "::rtl::OUString(propName)) >>= ret;\n }\n"
+ "OUString(propName)) >>= ret;\n }\n"
" catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n"
" catch ( css::uno::Exception & ) {\n }\n return ret;\n";
}
@@ -647,8 +647,8 @@ static OString generateClassDefinition(std::ostream& o,
// generate component/service helper functions
// o << " // component and service helper functions:\n"
-// << " static ::rtl::OUString SAL_CALL _getImplementationName();\n"
-// << " static css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+// << " static OUString SAL_CALL _getImplementationName();\n"
+// << " static css::uno::Sequence< OUString > SAL_CALL "
// << "_getSupportedServiceNames();\n"
// << " static css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
// << "\n css::uno::Reference< css::uno::XComponentContext > const & "
@@ -694,12 +694,12 @@ static OString generateClassDefinition(std::ostream& o,
" virtual ~" << classname << "() {}\n\n";
if (options.componenttype == 2) {
- o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, "
+ o << " typedef boost::unordered_map< ::sal_Int32, OUString, "
"boost::hash<::sal_Int32> > ParamMap;\n"
- " typedef boost::unordered_map< rtl::OUString, ParamMap, "
- "rtl::OUStringHash > FunctionMap;\n\n"
- " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & "
- "funcName, const ::rtl::OUString & paramName, const char * propName) "
+ " typedef boost::unordered_map< OUString, ParamMap, "
+ "OUStringHash > FunctionMap;\n\n"
+ " OUString SAL_CALL getAddinProperty(const OUString & "
+ "funcName, const OUString & paramName, const char * propName) "
"throw (css::uno::RuntimeException);\n\n";
}
@@ -805,7 +805,7 @@ static OString generateClassDefinition(std::ostream& o,
buffer.append("IMPLEMENTS_PROPERTY_ACCESS");
}
o << buffer.makeStringAndClear()
- << "), css::uno::Sequence< ::rtl::OUString >()),\n";
+ << "), css::uno::Sequence< OUString >()),\n";
}
o << " m_xContext(context)";
@@ -834,20 +834,20 @@ static void generateXServiceInfoBodies(std::ostream& o,
OString const & comphelpernamespace)
{
o << "// com.sun.star.uno.XServiceInfo:\n"
- "::rtl::OUString SAL_CALL " << classname << "getImplementationName() "
+ "OUString SAL_CALL " << classname << "getImplementationName() "
"throw (css::uno::RuntimeException)\n{\n "
"return " << comphelpernamespace << "::_getImplementationName();\n}\n\n";
o << "sal_Bool SAL_CALL " << classname
- << "supportsService(::rtl::OUString const & "
+ << "supportsService(OUString const & "
"serviceName) throw (css::uno::RuntimeException)\n{\n "
- "css::uno::Sequence< ::rtl::OUString > serviceNames = "
+ "css::uno::Sequence< OUString > serviceNames = "
<< comphelpernamespace << "::_getSupportedServiceNames();\n "
"for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n "
" if (serviceNames[i] == serviceName)\n return sal_True;\n"
" }\n return sal_False;\n}\n\n";
- o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " << classname
+ o << "css::uno::Sequence< OUString > SAL_CALL " << classname
<< "getSupportedServiceNames() throw (css::uno::RuntimeException)\n{\n "
"return " << comphelpernamespace
<< "::_getSupportedServiceNames();\n}\n\n";
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 5fbd2e37ce33..21c336ba02ad 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -376,10 +376,10 @@ static void printSetPropertyMixinBody(
o << " v <<= " << buffer2.makeStringAndClear() << ";\n\n";
}
- o << " prepareSet(\n rtl::OUString(\""
+ o << " prepareSet(\n OUString(\""
<< attribute.name << "\"),\n css::uno::Any(), v, ";
} else {
- o << " prepareSet(\n rtl::OUString(\""
+ o << " prepareSet(\n OUString(\""
<< attribute.name << "\"),\n css::uno::Any(), css::uno::Any(), ";
}
@@ -439,9 +439,9 @@ void printMethods(std::ostream & o,
if (body && options.componenttype == 2) {
if (name == "com.sun.star.lang.XServiceName") {
o << "// ::com::sun::star::lang::XServiceName:\n"
- "::rtl::OUString SAL_CALL " << classname << "getServiceName() "
+ "OUString SAL_CALL " << classname << "getServiceName() "
"throw (css::uno::RuntimeException)\n{\n "
- "return ::rtl::OUString("
+ "return OUString("
"sADDIN_SERVICENAME);\n}\n";
generated.add(u2b(name));
return;
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index 330bb2470177..f57afcdab7ce 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -35,7 +35,7 @@ using namespace ::codemaker::cpp;
namespace skeletonmaker {
-void printLicenseHeader(std::ostream& o, rtl::OString const & filename)
+void printLicenseHeader(std::ostream& o, OString const & filename)
{
sal_Int32 index;
#ifdef SAL_UNX
@@ -570,7 +570,7 @@ static void generateFunctionParameterMap(std::ostream& o,
{
if ( options.language == 2 ) {
o << " fpm[" << n
- << "] = ::rtl::OUString(\""
+ << "] = OUString(\""
<< rParam.name
<< "\");\n";
}
@@ -583,7 +583,7 @@ static void generateFunctionParameterMap(std::ostream& o,
}
if ( options.language == 2 ) {
- o << " m_functionMap[::rtl::OUString(\""
+ o << " m_functionMap[OUString(\""
<< rMethod.name << "\")] = fpm;\n\n";
}
else {