summaryrefslogtreecommitdiff
path: root/shell/source/backends/gconfbe
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /shell/source/backends/gconfbe
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'shell/source/backends/gconfbe')
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx46
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx38
2 files changed, 40 insertions, 44 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index b0cc1778be32..1a1131cd828c 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -45,10 +45,6 @@ namespace {
namespace uno = css::uno ;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringBuffer;
GConfClient* getGconfClient()
{
@@ -72,7 +68,7 @@ GConfClient* getGconfClient()
mClient = gconf_client_get_default();
if (!mClient)
{
- throw uno::RuntimeException(rtl::OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
+ throw uno::RuntimeException(OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
}
static const char * const PreloadValuesList[] =
@@ -111,7 +107,7 @@ static OUString xdg_user_dir_lookup (const char *type)
if (!aSecurity.getHomeDir( aHomeDirURL ) )
{
- osl::FileBase::getFileURLFromSystemPath(rtl::OUString("/tmp"), aDocumentsDirURL);
+ osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), aDocumentsDirURL);
return aDocumentsDirURL;
}
@@ -215,7 +211,7 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) );
case GCONF_VALUE_STRING:
- return uno::makeAny( OStringToOUString( rtl::OString(
+ return uno::makeAny( OStringToOUString( OString(
gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) );
default:
@@ -228,20 +224,20 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
//------------------------------------------------------------------------------
-static void splitFontName( GConfValue *pGconfValue, rtl::OUString &rName, sal_Int16 &rHeight)
+static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight)
{
- rtl::OString aFont( gconf_value_get_string( pGconfValue ) );
+ OString aFont( gconf_value_get_string( pGconfValue ) );
aFont = aFont.trim();
sal_Int32 nIdx = aFont.lastIndexOf( ' ' );
if (nIdx < 1) { // urk
rHeight = 12;
nIdx = aFont.getLength();
} else {
- rtl::OString aSize = aFont.copy( nIdx + 1 );
+ OString aSize = aFont.copy( nIdx + 1 );
rHeight = static_cast<sal_Int16>( aSize.toInt32() );
}
- rName = rtl::OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 );
+ rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 );
}
//------------------------------------------------------------------------------
@@ -253,7 +249,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
{
case SETTING_PROXY_MODE:
{
- rtl::OUString aProxyMode;
+ OUString aProxyMode;
uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= aProxyMode;
@@ -266,7 +262,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
case SETTING_NO_PROXY_FOR:
{
- rtl::OStringBuffer aBuffer;
+ OStringBuffer aBuffer;
if( (GCONF_VALUE_LIST == pGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(pGconfValue)) )
{
GSList * list = gconf_value_get_list(pGconfValue);
@@ -276,7 +272,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
}
// Remove trailing ";"
aBuffer.setLength(aBuffer.getLength()-1);
- return uno::makeAny(rtl::OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
+ return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
}
else
g_warning( "unexpected type for ignore_hosts" );
@@ -285,7 +281,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
case SETTING_MAILER_PROGRAM:
{
- rtl::OUString aMailer;
+ OUString aMailer;
uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= aMailer;
sal_Int32 nIndex = 0;
@@ -314,22 +310,22 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
sal_Bool bBooleanValue = false;
uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
aOriginalValue >>= bBooleanValue;
- return uno::makeAny( rtl::OUString::valueOf( (sal_Bool) bBooleanValue ) );
+ return uno::makeAny( OUString::valueOf( (sal_Bool) bBooleanValue ) );
}
case SETTING_WORK_DIRECTORY:
{
- rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+ OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
return uno::makeAny( aDocumentsDirURL );
}
case SETTING_USER_GIVENNAME:
{
- rtl::OUString aCompleteName( rtl::OStringToOUString(
+ OUString aCompleteName( OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
sal_Int32 nIndex = 0;
- rtl::OUString aGivenName;
+ OUString aGivenName;
do
aGivenName = aCompleteName.getToken( 0, ' ', nIndex );
while ( nIndex == 0 );
@@ -340,10 +336,10 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
case SETTING_USER_SURNAME:
{
- rtl::OUString aCompleteName( rtl::OStringToOUString(
+ OUString aCompleteName( OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
sal_Int32 nIndex = 0;
- rtl::OUString aSurname;
+ OUString aSurname;
do
aSurname = aCompleteName.getToken( 0, ' ', nIndex );
while ( nIndex >= 0 );
@@ -354,7 +350,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
case SETTING_SOURCEVIEWFONT_NAME:
case SETTING_SOURCEVIEWFONT_HEIGHT:
{
- rtl::OUString aName;
+ OUString aName;
sal_Int16 nHeight;
splitFontName (pGconfValue, aName, nHeight);
@@ -394,7 +390,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
case SETTING_WORK_DIRECTORY:
{
- rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
+ OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS");
osl::Directory aDocumentsDir( aDocumentsDirURL );
if( osl::FileBase::E_None == aDocumentsDir.open() )
@@ -404,7 +400,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
case SETTING_USER_GIVENNAME:
{
- rtl::OUString aCompleteName( rtl::OStringToOUString(
+ OUString aCompleteName( OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
if( aCompleteName != "Unknown" )
return sal_True;
@@ -413,7 +409,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
case SETTING_USER_SURNAME:
{
- rtl::OUString aCompleteName( rtl::OStringToOUString(
+ OUString aCompleteName( OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
if( aCompleteName != "Unknown" )
{
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index bf40d7cb4571..97441d9e8303 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -54,15 +54,15 @@
namespace {
-rtl::OUString SAL_CALL getServiceImplementationName() {
- return rtl::OUString(
+OUString SAL_CALL getServiceImplementationName() {
+ return OUString(
"com.sun.star.comp.configuration.backend.GconfBackend");
}
-css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() {
- rtl::OUString name(
+css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
+ OUString name(
"com.sun.star.configuration.backend.GconfBackend");
- return css::uno::Sequence< rtl::OUString >(&name, 1);
+ return css::uno::Sequence< OUString >(&name, 1);
}
class Service:
@@ -76,15 +76,15 @@ public:
private:
virtual ~Service() {}
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return getServiceImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
{ return ServiceName == getSupportedServiceNames()[0]; }
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return getServiceSupportedServiceNames(); }
@@ -93,7 +93,7 @@ private:
{ return css::uno::Reference< css::beans::XPropertySetInfo >(); }
virtual void SAL_CALL setPropertyValue(
- rtl::OUString const &, css::uno::Any const &)
+ OUString const &, css::uno::Any const &)
throw (
css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
@@ -101,13 +101,13 @@ private:
css::lang::WrappedTargetException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getPropertyValue(
- rtl::OUString const & PropertyName)
+ OUString const & PropertyName)
throw (
css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- rtl::OUString const &,
+ OUString const &,
css::uno::Reference< css::beans::XPropertyChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
@@ -115,7 +115,7 @@ private:
{}
virtual void SAL_CALL removePropertyChangeListener(
- rtl::OUString const &,
+ OUString const &,
css::uno::Reference< css::beans::XPropertyChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
@@ -123,7 +123,7 @@ private:
{}
virtual void SAL_CALL addVetoableChangeListener(
- rtl::OUString const &,
+ OUString const &,
css::uno::Reference< css::beans::XVetoableChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
@@ -131,7 +131,7 @@ private:
{}
virtual void SAL_CALL removeVetoableChangeListener(
- rtl::OUString const &,
+ OUString const &,
css::uno::Reference< css::beans::XVetoableChangeListener > const &)
throw (
css::beans::UnknownPropertyException,
@@ -145,26 +145,26 @@ Service::Service(): enabled_(false) {
css::uno::Reference< css::uno::XCurrentContext > context(
css::uno::getCurrentContext());
if (context.is()) {
- rtl::OUString desktop;
+ OUString desktop;
context->getValueByName(
- rtl::OUString("system.desktop-environment")) >>=
+ OUString("system.desktop-environment")) >>=
desktop;
enabled_ = desktop == "GNOME";
}
}
-void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &)
+void Service::setPropertyValue(OUString const &, css::uno::Any const &)
throw (
css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
{
throw css::lang::IllegalArgumentException(
- rtl::OUString("setPropertyValue not supported"),
+ OUString("setPropertyValue not supported"),
static_cast< cppu::OWeakObject * >(this), -1);
}
-css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
+css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
throw (
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)