summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/abpservices.cxx2
-rw-r--r--extensions/source/abpilot/abptypes.hxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/abpilot/addresssettings.hxx6
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx10
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx68
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx34
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx56
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.hxx4
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx6
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx14
-rw-r--r--extensions/source/abpilot/unodialogabp.hxx8
13 files changed, 109 insertions, 109 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index aa5d46d146c0..a27798dab01b 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -38,7 +38,7 @@ namespace abp
const SfxFilter* lcl_getBaseFilter()
{
- const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
return pFilter;
}
@@ -69,7 +69,7 @@ namespace abp
//---------------------------------------------------------------------
sal_Bool FinalPage::isValidName() const
{
- ::rtl::OUString sCurrentName(m_aName.GetText());
+ OUString sCurrentName(m_aName.GetText());
if (sCurrentName.isEmpty())
// the name must not be empty
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 4459712b4741..14070045a298 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -55,7 +55,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
if (pServiceManager && pImplementationName)
{
xRet = ::abp::OModule::getComponentFactory(
- ::rtl::OUString::createFromAscii(pImplementationName),
+ OUString::createFromAscii(pImplementationName),
static_cast< XMultiServiceFactory* >(pServiceManager));
}
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx
index 7bb6a826ee73..0af46d175dff 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -28,9 +28,9 @@ namespace abp
{
//.........................................................................
- DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag );
+ DECLARE_STL_STDKEY_SET( OUString, StringBag );
- DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String );
+ DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String );
//.........................................................................
} // namespace abp
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index e0ba2de14dbf..96f1b59f484e 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -317,7 +317,7 @@ namespace abp
OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
return;
}
- const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );
+ const OUString sGuess = OUString::createFromAscii( pGuess );
if ( rTableNames.end() != rTableNames.find( sGuess ) )
getSettings().sSelectedTable = sGuess;
}
diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx
index 674868785e7e..53cb58efad91 100644
--- a/extensions/source/abpilot/addresssettings.hxx
+++ b/extensions/source/abpilot/addresssettings.hxx
@@ -55,9 +55,9 @@ namespace abp
struct AddressSettings
{
AddressSourceType eType;
- ::rtl::OUString sDataSourceName;
- ::rtl::OUString sRegisteredDataSourceName;
- ::rtl::OUString sSelectedTable;
+ OUString sDataSourceName;
+ OUString sRegisteredDataSourceName;
+ OUString sSelectedTable;
bool bIgnoreNoTable;
MapString2String aFieldMapping;
bool bRegisterDataSource;
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 87bf790b5a80..aac47f1197b8 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -67,8 +67,8 @@ namespace abp
try
{
// the service name of the administration dialog
- const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog");
- const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog");
+ const static OUString s_sAdministrationServiceName = OUString("com.sun.star.sdb.DatasourceAdministrationDialog");
+ const static OUString s_sDataSourceTypeChangeDialog = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog");
// the parameters for the call
Sequence< Any > aArguments(3);
@@ -76,14 +76,14 @@ namespace abp
// the parent window
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent);
- *pArguments++ <<= PropertyValue(::rtl::OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
// the title of the dialog
String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE));
- *pArguments++ <<= PropertyValue(::rtl::OUString("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
// the name of the new data source
- *pArguments++ <<= PropertyValue(::rtl::OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
+ *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
// create the dialog
Reference< XExecutableDialog > xDialog;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index d5cf04e34ebe..9c94c01858a3 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -77,7 +77,7 @@ namespace abp
//---------------------------------------------------------------------
/// creates a new data source and inserts it into the context
static void lcl_implCreateAndInsert(
- const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName,
+ const Reference< XComponentContext >& _rxContext, const OUString& _rName,
Reference< XPropertySet >& /* [out] */ _rxNewDataSource ) SAL_THROW (( ::com::sun::star::uno::Exception ))
{
//.............................................................
@@ -109,7 +109,7 @@ namespace abp
//---------------------------------------------------------------------
/// creates and inserts a data source, and sets it's URL property to the string given
static ODataSource lcl_implCreateAndSetURL(
- const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rName,
+ const Reference< XComponentContext >& _rxORB, const OUString& _rName,
const sal_Char* _pInitialAsciiURL ) SAL_THROW (( ))
{
ODataSource aReturn( _rxORB );
@@ -124,8 +124,8 @@ namespace abp
if (xNewDataSource.is())
{
xNewDataSource->setPropertyValue(
- ::rtl::OUString( "URL" ),
- makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) )
+ OUString( "URL" ),
+ makeAny( OUString::createFromAscii( _pInitialAsciiURL ) )
);
}
@@ -140,8 +140,8 @@ namespace abp
}
//---------------------------------------------------------------------
void lcl_registerDataSource(
- const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _sName,
- const ::rtl::OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception ))
+ const Reference< XComponentContext >& _rxORB, const OUString& _sName,
+ const OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception ))
{
OSL_ENSURE( !_sName.isEmpty(), "lcl_registerDataSource: invalid name!" );
OSL_ENSURE( !_sURL.isEmpty(), "lcl_registerDataSource: invalid URL!" );
@@ -193,9 +193,9 @@ namespace abp
if (m_pImpl->xContext.is())
{
// collect the data source names
- Sequence< ::rtl::OUString > aDSNames = m_pImpl->xContext->getElementNames();
- const ::rtl::OUString* pDSNames = aDSNames.getConstArray();
- const ::rtl::OUString* pDSNamesEnd = pDSNames + aDSNames.getLength();
+ Sequence< OUString > aDSNames = m_pImpl->xContext->getElementNames();
+ const OUString* pDSNames = aDSNames.getConstArray();
+ const OUString* pDSNamesEnd = pDSNames + aDSNames.getLength();
for ( ;pDSNames != pDSNamesEnd; ++pDSNames )
m_pImpl->aDataSourceNames.insert( *pDSNames );
@@ -212,16 +212,16 @@ namespace abp
}
//---------------------------------------------------------------------
- ::rtl::OUString& ODataSourceContext::disambiguate(::rtl::OUString& _rDataSourceName)
+ OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName)
{
- ::rtl::OUString sCheck( _rDataSourceName );
+ OUString sCheck( _rDataSourceName );
ConstStringBagIterator aPos = m_pImpl->aDataSourceNames.find( sCheck );
sal_Int32 nPostFix = 1;
while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) )
{ // there already is a data source with this name
sCheck = _rDataSourceName;
- sCheck += ::rtl::OUString::valueOf( nPostFix++ );
+ sCheck += OUString::valueOf( nPostFix++ );
aPos = m_pImpl->aDataSourceNames.find( sCheck );
}
@@ -237,65 +237,65 @@ namespace abp
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewLDAP( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewMORK( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewKab( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewKab( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewMacab( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewMacab( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewOutlook( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewOE( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewOE( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" );
}
//---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewDBase( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) SAL_THROW (( ))
{
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
}
@@ -311,7 +311,7 @@ namespace abp
::utl::SharedUNOComponent< XConnection >
xConnection;
StringBag aTables; // the cached table names
- ::rtl::OUString sName;
+ OUString sName;
sal_Bool bTablesUpToDate; // table name cache up-to-date?
ODataSourceImpl( const Reference< XComponentContext >& _rxORB )
@@ -389,7 +389,7 @@ namespace abp
}
}
//---------------------------------------------------------------------
- void ODataSource::registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName) SAL_THROW (( ))
+ void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName) SAL_THROW (( ))
{
if (!isValid())
// nothing to do
@@ -407,7 +407,7 @@ namespace abp
}
//---------------------------------------------------------------------
- void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const ::rtl::OUString& _sName, PackageAccessControl )
+ void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const OUString& _sName, PackageAccessControl )
{
if (m_pImpl->xDataSource.get() == _rxDS.get())
// nothing to do
@@ -439,7 +439,7 @@ namespace abp
}
//---------------------------------------------------------------------
- sal_Bool ODataSource::rename( const ::rtl::OUString& _rName ) SAL_THROW (( ))
+ sal_Bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( ))
{
if (!isValid())
// nothing to do
@@ -450,15 +450,15 @@ namespace abp
}
//---------------------------------------------------------------------
- ::rtl::OUString ODataSource::getName() const SAL_THROW (( ))
+ OUString ODataSource::getName() const SAL_THROW (( ))
{
if ( !isValid() )
- return ::rtl::OUString();
+ return OUString();
return m_pImpl->sName;
}
//---------------------------------------------------------------------
- bool ODataSource::hasTable( const ::rtl::OUString& _rTableName ) const
+ bool ODataSource::hasTable( const OUString& _rTableName ) const
{
if ( !isConnected() )
return false;
@@ -487,13 +487,13 @@ namespace abp
DBG_ASSERT( xTables.is(), "ODataSource::getTableNames: could not retrieve the tables container!" );
// get the names
- Sequence< ::rtl::OUString > aTableNames;
+ Sequence< OUString > aTableNames;
if ( xTables.is( ) )
aTableNames = xTables->getElementNames( );
// copy the names
- const ::rtl::OUString* pTableNames = aTableNames.getConstArray();
- const ::rtl::OUString* pTableNamesEnd = pTableNames + aTableNames.getLength();
+ const OUString* pTableNames = aTableNames.getConstArray();
+ const OUString* pTableNamesEnd = pTableNames + aTableNames.getLength();
for (;pTableNames < pTableNamesEnd; ++pTableNames)
m_pImpl->aTables.insert( *pTableNames );
}
@@ -531,7 +531,7 @@ namespace abp
// failure to create the interaction handler is a serious issue ...
if (!xInteractions.is())
{
- ::rtl::OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
+ OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
if ( _pMessageParent )
ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True );
return sal_False;
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 218baaa53697..c8efed9260a9 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -59,40 +59,40 @@ namespace abp
void getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));
/// disambiguates the given name by appending auccessive numbers
- ::rtl::OUString& disambiguate(::rtl::OUString& _rDataSourceName);
+ OUString& disambiguate(OUString& _rDataSourceName);
/// creates a new MORK data source
- ODataSource createNewMORK( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewMORK( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Thunderbird data source
- ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewThunderbird( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Evolution local data source
- ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewEvolution( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Evolution LDAP data source
- ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewEvolutionLdap( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Evolution GROUPWISE data source
- ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewEvolutionGroupwise( const OUString& _rName ) SAL_THROW (( ));
/// creates a new KDE address book data source
- ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewKab( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Mac OS X address book data source
- ODataSource createNewMacab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewMacab( const OUString& _rName ) SAL_THROW (( ));
/// creates a new LDAP data source
- ODataSource createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewLDAP( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Outlook data source
- ODataSource createNewOutlook( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewOutlook( const OUString& _rName ) SAL_THROW (( ));
/// creates a new Outlook express data source
- ODataSource createNewOE( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewOE( const OUString& _rName ) SAL_THROW (( ));
/// creates a new dBase data source
- ODataSource createNewDBase( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ ODataSource createNewDBase( const OUString& _rName ) SAL_THROW (( ));
};
//=====================================================================
@@ -139,11 +139,11 @@ namespace abp
// TODO: put this into the context class
/// returns the name of the data source
- ::rtl::OUString
+ OUString
getName() const SAL_THROW (( ));
/// renames the data source
- sal_Bool rename( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ sal_Bool rename( const OUString& _rName ) SAL_THROW (( ));
// TODO: put this into the context class
// ----------------------------------------------------------------
@@ -167,7 +167,7 @@ namespace abp
void store() SAL_THROW (( ));
/// register the data source under the given name in the configuration
- void registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName ) SAL_THROW (( ));
+ void registerDataSource( const OUString& _sRegisteredDataSourceName ) SAL_THROW (( ));
// ----------------------------------------------------------------
/** retrieves the tables names from the connection
@@ -177,7 +177,7 @@ namespace abp
/** determines whether a given table exists
*/
- bool hasTable( const ::rtl::OUString& _rTableName ) const;
+ bool hasTable( const OUString& _rTableName ) const;
/// return the intern data source object
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const SAL_THROW (( ));
@@ -189,7 +189,7 @@ namespace abp
*/
void setDataSource(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS
- ,const ::rtl::OUString& _sName
+ ,const OUString& _sName
,PackageAccessControl
);
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 1bf4ac6d0b2e..455f8905536a 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -50,16 +50,16 @@ namespace abp
using namespace ::com::sun::star::ui::dialogs;
//---------------------------------------------------------------------
- static const ::rtl::OUString& lcl_getDriverSettingsNodeName()
+ static const OUString& lcl_getDriverSettingsNodeName()
{
- static const ::rtl::OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" );
+ static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" );
return s_sDriverSettingsNodeName;
}
//---------------------------------------------------------------------
- static const ::rtl::OUString& lcl_getAddressBookNodeName()
+ static const OUString& lcl_getAddressBookNodeName()
{
- static const ::rtl::OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" );
+ static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" );
return s_sAddressBookNodeName;
}
@@ -84,7 +84,7 @@ namespace abp
// ........................................................
// create an instance of the dialog service
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
- ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) );
+ OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) );
Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB,
// the parent window
xDialogParent,
@@ -104,7 +104,7 @@ namespace abp
#ifdef DBG_UTIL
sal_Bool bSuccess =
#endif
- xDialogProps->getPropertyValue( ::rtl::OUString( "FieldMapping" ) ) >>= aMapping;
+ xDialogProps->getPropertyValue( OUString( "FieldMapping" ) ) >>= aMapping;
DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" );
// and copy it into the map
@@ -169,8 +169,8 @@ namespace abp
// access the configuration information which the driver uses for determining it's column names
- ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName();
- sDriverAliasesNodeName += ::rtl::OUString( "/ColumnAliases" );
+ OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName();
+ sDriverAliasesNodeName += OUString( "/ColumnAliases" );
// create a config node for this
OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithComponentContext(
@@ -183,16 +183,16 @@ namespace abp
sal_Int32 nIntersectedProgrammatics = SAL_N_ELEMENTS( pMappingProgrammatics ) / 2;
const sal_Char** pProgrammatic = pMappingProgrammatics;
- ::rtl::OUString sAddressProgrammatic;
- ::rtl::OUString sDriverProgrammatic;
- ::rtl::OUString sDriverUI;
+ OUString sAddressProgrammatic;
+ OUString sDriverProgrammatic;
+ OUString sDriverUI;
for ( sal_Int32 i=0;
i < nIntersectedProgrammatics;
++i
)
{
- sAddressProgrammatic = ::rtl::OUString::createFromAscii( *pProgrammatic++ );
- sDriverProgrammatic = ::rtl::OUString::createFromAscii( *pProgrammatic++ );
+ sAddressProgrammatic = OUString::createFromAscii( *pProgrammatic++ );
+ sDriverProgrammatic = OUString::createFromAscii( *pProgrammatic++ );
if ( aDriverFieldAliasing.hasByName( sDriverProgrammatic ) )
{
@@ -224,26 +224,26 @@ namespace abp
MapString2String aFieldAssignment( _rFieldAssignment );
// access the configuration information which the driver uses for determining it's column names
- const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
+ const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
// create a config node for this
OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
- OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString( "Fields" ) );
+ OConfigurationNode aFields = aAddressBookSettings.openNode( OUString( "Fields" ) );
// loop through all existent fields
- Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames();
- const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray();
- const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength();
+ Sequence< OUString > aExistentFields = aFields.getNodeNames();
+ const OUString* pExistentFields = aExistentFields.getConstArray();
+ const OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength();
- const ::rtl::OUString sProgrammaticNodeName( "ProgrammaticFieldName" );
- const ::rtl::OUString sAssignedNodeName( "AssignedFieldName" );
+ const OUString sProgrammaticNodeName( "ProgrammaticFieldName" );
+ const OUString sAssignedNodeName( "AssignedFieldName" );
for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
{
#ifdef DBG_UTIL
- ::rtl::OUString sRedundantProgrammaticName;
+ OUString sRedundantProgrammaticName;
aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName;
#endif
DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields,
@@ -298,18 +298,18 @@ namespace abp
//-----------------------------------------------------------------
void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext,
- const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rTableName ) SAL_THROW ( ( ) )
+ const OUString& _rDataSourceName, const OUString& _rTableName ) SAL_THROW ( ( ) )
{
// access the configuration information which the driver uses for determining it's column names
- const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
+ const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
// create a config node for this
OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
- aAddressBookSettings.setNodeValue( ::rtl::OUString( "DataSourceName" ), makeAny( _rDataSourceName ) );
- aAddressBookSettings.setNodeValue( ::rtl::OUString( "Command" ), makeAny( _rTableName ) );
- aAddressBookSettings.setNodeValue( ::rtl::OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) );
+ aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ), makeAny( _rDataSourceName ) );
+ aAddressBookSettings.setNodeValue( OUString( "Command" ), makeAny( _rTableName ) );
+ aAddressBookSettings.setNodeValue( OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) );
// commit the changes done
aAddressBookSettings.commit();
@@ -319,14 +319,14 @@ namespace abp
void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) SAL_THROW ( ( ) )
{
// access the configuration information which the driver uses for determining it's column names
- const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
+ const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
// create a config node for this
OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
_rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
// set the flag
- aAddressBookSettings.setNodeValue( ::rtl::OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) );
+ aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) );
// commit the changes done
aAddressBookSettings.commit();
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index c0b3673123b4..1793a99a17b8 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -99,8 +99,8 @@ namespace abp
*/
void writeTemplateAddressSource(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
- const ::rtl::OUString& _rDataSourceName,
- const ::rtl::OUString& _rTableName
+ const OUString& _rDataSourceName,
+ const OUString& _rTableName
) SAL_THROW ( ( ) );
/** writes the configuration entry which states the pilot has been completed successfully
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index caa2638f3500..00fba8317f41 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -100,7 +100,7 @@ namespace abp
try
{
// check whether Evolution is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:evolution:local")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:evolution:local")) );
if ( xDriver.is() )
bHaveEvolution = true;
}
@@ -111,7 +111,7 @@ namespace abp
// check whether KDE address book is available
try
{
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:kab")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:kab")) );
if ( xDriver.is() )
bHaveKab = true;
}
@@ -122,7 +122,7 @@ namespace abp
try
{
// check whether Mac OS X address book is available
- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:macab")) );
+ Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:macab")) );
if ( xDriver.is() )
bHaveMacab = true;
}
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index e3b24715c7e9..faa79d095305 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -48,7 +48,7 @@ namespace abp
OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB)
:OGenericUnoDialog(_rxORB)
{
- registerProperty( ::rtl::OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY ,
+ registerProperty( OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY ,
&m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) );
}
@@ -103,15 +103,15 @@ namespace abp
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException)
+ OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException)
{
return getImplementationName_Static();
}
//---------------------------------------------------------------------
- ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
+ OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
+ return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
}
//---------------------------------------------------------------------
@@ -124,7 +124,7 @@ namespace abp
::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot");
+ aSupported.getArray()[0] = OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot");
return aSupported;
}
@@ -154,7 +154,7 @@ namespace abp
Reference<awt::XWindow> xParentWindow;
if (aArguments.getLength() == 1 && (aArguments[0] >>= xParentWindow) ) {
Sequence< Any > aNewArgs(1);
- aNewArgs[0] <<= PropertyValue( ::rtl::OUString("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE );
+ aNewArgs[0] <<= PropertyValue( OUString("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE );
OGenericUnoDialog::initialize(aNewArgs);
} else {
OGenericUnoDialog::initialize(aArguments);
@@ -180,7 +180,7 @@ namespace abp
// (or he can start it again by using wizard-menu!)
// So we should deregister it on our general job execution service by using right protocol parameters.
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1);
- lProtocol[0].Name = ::rtl::OUString("Deactivate");
+ lProtocol[0].Name = OUString("Deactivate");
lProtocol[0].Value <<= sal_True;
return makeAny( lProtocol );
}
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index eeccb16ef1e3..0261060b8fa0 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -45,7 +45,7 @@ namespace abp
,public OABSPilotUno_JBase
,public OABSPilotUno_PBase
{
- ::rtl::OUString m_sDataSourceName;
+ OUString m_sDataSourceName;
OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
public:
@@ -59,12 +59,12 @@ namespace abp
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);